Build v17.1.18

Author: Nico-Duduf

dist/libs/DuAEF.jsxinc

@@ -24666,6 +24666,10 @@ DuAEProperty.prototype.quickBakeExpressions = function(frameStep) {
         prop.expressionEnabled = false;
         // Remove current keyframes
         propInfo.removeAnimation();
+        // If this is a time remap we need to re-enable it,
+        // because removing all keyframes at the previous step disables it (Thanks AE!)
+        if (prop.matchName == 'ADBE Time Remapping')
+            propInfo.layer.timeRemapEnabled = true;
         // Set values
         try { prop.setValuesAtTimes(times, values); }
         catch (e) {}
@@ -24780,6 +24784,10 @@ DuAEProperty.prototype.smartBakeExpressions = function(frameStep) {
         // Collect interpolations/influences and remove animation
         // The result can be better if we reset them after baking the expression.
         propAnim = propInfo.takeAnimation();
+        // If this is a time remap we need to re-enable it,
+        // because removing all keyframes at the previous step disables it (Thanks AE!)
+        if (prop.matchName == 'ADBE Time Remapping')
+            propInfo.layer.timeRemapEnabled = true;
         // Set extreme values
         if (extremeValues.length > 0) {
             // For some reason, there are still properties here which can't receive keyframes

dist/libs/api3.jsxinc

@@ -3251,9 +3251,9 @@ Duik.Pin.getByName = function (comp,name,selectedOnly)
 /**
 	* Links the path to pins<br />
 	* Works with After Effects CC2018 (15.0) and newer only
-	* @param {Property|DuAEProperty} prop - The path property
-	* @param {bool} [tangents=true] - True to create bones for the tangents
-	* @param {bool} [createPinLayers=true] - True to create layers, false to only create a controller effect
+	* @param {Property|DuAEProperty} pathProp - The path property
+	* @param {Boolean} [tangents=true] - True to create bones for the tangents
+	* @param {Boolean} [createPinLayers=true] - True to create layers, false to only create a controller effect
 	* @return {DuAEProperty[]} The pin effects created.
 */
 Duik.Pin.rigPath = function( pathProp, tangents, createPinLayers )
@@ -3790,7 +3790,7 @@ Duik.CmdLib['Bone']["Arm"] = "Duik.Bone.arm()";
  * @param {Boolean} [forearm=true]  Whether to create a forearm
  * @param {Boolean} [hand=true]  Whether to create a hand
  * @param {Boolean} [claws=false]  Whether to add claws
- * @param {Boolean} [location=OCO.Location.FRONT]  The location of the arm
+ * @param {OCO.Location} [location=OCO.Location.FRONT]  The location of the arm
  * @param {boolean} [forceLink=false] - whether link the selected layers/properties to the new armature
  */
 Duik.Bone.arm = function ( characterName, type, side, shoulder, arm, forearm, hand, claws, location, forceLink )
@@ -3831,7 +3831,7 @@ Duik.Bone.arm = function ( characterName, type, side, shoulder, arm, forearm, ha
 // Creates a limb on the selection, optionally linking the items
 Duik.Bone.createLimb = function ( comp, limbCreator, characterName, forceLink )
 {
-    var comp = DuAEProject.getActiveComp();
+    comp = def(comp,DuAEProject.getActiveComp());
     if (!comp) return [];
 
     // Links
@@ -3867,10 +3867,8 @@ Duik.Bone.createLimb = function ( comp, limbCreator, characterName, forceLink )
     var ok = false;
     it.do( function( layer )
     {
-        var side = Duik.Layer.side(layer);
-        var location = Duik.Layer.location(layer);
-        if (characterName == "") characterName = Duik.Layer.groupName(layer);
-        var limbName = Duik.Layer.name(layer);
+        if (characterName == "")
+            characterName = Duik.Layer.groupName(layer);
 
         //get paths
         var props = DuAELayer.getSelectedProps( layer, DuAEProperty.isPathProperty );
@@ -3881,6 +3879,17 @@ Duik.Bone.createLimb = function ( comp, limbCreator, characterName, forceLink )
             for (var i = 0, n = props.length; i < n; i++)
             {
                 var path = props[i];
+
+                var pathProp = new DuAEProperty( path ).pathProperty();
+                pathProp = pathProp.getProperty();
+                // don't rig twice the same (we may get either the prop or the group)
+                if (DuString.startsWith(
+                    pathProp.expression,
+                    '// Duik auto-rig')) {
+                        pathProp.expression = pathProp.expression.replace('// Duik auto-rig\n', '');
+                        continue;
+                    }
+
                 // create the OCODoc
                 var doc = OCODoc.fromComp( characterName, comp, [] );
                 var limb = limbCreator( doc );
@@ -3889,7 +3898,12 @@ Duik.Bone.createLimb = function ( comp, limbCreator, characterName, forceLink )
                 var boneLayers = doc.toComp( comp );
                 DuAELayer.moveInsideComp( boneLayers[0] );
                 // link
-                if (linkPath) Duik.Pin.linkPathToLayers( path, boneLayers );
+                if (linkPath)
+                    Duik.Pin.linkPathToLayers( path, boneLayers );
+
+                // don't rig twice the same (we may get either the prop or the group)
+                pathProp.expression = '// Duik auto-rig\n' + pathProp.expression;
+
                 ok = true;
             }
             if (layerToRemove) layerToRemove.remove();
@@ -7088,6 +7102,12 @@ Duik.Controller.create = function ( comp, type, layer, parent ) {
     DuAELayer.applyPreset( ctrl, preset );
     Duik.Controller.setColor( DuColor.Color.APP_HIGHLIGHT_COLOR, ctrl );
 
+    // Reset the side (to flip the controller if needed)
+    if ( layer != null) {
+        var side = Duik.Layer.side(layer);
+        Duik.Controller.setSide( side , ctrl);
+    }
+
     return ctrl;
 }
 
@@ -7836,11 +7856,25 @@ Duik.Controller.setLimbName = function ( limbName, layers ) {
 /**
  * Sets the side of the layer
  * @param {OCO.Side} side The side
- * @param {Layer[]} [layers=DuAEComp.getSelectedLayers()] The layer. If omitted, will use all selected layers in the comp
+ * @param {Layer[]|Layer|DuList.<Layer>|LayerCollection} [layers=Duik.Controller.get()] The controller. If omitted, will use all selected controllers in the comp
  */
 Duik.Controller.setSide = function ( side, layers ) {
     layers = def( layers, Duik.Controller.get() );
+    layers = new DuList(layers);
+
     Duik.Layer.setSide( side, layers );
+    // Flip the Left controllers
+    for (var i = 0, n = layers.length(); i < n; i++) {
+        var layer = layers.at(i);
+        if (layer instanceof ShapeLayer) {
+            var effect = layer.effect('Pseudo/DUIK Ctrl v03');
+            if (effect) {
+                effect.property('Flip').setValue(
+                    side == OCO.Side.LEFT ? 1 : 0
+                );
+            }
+        }
+    }
 }
 
 /**
@@ -10640,10 +10674,12 @@ Duik.Constraint.twoOneLayerIK = function(layer1, layer2, layer3, goal, controlle
 Duik.Constraint.bezierIK = function(layers, goal, controller, showGuides) {
     goal = def(goal, null);
     controller = def(controller, null);
-    if (controller == null && goal == null) throw "You must provide either a goal layer or a controller";
+    if (controller == null && goal == null)
+        throw "You must provide either a goal layer or a controller";
 
     showGuides = def(showGuides, true);
-    if (!showGuides) showGuides = false;
+    if (!showGuides)
+        showGuides = false;
 
     DuAE.beginUndoGroup( i18n._("B\u00e9zier IK"), false);
 
@@ -12827,8 +12863,6 @@ Duik.Rig.auto = function ( bakeBones, bakeEnvelops, bakeNoodles, longChainMode,
         }
     }
 
-    // TODO Get/Create a master, parent orphan controllers to it
-    // Collect controllers
     var ctrls = [];
     var limbs = ocoDoc.getLimbs();
     for (var i  = 0, ni = limbs.length; i < ni; i++ )
@@ -12865,12 +12899,12 @@ Duik.Rig.auto = function ( bakeBones, bakeEnvelops, bakeNoodles, longChainMode,
     }
 
     // If controllers are nulls, move them to the top of the comp
-    if ( OCO.config.get('after effects/controller layer type', Duik.Controller.LayerMode.SHAPE) == Duik.Controller.LayerMode.NULL) {
+    var ctrlType = OCO.config.get('after effects/controller layer type', Duik.Controller.LayerMode.SHAPE);
+    if ( ctrlType == Duik.Controller.LayerMode.NULL ) {
         for (var i = 0; i < ctrls.length; i++) {
             ctrls[i].moveBefore( comp.layer(1)
         ); };
     };
-    
 
     DuAEProject.setProgressMode( false );
     DuAE.endUndoGroup( i18n._("Auto-rig") );
@@ -19236,6 +19270,8 @@ Duik.Animation.cut = function ( comp )
     comp = def(comp, DuAEProject.getActiveComp() );
     if(!comp) return;
 
+    DuAE.beginUndoGroup( i18n._("Cut animation"), false);
+
     var props = new DuList( DuAEComp.getSelectedProps() );
     // When modifying properties, keys are deselected. Let's keep the list.
     var selectedKeys = [];
@@ -19252,6 +19288,8 @@ Duik.Animation.cut = function ( comp )
             prop.removeKey(keys[i]);
         }
     });
+
+    DuAE.endUndoGroup( i18n._("Cut animation"));
     return animations;
 }