JSON plugin: Fixed reading of custom properties on tile collision obj…

…ect group Reported on the forum: http://discourse.mapeditor.org/t/tileset-custom-properties-not-loading-with-json/2681
mapeditor · Aug 28, 2017 · 92708e5 · 92708e5
1 parent 1f39a64
commit 92708e5
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/libtiled/varianttomapconverter.cpp b/src/libtiled/varianttomapconverter.cpp
@@ -287,8 +287,12 @@ SharedTileset VariantToMapConverter::toTileset(const QVariant &variant)
         }
 
         QVariantMap objectGroupVariant = tileVar[QLatin1String("objectgroup")].toMap();
-        if (!objectGroupVariant.isEmpty())
-            tile->setObjectGroup(toObjectGroup(objectGroupVariant));
+        if (!objectGroupVariant.isEmpty()) {
+            ObjectGroup *objectGroup = toObjectGroup(objectGroupVariant);
+            if (objectGroup)
+                objectGroup->setProperties(extractProperties(objectGroupVariant));
+            tile->setObjectGroup(objectGroup);
+        }
 
         QVariantList frameList = tileVar[QLatin1String("animation")].toList();
         if (!frameList.isEmpty()) {