Fixed Object::resolvedProperties

By accident it was only returning the inherited properties.
mapeditor · Jan 16, 2025 · d7497ae · d7497ae
1 parent ca72768
commit d7497ae
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/libtiled/object.cpp b/src/libtiled/object.cpp
@@ -88,8 +88,8 @@ QVariant Object::resolvedProperty(const QString &name) const
 
 QVariantMap Object::resolvedProperties() const
 {
-    QVariantMap allProperties;
-    Tiled::mergeProperties(allProperties, inheritedProperties());
+    QVariantMap allProperties(inheritedProperties());
+    Tiled::mergeProperties(allProperties, properties());
     return allProperties;
 }