Permalink
Browse files

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

  • Loading branch information...
bjorn committed Aug 28, 2017
1 parent 1f39a64 commit 92708e5548de90f3d4b0adc23277b4a3b9284567
Showing with 6 additions and 2 deletions.
  1. +6 −2 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()) {

0 comments on commit 92708e5

Please sign in to comment.