Migrate properties set on tile collision layer to the tile

Since Tiled 1.1, it is no longer possible to edit the properties of this implicit object group, but some users may have set them in previous versions. Migrating the properties to the tile seems like a helpful things to do in this case. Closes #1912
mapeditor · Mar 27, 2018 · 528e6d4 · 528e6d4
1 parent a0e47d1
commit 528e6d4
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/src/libtiled/mapreader.cpp b/src/libtiled/mapreader.cpp
@@ -460,7 +460,21 @@ void MapReaderPrivate::readTilesetTile(Tileset &tileset)
                                      imageReference.source);
             }
         } else if (xml.name() == QLatin1String("objectgroup")) {
-            tile->setObjectGroup(readObjectGroup());
+            ObjectGroup *objectGroup = readObjectGroup();
+            if (objectGroup) {
+                // Migrate properties from the object group to the tile. Since
+                // Tiled 1.1, it is no longer possible to edit the properties
+                // of this implicit object group, but some users may have set
+                // them in previous versions.
+                Properties p = objectGroup->properties();
+                if (!p.isEmpty()) {
+                    p.merge(tile->properties());
+                    tile->setProperties(p);
+                    objectGroup->setProperties(Properties());
+                }
+
+                tile->setObjectGroup(objectGroup);
+            }
         } else if (xml.name() == QLatin1String("animation")) {
             tile->setFrames(readAnimationFrames());
         } else {

diff --git a/src/libtiled/varianttomapconverter.cpp b/src/libtiled/varianttomapconverter.cpp
@@ -294,9 +294,22 @@ SharedTileset VariantToMapConverter::toTileset(const QVariant &variant)
         QVariantMap objectGroupVariant = tileVar[QLatin1String("objectgroup")].toMap();
         if (!objectGroupVariant.isEmpty()) {
             ObjectGroup *objectGroup = toObjectGroup(objectGroupVariant);
-            if (objectGroup)
+            if (objectGroup) {
                 objectGroup->setProperties(extractProperties(objectGroupVariant));
-            tile->setObjectGroup(objectGroup);
+
+                // Migrate properties from the object group to the tile. Since
+                // Tiled 1.1, it is no longer possible to edit the properties
+                // of this implicit object group, but some users may have set
+                // them in previous versions.
+                Properties p = objectGroup->properties();
+                if (!p.isEmpty()) {
+                    p.merge(tile->properties());
+                    tile->setProperties(p);
+                    objectGroup->setProperties(Properties());
+                }
+
+                tile->setObjectGroup(objectGroup);
+            }
         }
 
         QVariantList frameList = tileVar[QLatin1String("animation")].toList();