[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18670] branches/blender2.5/blender/source /blender/editors/transform: 2.5

[Martin Poirier]

Revision: 18670
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18670
Author:   theeth
Date:     2009-01-25 18:08:56 +0100 (Sun, 25 Jan 2009)

Log Message:
-----------
2.5

Use proper function to check if prop is defined instead of relying on default.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/transform/transform.c
    branches/blender2.5/blender/source/blender/editors/transform/transform_ops.c

Modified: branches/blender2.5/blender/source/blender/editors/transform/transform.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/transform/transform.c	2009-01-25 15:41:17 UTC (rev 18669)
+++ branches/blender2.5/blender/source/blender/editors/transform/transform.c	2009-01-25 17:08:56 UTC (rev 18670)
@@ -995,7 +995,6 @@
 {
 	int mode    = RNA_int_get(op->ptr, "mode");
 	int options = RNA_int_get(op->ptr, "options");
-	float values[4];
 
 	/* added initialize, for external calls to set stuff in TransInfo, like undo string */
 
@@ -1122,12 +1121,12 @@
 		break;
 	}
 	
-	RNA_float_get_array(op->ptr, "values", values);
-	
 	/* overwrite initial values if operator supplied a non-null vector */
-	if (!QuatIsNul(values))
+	if (RNA_property_is_set(op->ptr, "values"))
 	{
-		QUATCOPY(t->values, values); /* vec-4 */
+		float values[4];
+		RNA_float_get_array(op->ptr, "values", values);
+		QUATCOPY(t->values, values);
 	}
 
 	/* Constraint init from operator */
@@ -1136,7 +1135,6 @@
 		
 		if (t->con.mode & CON_APPLY)
 		{
-			//int options = RNA_int_get(op->ptr, "options");
 			RNA_float_get_array(op->ptr, "constraint_matrix", (float*)t->spacemtx);
 			
 			setUserConstraint(t, t->con.mode, "%s");		

Modified: branches/blender2.5/blender/source/blender/editors/transform/transform_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/transform/transform_ops.c	2009-01-25 15:41:17 UTC (rev 18669)
+++ branches/blender2.5/blender/source/blender/editors/transform/transform_ops.c	2009-01-25 17:08:56 UTC (rev 18670)
@@ -158,13 +158,9 @@
 
 static int transform_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
-	float values[4];
-	
-	RNA_float_get_array(op->ptr, "values", values);
-
 	transformops_data(C, op, event);
 
-	if(!QuatIsNul(values)) {
+	if(RNA_property_is_set(op->ptr, "values")) {
 		return transform_exec(C, op);
 	}
 	else {
@@ -177,7 +173,6 @@
 
 void TFM_OT_transform(struct wmOperatorType *ot)
 {
-	static const float value[4] = {0, 0, 0, 0};
 	static const float mtx[3][3] = {{1, 0, 0},{0, 1, 0},{0, 0, 1}};
 	static EnumPropertyItem transform_mode_types[] = {
 			{TFM_INIT, "INIT", "Init", ""},
@@ -225,14 +220,11 @@
 	RNA_def_enum(ot->srna, "mode", transform_mode_types, 0, "Mode", "");
 	RNA_def_int(ot->srna, "options", 0, INT_MIN, INT_MAX, "Options", "", INT_MIN, INT_MAX);
 	
-	RNA_def_float_vector(ot->srna, "values", 4, value, -FLT_MAX, FLT_MAX, "Values", "", -FLT_MAX, FLT_MAX);
+	RNA_def_float_vector(ot->srna, "values", 4, NULL, -FLT_MAX, FLT_MAX, "Values", "", -FLT_MAX, FLT_MAX);
 
 	RNA_def_int(ot->srna, "constraint_orientation", 0, INT_MIN, INT_MAX, "Constraint Orientation", "", INT_MIN, INT_MAX);
 	RNA_def_int(ot->srna, "constraint_mode", 0, INT_MIN, INT_MAX, "Constraint Mode", "", INT_MIN, INT_MAX);
 
-//	prop = RNA_def_property(ot->srna, "constraint_matrix", PROP_FLOAT, PROP_MATRIX);
-//	RNA_def_property_array(prop, 9);
-//	RNA_def_property_float_array_default(prop, (float*)mtx);
 	RNA_def_float_matrix(ot->srna, "constraint_matrix", 9, mtx[0], -FLT_MAX, FLT_MAX, "Constraint Matrix", "", -FLT_MAX, FLT_MAX);
 }