[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58555] trunk/blender: remove use_relative option from simple deform,

[Campbell Barton]

Revision: 58555
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58555
Author:   campbellbarton
Date:     2013-07-23 19:31:49 +0000 (Tue, 23 Jul 2013)
Log Message:
-----------
remove use_relative option from simple deform,
all modifiers should be using object transformations relatively.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
    trunk/blender/source/blender/makesdna/DNA_modifier_types.h
    trunk/blender/source/blender/makesrna/intern/rna_modifier.c
    trunk/blender/source/blender/modifiers/intern/MOD_simpledeform.c

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py	2013-07-23 18:49:44 UTC (rev 58554)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py	2013-07-23 19:31:49 UTC (rev 58555)
@@ -715,10 +715,12 @@
         col = split.column()
         col.label(text="Origin:")
         col.prop(md, "origin", text="")
-        sub = col.column()
-        sub.active = (md.origin is not None)
-        sub.prop(md, "use_relative")
 
+        if md.deform_method in {'TAPER', 'STRETCH', 'TWIST'}:
+            col.label(text="Lock:")
+            col.prop(md, "lock_x")
+            col.prop(md, "lock_y")
+
         col = split.column()
         col.label(text="Deform:")
         if md.deform_method in {'TAPER', 'STRETCH'}:
@@ -726,9 +728,6 @@
         else:
             col.prop(md, "angle")
         col.prop(md, "limits", slider=True)
-        if md.deform_method in {'TAPER', 'STRETCH', 'TWIST'}:
-            col.prop(md, "lock_x")
-            col.prop(md, "lock_y")
 
     def SMOKE(self, layout, ob, md):
         layout.label(text="Settings can be found inside the Physics context")

Modified: trunk/blender/source/blender/makesdna/DNA_modifier_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_modifier_types.h	2013-07-23 18:49:44 UTC (rev 58554)
+++ trunk/blender/source/blender/makesdna/DNA_modifier_types.h	2013-07-23 19:31:49 UTC (rev 58555)
@@ -720,8 +720,7 @@
 
 	char mode;				/* deform function */
 	char axis;				/* lock axis (for taper and strech) */
-	char originOpts;		/* originOptions */
-	char pad;
+	char pad[2];
 
 } SimpleDeformModifierData;
 
@@ -733,12 +732,6 @@
 #define MOD_SIMPLEDEFORM_LOCK_AXIS_X			(1<<0)
 #define MOD_SIMPLEDEFORM_LOCK_AXIS_Y			(1<<1)
 
-/* indicates whether simple deform should use the local
- * coordinates or global coordinates of origin */
-/* XXX, this should have never been an option, all other modifiers work relatively
- * (so moving both objects makes no change!) - Campbell */
-#define MOD_SIMPLEDEFORM_ORIGIN_LOCAL			(1<<0)
-
 #define MOD_UVPROJECT_MAX				10
 
 typedef struct ShapeKeyModifierData {

Modified: trunk/blender/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_modifier.c	2013-07-23 18:49:44 UTC (rev 58554)
+++ trunk/blender/source/blender/makesrna/intern/rna_modifier.c	2013-07-23 19:31:49 UTC (rev 58555)
@@ -2581,11 +2581,6 @@
 	RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
 	RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
 
-	prop = RNA_def_property(srna, "use_relative", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "originOpts", MOD_SIMPLEDEFORM_ORIGIN_LOCAL);
-	RNA_def_property_ui_text(prop, "Relative", "Set the origin of deform space to be relative to the object");
-	RNA_def_property_update(prop, 0, "rna_Modifier_update");
-
 	prop = RNA_def_property(srna, "factor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
 	RNA_def_property_ui_range(prop, -10, 10, 1, 3);

Modified: trunk/blender/source/blender/modifiers/intern/MOD_simpledeform.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_simpledeform.c	2013-07-23 18:49:44 UTC (rev 58554)
+++ trunk/blender/source/blender/modifiers/intern/MOD_simpledeform.c	2013-07-23 19:31:49 UTC (rev 58555)
@@ -166,14 +166,7 @@
 	/* Calculate matrixs do convert between coordinate spaces */
 	if (smd->origin) {
 		transf = &tmp_transf;
-
-		if (smd->originOpts & MOD_SIMPLEDEFORM_ORIGIN_LOCAL) {
-			space_transform_from_matrixs(transf, ob->obmat, smd->origin->obmat);
-		}
-		else {
-			copy_m4_m4(transf->local2target, smd->origin->obmat);
-			invert_m4_m4(transf->target2local, transf->local2target);
-		}
+		space_transform_from_matrixs(transf, ob->obmat, smd->origin->obmat);
 	}
 
 	/* Setup vars,
@@ -252,7 +245,6 @@
 	SimpleDeformModifierData *smd = (SimpleDeformModifierData *) md;
 
 	smd->mode = MOD_SIMPLEDEFORM_MODE_TWIST;
-	smd->originOpts = MOD_SIMPLEDEFORM_ORIGIN_LOCAL;
 	smd->axis = 0;
 
 	smd->origin   =  NULL;
@@ -269,7 +261,6 @@
 	tsmd->mode  = smd->mode;
 	tsmd->axis  = smd->axis;
 	tsmd->origin = smd->origin;
-	tsmd->originOpts = smd->originOpts;
 	tsmd->factor = smd->factor;
 	memcpy(tsmd->limit, smd->limit, sizeof(tsmd->limit));
 	BLI_strncpy(tsmd->vgroup_name, smd->vgroup_name, sizeof(tsmd->vgroup_name));