[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24609] trunk/blender/source/blender: was trying to add one too many drivers when inserting them on all items on an array (own error)

[Campbell Barton]

Revision: 24609
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24609
Author:   campbellbarton
Date:     2009-11-17 15:10:29 +0100 (Tue, 17 Nov 2009)

Log Message:
-----------
was trying to add one too many drivers when inserting them on all items on an array (own error)

Modified Paths:
--------------
    trunk/blender/source/blender/editors/animation/drivers.c
    trunk/blender/source/blender/makesrna/intern/rna_access.c

Modified: trunk/blender/source/blender/editors/animation/drivers.c
===================================================================
--- trunk/blender/source/blender/editors/animation/drivers.c	2009-11-17 13:18:26 UTC (rev 24608)
+++ trunk/blender/source/blender/editors/animation/drivers.c	2009-11-17 14:10:29 UTC (rev 24609)
@@ -160,7 +160,7 @@
 	/* key entire array convenience method */
 	if (array_index == -1) {
 		array_index= 0;
-		array_index_max= RNA_property_array_length(&ptr, prop) + 1;
+		array_index_max= RNA_property_array_length(&ptr, prop);
 	}
 	
 	/* will only loop once unless the array index was -1 */

Modified: trunk/blender/source/blender/makesrna/intern/rna_access.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_access.c	2009-11-17 13:18:26 UTC (rev 24608)
+++ trunk/blender/source/blender/makesrna/intern/rna_access.c	2009-11-17 14:10:29 UTC (rev 24609)
@@ -1781,7 +1781,7 @@
 int RNA_property_collection_type_get(PointerRNA *ptr, PropertyRNA *prop, PointerRNA *r_ptr)
 {
 	*r_ptr= *ptr;
-	return ((r_ptr->type = prop->srna));
+	return ((r_ptr->type = prop->srna) ? 1:0);
 }
 
 int RNA_property_collection_raw_array(PointerRNA *ptr, PropertyRNA *prop, PropertyRNA *itemprop, RawArray *array)