From 9c8cdd40635d191c8173199631e1113660f3d6af Mon Sep 17 00:00:00 2001 From: Svipal Date: Sat, 6 Jun 2020 11:11:43 +0200 Subject: [PATCH] trying to fix conflic in ParseTileLayers --- src/tilemaps/parsers/tiled/ParseTileLayers.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/tilemaps/parsers/tiled/ParseTileLayers.js b/src/tilemaps/parsers/tiled/ParseTileLayers.js index dc7a24207..67db6283c 100644 --- a/src/tilemaps/parsers/tiled/ParseTileLayers.js +++ b/src/tilemaps/parsers/tiled/ParseTileLayers.js @@ -128,8 +128,9 @@ var ParseTileLayers = function (json, insertNull) tileHeight: json.tileheight, alpha: (curGroupState.opacity * curl.opacity), visible: (curGroupState.visible && curl.visible), - properties: GetFastValue(curl, 'properties', {}), - orientation: CONST.fromOrientationString(json.orientation) + orientation: CONST.fromOrientationString(json.orientation), + properties: GetFastValue(curl, 'properties', {}) + }); if (layerData.orientation === CONST.HEXAGONAL) @@ -207,8 +208,9 @@ var ParseTileLayers = function (json, insertNull) tileHeight: json.tileheight, alpha: (curGroupState.opacity * curl.opacity), visible: (curGroupState.visible && curl.visible), - properties: GetFastValue(curl, 'properties', {}), - orientation: CONST.fromOrientationString(json.orientation) + orientation: CONST.fromOrientationString(json.orientation), + properties: GetFastValue(curl, 'properties', {}) + }); if (layerData.orientation === CONST.HEXAGONAL)