Bugfix #22374: index=-1 not work for keyingset.paths.add() function
authorJoshua Leung <aligorith@gmail.com>
Thu, 20 May 2010 11:04:15 +0000 (11:04 +0000)
committerJoshua Leung <aligorith@gmail.com>
Thu, 20 May 2010 11:04:15 +0000 (11:04 +0000)
Simple typo which meant that paths with 'Entire array' set could not be reimported properly.

source/blender/blenkernel/intern/armature.c
source/blender/makesrna/intern/rna_animation.c

index 4f9b9435a80dacbcf348e57af4251c30c036442f..557f3900d7b6ed444e8716f758310853d6212b18 100644 (file)
@@ -2055,7 +2055,7 @@ static void splineik_evaluate_bone(tSplineIK_Tree *tree, Scene *scene, Object *o
                                        
                                        /* we need to clamp this within sensible values */
                                        // NOTE: these should be fine for now, but should get sanitised in future
-                                       scale= MIN2( MAX2(scale, 0.0001) , 100000);
+                                       scale= MIN2(MAX2(scale, 0.0001) , 100000);
                                }
                                else
                                        scale= 1.0f;
@@ -2127,8 +2127,6 @@ static void splineik_execute_tree(Scene *scene, Object *ob, bPoseChannel *pchan_
                                splineik_evaluate_bone(tree, scene, ob, pchan, i, ctime);
                        }
                        
-                       // TODO: if another pass is needed to ensure the validity of the chain after blending, it should go here
-                       
                        /* free the tree info specific to SplineIK trees now */
                        if (tree->chain) MEM_freeN(tree->chain);
                        if (tree->free_points) MEM_freeN(tree->points);
index d791bde30547a116b00613ed05aa6a2728f5a426..e0cf4f912b14f9c01ac4a0dac1058f102c17f874 100644 (file)
@@ -557,7 +557,7 @@ static void rna_def_keyingset_paths(BlenderRNA *brna, PropertyRNA *cprop)
        parm= RNA_def_string(func, "data_path", "", 256, "Data-Path", "RNA-Path to destination property."); // xxx hopefully this is long enough
                RNA_def_property_flag(parm, PROP_REQUIRED);
                /* index (defaults to -1 for entire array) */
-       parm=RNA_def_int(func, "index", -1, 0, INT_MAX, "Index", "The index of the destination property (i.e. axis of Location/Rotation/etc.), or -1 for the entire array.", 0, INT_MAX);
+       parm=RNA_def_int(func, "index", -1, -1, INT_MAX, "Index", "The index of the destination property (i.e. axis of Location/Rotation/etc.), or -1 for the entire array.", 0, INT_MAX);
                /* grouping */
        parm=RNA_def_enum(func, "grouping_method", keyingset_path_grouping_items, KSP_GROUP_KSNAME, "Grouping Method", "Method used to define which Group-name to use.");
        parm=RNA_def_string(func, "group_name", "", 64, "Group Name", "Name of Action Group to assign destination to (only if grouping mode is to use this name).");