[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39970] trunk/blender/source/blender/ editors/transform/transform.c: Fix #28524: Push/ Pull Assert when using Operator Panel to Alter Distance value

Sergey Sharybin g.ulairi at gmail.com
Tue Sep 6 16:59:56 CEST 2011


Revision: 39970
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39970
Author:   nazgul
Date:     2011-09-06 14:59:55 +0000 (Tue, 06 Sep 2011)
Log Message:
-----------
Fix #28524: Push/Pull Assert when using Operator Panel to Alter Distance value

Some transform operators (like push/pull, shrink/fatten, to sphere and so)
were creating "value" as single scalar value. This used to confuse
RNA_float_get_array used in initTransform.

Use RNA_float_get_array for array values and RNA_float_get for scalar value
in transform initi function.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/transform/transform.c

Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c	2011-09-06 14:02:28 UTC (rev 39969)
+++ trunk/blender/source/blender/editors/transform/transform.c	2011-09-06 14:59:55 UTC (rev 39970)
@@ -1678,7 +1678,14 @@
 	if (RNA_property_is_set(op->ptr, "value"))
 	{
 		float values[4]= {0}; /* incase value isn't length 4, avoid uninitialized memory  */
-		RNA_float_get_array(op->ptr, "value", values);
+		PropertyRNA *prop= RNA_struct_find_property(op->ptr, "value");
+
+		if(RNA_property_array_check(prop)) {
+			RNA_float_get_array(op->ptr, "value", values);
+		} else {
+			values[0]= RNA_float_get(op->ptr, "value");
+		}
+
 		QUATCOPY(t->values, values);
 		QUATCOPY(t->auto_values, values);
 		t->flag |= T_AUTOVALUES;




More information about the Bf-blender-cvs mailing list