trying to fix conflic in ParseTileLayers

This commit is contained in:
Svipal 2020-06-06 11:11:43 +02:00
parent b6524e0ac0
commit 9c8cdd4063

View file

@ -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)