[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35509] trunk/blender/source/blender/ makesrna/intern: Inconsistent use of array_index vs index with animation keyword args.

Campbell Barton ideasman42 at gmail.com
Sun Mar 13 07:44:41 CET 2011


Revision: 35509
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35509
Author:   campbellbarton
Date:     2011-03-13 06:44:40 +0000 (Sun, 13 Mar 2011)
Log Message:
-----------
Inconsistent use of array_index vs index with animation keyword args.
Settle with 'index' even though the attribute is array_index.

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_action.c
    trunk/blender/source/blender/makesrna/intern/rna_animation.c
    trunk/blender/source/blender/makesrna/intern/rna_fcurve.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_action.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_action.c	2011-03-13 06:02:20 UTC (rev 35508)
+++ trunk/blender/source/blender/makesrna/intern/rna_action.c	2011-03-13 06:44:40 UTC (rev 35509)
@@ -445,7 +445,7 @@
 	RNA_def_function_flag(func, FUNC_USE_REPORTS);
 	parm= RNA_def_string(func, "data_path", "", 0, "Data Path", "FCurve data path to use.");
 	RNA_def_property_flag(parm, PROP_REQUIRED);
-	RNA_def_int(func, "array_index", 0, 0, INT_MAX, "Index", "Array index.", 0, INT_MAX);
+	RNA_def_int(func, "index", 0, 0, INT_MAX, "Index", "Array index.", 0, INT_MAX);
 	RNA_def_string(func, "action_group", "", 0, "Action Group", "Acton group to add this fcurve into.");
 
 	parm= RNA_def_pointer(func, "fcurve", "FCurve", "", "Newly created fcurve");

Modified: trunk/blender/source/blender/makesrna/intern/rna_animation.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_animation.c	2011-03-13 06:02:20 UTC (rev 35508)
+++ trunk/blender/source/blender/makesrna/intern/rna_animation.c	2011-03-13 06:44:40 UTC (rev 35509)
@@ -550,7 +550,8 @@
 	RNA_def_property_ui_text(prop, "Data Path", "Path to property setting");
 	RNA_def_struct_name_property(srna, prop); // XXX this is the best indicator for now...
 	RNA_def_property_update(prop, NC_SCENE|ND_KEYINGSET|NA_EDITED, NULL);
-	
+
+	/* called 'index' when given as function arg */
 	prop= RNA_def_property(srna, "array_index", PROP_INT, PROP_NONE);
 	RNA_def_property_ui_text(prop, "RNA Array Index", "Index to the specific setting if applicable");
 	RNA_def_property_update(prop, NC_SCENE|ND_KEYINGSET|NA_EDITED, NULL); // XXX: maybe a bit too noisy

Modified: trunk/blender/source/blender/makesrna/intern/rna_fcurve.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_fcurve.c	2011-03-13 06:02:20 UTC (rev 35508)
+++ trunk/blender/source/blender/makesrna/intern/rna_fcurve.c	2011-03-13 06:44:40 UTC (rev 35509)
@@ -1419,7 +1419,8 @@
 	RNA_def_property_string_funcs(prop, "rna_FCurve_RnaPath_get", "rna_FCurve_RnaPath_length", "rna_FCurve_RnaPath_set");
 	RNA_def_property_ui_text(prop, "Data Path", "RNA Path to property affected by F-Curve");
 	RNA_def_property_update(prop, NC_ANIMATION, NULL);	// XXX need an update callback for this to that animation gets evaluated
-	
+
+	/* called 'index' when given as function arg */
 	prop= RNA_def_property(srna, "array_index", PROP_INT, PROP_NONE);
 	RNA_def_property_ui_text(prop, "RNA Array Index", "Index to the specific property affected by F-Curve if applicable");
 	RNA_def_property_update(prop, NC_ANIMATION, NULL);	// XXX need an update callback for this so that animation gets evaluated




More information about the Bf-blender-cvs mailing list