[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38140] trunk/blender/source/blender/nodes /intern/TEX_nodes/TEX_texture.c: Fix #27875: different texture nodes result after decompose/compose.
Brecht Van Lommel
brechtvanlommel at pandora.be
Wed Jul 6 11:58:30 CEST 2011
Revision: 38140
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38140
Author: blendix
Date: 2011-07-06 09:58:29 +0000 (Wed, 06 Jul 2011)
Log Message:
-----------
Fix #27875: different texture nodes result after decompose/compose.
Modified Paths:
--------------
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_texture.c
Modified: trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_texture.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_texture.c 2011-07-06 09:15:18 UTC (rev 38139)
+++ trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_texture.c 2011-07-06 09:58:29 UTC (rev 38140)
@@ -51,7 +51,11 @@
{
static float red[] = {1,0,0,1};
static float white[] = {1,1,1,1};
- float *co = p->co;
+ float co[3], dxt[3], dyt[3];
+
+ copy_v3_v3(co, p->co);
+ copy_v3_v3(dxt, p->dxt);
+ copy_v3_v3(dyt, p->dyt);
Tex *nodetex = (Tex *)node->id;
@@ -70,9 +74,9 @@
tex_input_rgba(col1, in[0], p, thread);
tex_input_rgba(col2, in[1], p, thread);
-
+
texres.nor = nor;
- textype = multitex_nodes(nodetex, co, p->dxt, p->dyt, p->osatex,
+ textype = multitex_nodes(nodetex, co, dxt, dyt, p->osatex,
&texres, thread, 0, p->shi, p->mtex);
if(textype & TEX_RGB) {
More information about the Bf-blender-cvs
mailing list