[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33103] trunk/blender/source/blender/ render/intern/source/texture.c: Bug #22585

[Ton Roosendaal]

Revision: 33103
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33103
Author:   ton
Date:     2010-11-16 14:41:39 +0100 (Tue, 16 Nov 2010)

Log Message:
-----------
Bug #22585

Using texture nodes for displacement crashes, a conflict between using
nodes in render and for displacement at same time. Code simply disables
texture nodes for displacement for now, until we have better handling for it.
(on our long todo)

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/texture.c

Modified: trunk/blender/source/blender/render/intern/source/texture.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/texture.c	2010-11-16 13:25:21 UTC (rev 33102)
+++ trunk/blender/source/blender/render/intern/source/texture.c	2010-11-16 13:41:39 UTC (rev 33103)
@@ -1348,9 +1348,16 @@
 
 /* Warning, if the texres's values are not declared zero, check the return value to be sure
  * the color values are set before using the r/g/b values, otherwise you may use uninitialized values - Campbell */
+/* extern-tex doesn't support nodes (ntreeBeginExec() can't be called when rendering is going on) */
 int multitex_ext(Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, TexResult *texres)
 {
-	return multitex_nodes(tex, texvec, dxt, dyt, osatex, texres, 0, 0, NULL, NULL);
+	int use_nodes= tex->use_nodes, retval;
+	
+	tex->use_nodes= 0;
+	retval= multitex_nodes(tex, texvec, dxt, dyt, osatex, texres, 0, 0, NULL, NULL);
+	tex->use_nodes= use_nodes;
+	
+	return retval;
 }
 
 /* ------------------------------------------------------------------------- */