kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Bug #22585

Browse Source 
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)
This commit is contained in:
Ton Roosendaal 2010-11-16 13:41:39 +00:00
parent 3ad21a8b4c
commit 2153c663be
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/render/intern/source/texture.c
View File

@ -1348,9 +1348,16 @@ int multitex_mtex(ShadeInput *shi, MTex *mtex, float *texvec, float *dxt, float
/* Warning, if the texres's values are not declared zero, check the return value to be sure /* 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 */ * 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) 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;
} }
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */