[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57349] trunk/blender/source/blender: Fix #35653: manual texture space location and size not working in cycles viewport.

[Brecht Van Lommel]

Revision: 57349
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57349
Author:   blendix
Date:     2013-06-10 13:01:41 +0000 (Mon, 10 Jun 2013)
Log Message:
-----------
Fix #35653: manual texture space location and size not working in cycles viewport.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
    trunk/blender/source/blender/editors/transform/transform_generics.c

Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2013-06-10 12:33:07 UTC (rev 57348)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2013-06-10 13:01:41 UTC (rev 57349)
@@ -484,6 +484,8 @@
 	Mesh tmp = *me;
 	int totvert, totedge /*, totface */ /* UNUSED */, totloop, totpoly;
 	int did_shapekeys = 0;
+	float *texloc, *texrot, *texsize;
+	short *texflag;
 	
 	CustomData_reset(&tmp.vdata);
 	CustomData_reset(&tmp.edata);
@@ -529,6 +531,14 @@
 		shapekey_layers_to_keyblocks(dm, me, uid);
 		did_shapekeys = 1;
 	}
+
+	/* copy texture space */
+	if (BKE_object_obdata_texspace_get(ob, &texflag, &texloc, &texsize, &texrot)) {
+		tmp.texflag = *texflag;
+		copy_v3_v3(tmp.loc, texloc);
+		copy_v3_v3(tmp.size, texsize);
+		copy_v3_v3(tmp.rot, texrot);
+	}
 	
 	/* not all DerivedMeshes store their verts/edges/faces in CustomData, so
 	 * we set them here in case they are missing */

Modified: trunk/blender/source/blender/editors/transform/transform_generics.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_generics.c	2013-06-10 12:33:07 UTC (rev 57348)
+++ trunk/blender/source/blender/editors/transform/transform_generics.c	2013-06-10 13:01:41 UTC (rev 57349)
@@ -908,6 +908,9 @@
 			 * otherwise proxies don't function correctly
 			 */
 			DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+
+			if(t->flag & T_TEXTURE)
+				DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
 		}
 	}
 }