Merge branch 'master' of [email protected]:aseprite/aseprite.git

namkazt · Mar 17, 2015 · b4d3e56 · b4d3e56
2 parents 4421f4c + 5ef4cb1
commit b4d3e56
Show file tree

Hide file tree

Showing 26 changed files with 339 additions and 468 deletions.
diff --git a/data/pref.xml b/data/pref.xml
@@ -43,6 +43,12 @@
       <value id="CHECKED_4x4" value="2" />
       <value id="CHECKED_2x2" value="3" />
     </enum>
+    <enum id="SpriteSheetType">
+      <value id="NONE" value="0" />
+      <value id="HORIZONTAL_STRIP" value="1" />
+      <value id="VERTICAL_STRIP" value="2" />
+      <value id="MATRIX" value="3" />
+    </enum>
   </types>
 
   <global>
@@ -133,6 +139,15 @@
       <option id="opacity_step" type="int" default="28" migrate="Onionskin.OpacityStep" />
       <option id="type" type="OnionskinType" default="OnionskinType::MERGE" migrate="Onionskin.Type" />
     </section>
+    <section id="sprite_sheet">
+      <option id="type" type="SpriteSheetType" default="SpriteSheetType::NONE" />
+      <option id="columns" type="int" default="0" />
+      <option id="width" type="int" default="0" />
+      <option id="height" type="int" default="0" />
+      <option id="best_fit" type="bool" default="false" />
+      <option id="texture_filename" type="std::string" />
+      <option id="data_filename" type="std::string" />
+    </section>
   </document>
 
 </preferences>
diff --git a/data/widgets/export_sprite_sheet.xml b/data/widgets/export_sprite_sheet.xml
@@ -1,5 +1,5 @@
 <!-- ASEPRITE -->
-<!-- Copyright (C) 2001-2014 by David Capello -->
+<!-- Copyright (C) 2001-2015 by David Capello -->
 <gui>
   <window id="export_sprite_sheet" text="Export Sprite Sheet">
   <grid columns="4">
@@ -18,8 +18,11 @@
     <hbox id="best_fit_filler" />
     <check cell_hspan="3" id="best_fit" text="Best fit for texture" />
 
-    <label text="Export Action:" />
-    <combobox id="export_action" cell_hspan="3" />
+    <label text="Save As:" />
+    <button id="image_filename" cell_hspan="3" />
+
+    <check id="data_enabled" text="JSON Data:" />
+    <button id="data_filename" cell_hspan="3" />
 
     <hbox cell_hspan="4">
       <boxfiller />

diff --git a/src/app/cmd/add_frame.h b/src/app/cmd/add_frame.h
@@ -32,7 +32,8 @@ namespace cmd {
     void onExecute() override;
     void onUndo() override;
     size_t onMemSize() const override {
-      return sizeof(*this);
+      return sizeof(*this) +
+        (m_addCel ? m_addCel->memSize() : 0);
     }
 
   private: