[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34126] trunk/blender/source/blender: Todo item:

[Ton Roosendaal]

Revision: 34126
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34126
Author:   ton
Date:     2011-01-06 12:16:35 +0100 (Thu, 06 Jan 2011)

Log Message:
-----------
Todo item:

Auto-texture space now is more responsive and correct.
- on transforming it, the buttons get redrawn to show option was reset
- on enabling option, texture space is recalculated/reset

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_buttons/space_buttons.c
    trunk/blender/source/blender/editors/transform/transform.c
    trunk/blender/source/blender/makesrna/intern/rna_curve.c
    trunk/blender/source/blender/makesrna/intern/rna_mesh.c

Modified: trunk/blender/source/blender/editors/space_buttons/space_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_buttons/space_buttons.c	2011-01-06 09:55:20 UTC (rev 34125)
+++ trunk/blender/source/blender/editors/space_buttons/space_buttons.c	2011-01-06 11:16:35 UTC (rev 34126)
@@ -259,6 +259,7 @@
 			switch(wmn->data) {
 				case ND_TRANSFORM:
 					buttons_area_redraw(sa, BCONTEXT_OBJECT);
+					buttons_area_redraw(sa, BCONTEXT_DATA);	/* autotexpace flag */
 					break;
 				case ND_POSE:
 				case ND_BONE_ACTIVE:

Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c	2011-01-06 09:55:20 UTC (rev 34125)
+++ trunk/blender/source/blender/editors/transform/transform.c	2011-01-06 11:16:35 UTC (rev 34126)
@@ -1499,8 +1499,9 @@
 
 	t->state = TRANS_STARTING;
 
-	if(RNA_boolean_get(op->ptr, "texture_space"))
-		options |= CTX_TEXTURE;
+	if(RNA_struct_find_property(op->ptr, "texture_space"))
+		if(RNA_boolean_get(op->ptr, "texture_space"))
+			options |= CTX_TEXTURE;
 	
 	t->options = options;
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_curve.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_curve.c	2011-01-06 09:55:20 UTC (rev 34125)
+++ trunk/blender/source/blender/makesrna/intern/rna_curve.c	2011-01-06 11:16:35 UTC (rev 34126)
@@ -175,6 +175,14 @@
 	bt->vec[1][2]= values[2];
 }
 
+static void rna_Curve_texspace_set(Main *bmain, Scene *scene, PointerRNA *ptr)
+{
+	Curve *cu= (Curve*)ptr->data;
+	
+	if (cu->texflag & CU_AUTOSPACE)
+		tex_space_curve(cu);
+}
+
 static int rna_Curve_texspace_editable(PointerRNA *ptr)
 {
 	Curve *cu= (Curve*)ptr->data;
@@ -1355,7 +1363,8 @@
 	prop= RNA_def_property(srna, "use_auto_texspace", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "texflag", CU_AUTOSPACE);
 	RNA_def_property_ui_text(prop, "Auto Texture Space", "Adjusts active object's texture space automatically when transforming object");
-	
+	RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Curve_texspace_set");
+
 	prop= RNA_def_property(srna, "texspace_location", PROP_FLOAT, PROP_TRANSLATION);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Texture Space Location", "Texture space location");

Modified: trunk/blender/source/blender/makesrna/intern/rna_mesh.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_mesh.c	2011-01-06 09:55:20 UTC (rev 34125)
+++ trunk/blender/source/blender/makesrna/intern/rna_mesh.c	2011-01-06 11:16:35 UTC (rev 34126)
@@ -229,6 +229,15 @@
 	(&mcol[3].r)[0]= (char)(CLAMPIS(values[2]*255.0f, 0, 255));
 }
 
+static void rna_Mesh_texspace_set(Main *bmain, Scene *scene, PointerRNA *ptr)
+{
+	Mesh *me= (Mesh*)ptr->data;
+	
+	if (me->texflag & AUTOSPACE)
+		tex_space_mesh(me);
+}
+
+
 static int rna_Mesh_texspace_editable(PointerRNA *ptr)
 {
 	Mesh *me= (Mesh*)ptr->data;
@@ -1903,6 +1912,7 @@
 	prop= RNA_def_property(srna, "use_auto_texspace", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "texflag", AUTOSPACE);
 	RNA_def_property_ui_text(prop, "Auto Texture Space", "Adjusts active object's texture space automatically when transforming object");
+	RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Mesh_texspace_set");
 	
 	prop= RNA_def_property(srna, "texspace_location", PROP_FLOAT, PROP_TRANSLATION);
 	RNA_def_property_array(prop, 3);