Fix exporting slices data in JSON files on Export Sprite Sheet

This commit is contained in:
David Capello 2017-05-26 14:36:43 -03:00
parent 54e8a59cbd
commit 5ad681281d

View File

@ -678,6 +678,7 @@ void ExportSpriteSheetCommand::onExecute(Context* context)
innerPadding = MID(0, innerPadding, 100); innerPadding = MID(0, innerPadding, 100);
bool listLayers = docPref.spriteSheet.listLayers(); bool listLayers = docPref.spriteSheet.listLayers();
bool listFrameTags = docPref.spriteSheet.listFrameTags(); bool listFrameTags = docPref.spriteSheet.listFrameTags();
bool listSlices = docPref.spriteSheet.listSlices();
if (context->isUIAvailable() && askOverwrite) { if (context->isUIAvailable() && askOverwrite) {
if (!ask_overwrite(true, filename, if (!ask_overwrite(true, filename,
@ -755,10 +756,9 @@ void ExportSpriteSheetCommand::onExecute(Context* context)
exporter.setBorderPadding(borderPadding); exporter.setBorderPadding(borderPadding);
exporter.setShapePadding(shapePadding); exporter.setShapePadding(shapePadding);
exporter.setInnerPadding(innerPadding); exporter.setInnerPadding(innerPadding);
if (listLayers) if (listLayers) exporter.setListLayers(true);
exporter.setListLayers(true); if (listFrameTags) exporter.setListFrameTags(true);
if (listFrameTags) if (listSlices) exporter.setListSlices(true);
exporter.setListFrameTags(true);
exporter.addDocument(document, frameTag, exporter.addDocument(document, frameTag,
(!selLayers.empty() ? &selLayers: nullptr), (!selLayers.empty() ? &selLayers: nullptr),
(!selFrames.empty() ? &selFrames: nullptr)); (!selFrames.empty() ? &selFrames: nullptr));