[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28879] trunk/blender/source/blender: Bugfix #22374: index=-1 not work for keyingset.paths.add() function

[Joshua Leung]

Revision: 28879
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28879
Author:   aligorith
Date:     2010-05-20 13:04:15 +0200 (Thu, 20 May 2010)

Log Message:
-----------
Bugfix #22374: index=-1 not work for keyingset.paths.add() function

Simple typo which meant that paths with 'Entire array' set could not be reimported properly. 

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/armature.c
    trunk/blender/source/blender/makesrna/intern/rna_animation.c

Modified: trunk/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/armature.c	2010-05-20 10:03:26 UTC (rev 28878)
+++ trunk/blender/source/blender/blenkernel/intern/armature.c	2010-05-20 11:04:15 UTC (rev 28879)
@@ -2055,7 +2055,7 @@
 					
 					/* 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 @@
 				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);

Modified: trunk/blender/source/blender/makesrna/intern/rna_animation.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_animation.c	2010-05-20 10:03:26 UTC (rev 28878)
+++ trunk/blender/source/blender/makesrna/intern/rna_animation.c	2010-05-20 11:04:15 UTC (rev 28879)
@@ -557,7 +557,7 @@
 	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).");