[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38735] trunk/blender/source/blender/ makesrna/intern/rna_access.c: RNA: function calls with optional parameters were not giving correct default

Brecht Van Lommel brechtvanlommel at pandora.be
Tue Jul 26 18:01:10 CEST 2011


Revision: 38735
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38735
Author:   blendix
Date:     2011-07-26 16:01:09 +0000 (Tue, 26 Jul 2011)
Log Message:
-----------
RNA: function calls with optional parameters were not giving correct default
values for arrays.

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

Modified: trunk/blender/source/blender/makesrna/intern/rna_access.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_access.c	2011-07-26 15:58:29 UTC (rev 38734)
+++ trunk/blender/source/blender/makesrna/intern/rna_access.c	2011-07-26 16:01:09 UTC (rev 38735)
@@ -4407,15 +4407,15 @@
 		if(!(parm->flag & PROP_REQUIRED) && !(parm->flag & PROP_DYNAMIC)) {
 			switch(parm->type) {
 				case PROP_BOOLEAN:
-					if(parm->arraydimension) memcpy(data, &((BooleanPropertyRNA*)parm)->defaultarray, size);
+					if(parm->arraydimension) memcpy(data, ((BooleanPropertyRNA*)parm)->defaultarray, size);
 					else memcpy(data, &((BooleanPropertyRNA*)parm)->defaultvalue, size);
 					break;
 				case PROP_INT:
-					if(parm->arraydimension) memcpy(data, &((IntPropertyRNA*)parm)->defaultarray, size);
+					if(parm->arraydimension) memcpy(data, ((IntPropertyRNA*)parm)->defaultarray, size);
 					else memcpy(data, &((IntPropertyRNA*)parm)->defaultvalue, size);
 					break;
 				case PROP_FLOAT:
-					if(parm->arraydimension) memcpy(data, &((FloatPropertyRNA*)parm)->defaultarray, size);
+					if(parm->arraydimension) memcpy(data, ((FloatPropertyRNA*)parm)->defaultarray, size);
 					else memcpy(data, &((FloatPropertyRNA*)parm)->defaultvalue, size);
 					break;
 				case PROP_ENUM:




More information about the Bf-blender-cvs mailing list