[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34104] trunk/blender: Todo item: brought transform texture space back.

[Ton Roosendaal]

Revision: 34104
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34104
Author:   ton
Date:     2011-01-05 18:27:26 +0100 (Wed, 05 Jan 2011)

Log Message:
-----------
Todo item: brought transform texture space back.
Code changes are minimal, re-using the code as already was there.

Options are in pulldown menu, or SHIFT+T and SHIFT+ALT+T

Might be that Martin likes to see it different... do we need
a special operatortype for it?

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_view3d.py
    trunk/blender/source/blender/editors/include/ED_transform.h
    trunk/blender/source/blender/editors/transform/transform.c
    trunk/blender/source/blender/editors/transform/transform_conversions.c
    trunk/blender/source/blender/editors/transform/transform_ops.c

Modified: trunk/blender/release/scripts/ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d.py	2011-01-05 15:58:44 UTC (rev 34103)
+++ trunk/blender/release/scripts/ui/space_view3d.py	2011-01-05 17:27:26 UTC (rev 34104)
@@ -152,6 +152,13 @@
         layout.operator("transform.warp", text="Warp")
         layout.operator("transform.push_pull", text="Push/Pull")
 
+        layout.separator()
+
+        layout.operator("transform.translate", text="Move Texture Space").texture_space = True
+        layout.operator("transform.resize", text="Scale Texture Space").texture_space = True
+
+        layout.separator()
+
         obj = context.object
         if obj.type == 'ARMATURE' and obj.mode in ('EDIT', 'POSE') and obj.data.draw_type in ('BBONE', 'ENVELOPE'):
             layout.operator("transform.transform", text="Scale Envelope/BBone").mode = 'BONE_SIZE'

Modified: trunk/blender/source/blender/editors/include/ED_transform.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_transform.h	2011-01-05 15:58:44 UTC (rev 34103)
+++ trunk/blender/source/blender/editors/include/ED_transform.h	2011-01-05 17:27:26 UTC (rev 34104)
@@ -142,6 +142,7 @@
 #define P_GEO_SNAP		(P_SNAP|(1 << 4))
 #define P_ALIGN_SNAP	(P_GEO_SNAP|(1 << 5))
 #define P_CONSTRAINT	(1 << 6)
+#define P_OPTIONS		(1 << 7)
 
 void Transform_Properties(struct wmOperatorType *ot, int flags);
 

Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c	2011-01-05 15:58:44 UTC (rev 34103)
+++ trunk/blender/source/blender/editors/transform/transform.c	2011-01-05 17:27:26 UTC (rev 34104)
@@ -1499,6 +1499,9 @@
 
 	t->state = TRANS_STARTING;
 
+	if(RNA_boolean_get(op->ptr, "texture_space"))
+		options |= CTX_TEXTURE;
+	
 	t->options = options;
 
 	t->mode = mode;

Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c	2011-01-05 15:58:44 UTC (rev 34103)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c	2011-01-05 17:27:26 UTC (rev 34104)
@@ -268,6 +268,7 @@
 	invert_m3_m3(td->smtx, td->mtx);
 
 	if (give_obdata_texspace(ob, &texflag, &td->loc, &td->ext->size, &td->ext->rot)) {
+		ob->dtx |= OB_TEXSPACE;
 		*texflag &= ~AUTOSPACE;
 	}
 

Modified: trunk/blender/source/blender/editors/transform/transform_ops.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_ops.c	2011-01-05 15:58:44 UTC (rev 34103)
+++ trunk/blender/source/blender/editors/transform/transform_ops.c	2011-01-05 17:27:26 UTC (rev 34104)
@@ -444,6 +444,11 @@
 			}
 		}
 	}
+	
+	if (flags & P_OPTIONS)
+	{
+		RNA_def_boolean(ot->srna, "texture_space", 0, "Edit Object data texture space", "");
+	}
 
 	// Add confirm method all the time. At the end because it's not really that important and should be hidden only in log, not in keymap edit
 	prop = RNA_def_boolean(ot->srna, "release_confirm", 0, "Confirm on Release", "Always confirm operation when releasing button");
@@ -467,7 +472,7 @@
 
 	RNA_def_float_vector_xyz(ot->srna, "value", 3, NULL, -FLT_MAX, FLT_MAX, "Vector", "", -FLT_MAX, FLT_MAX);
 
-	Transform_Properties(ot, P_CONSTRAINT|P_PROPORTIONAL|P_MIRROR|P_ALIGN_SNAP);
+	Transform_Properties(ot, P_CONSTRAINT|P_PROPORTIONAL|P_MIRROR|P_ALIGN_SNAP|P_OPTIONS);
 }
 
 void TRANSFORM_OT_resize(struct wmOperatorType *ot)
@@ -487,7 +492,7 @@
 
 	RNA_def_float_vector(ot->srna, "value", 3, VecOne, -FLT_MAX, FLT_MAX, "Vector", "", -FLT_MAX, FLT_MAX);
 
-	Transform_Properties(ot, P_CONSTRAINT|P_PROPORTIONAL|P_MIRROR|P_GEO_SNAP);
+	Transform_Properties(ot, P_CONSTRAINT|P_PROPORTIONAL|P_MIRROR|P_GEO_SNAP|P_OPTIONS);
 }
 
 
@@ -854,7 +859,14 @@
 			RNA_string_set(km->ptr, "data_path", "tool_settings.use_snap");
 
 			km = WM_keymap_add_item(keymap, "TRANSFORM_OT_snap_type", TABKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0);
+			
+			km = WM_keymap_add_item(keymap, OP_TRANSLATION, TKEY, KM_PRESS, KM_SHIFT, 0);
+			RNA_boolean_set(km->ptr, "texture_space", 1);
+			
+			km = WM_keymap_add_item(keymap, OP_RESIZE, TKEY, KM_PRESS, KM_SHIFT|KM_ALT, 0);
+			RNA_boolean_set(km->ptr, "texture_space", 1);
 
+
 			break;
 		case SPACE_ACTION:
 			km= WM_keymap_add_item(keymap, "TRANSFORM_OT_transform", GKEY, KM_PRESS, 0, 0);