Fixed precompositions export

TelegramMessenger · Jun 4, 2019 · c0c36db · c0c36db
1 parent 9e4f4c4
commit c0c36db
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/bundle/jsx/dataManager.jsx b/bundle/jsx/dataManager.jsx
@@ -277,10 +277,6 @@ $.__bodymovin.bm_dataManager = (function () {
                     error = 'Composition should not include any Star Shapes';
                     break;
                 }
-                if (items[i].ty == "mm") {
-                    error = 'Composition should not include any Merge Paths';
-                    break;
-                }
                 if (items[i].ty == "gs") {
                     error = 'Composition should not include any Gradient Strokes';
                     break;
@@ -339,10 +335,6 @@ loop:
                     error = 'Composition should not include any Auto-Oriented Layers';
                     break;
                 }
-                if (layers[i].ef != null) {
-                    error = 'Composition should not include any Layer Effects';
-                    break;
-                }
 
                 error = checkItems(layers[i].shapes, true);
                 if (error != null) {
@@ -358,6 +350,17 @@ loop:
         _destinationPath = destinationPath;
         deleteExtraParams(data, config);
         separateComps(data.layers, data.comps);
+
+        if (data.comps) {
+            if (data.assets) {
+                data.assets = data.assets.concat(data.comps);
+            } else {
+                data.assets = data.comps;
+            }
+            data.comps = null;
+            delete data.comps;
+        }
+
         var string = JSON.stringify(data);
         string = string.replace(/\n/g, '');
 

diff --git a/src/redux/reducers/compositions.js b/src/redux/reducers/compositions.js
@@ -23,7 +23,7 @@ let defaultComposition = {
         demo: false,
         avd: false,
         glyphs: true,
-        hiddens: false,
+        hiddens: true,
         original_names: false,
         should_encode_images: false,
         should_compress: false,
@@ -33,7 +33,7 @@ let defaultComposition = {
             active: false,
             list:[]
         },
-        guideds: false,
+        guideds: true,
         ignore_expression_properties: false,
         export_old_format: false,
         skip_default_properties: false,