diff options
author | Ton Roosendaal <ton@blender.org> | 2011-02-05 16:07:51 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2011-02-05 16:07:51 +0300 |
commit | df9fade564d3b1a5ed57d397918652cd72c79783 (patch) | |
tree | 6dd52bdec6d1958a9b0c721ee1c1ba7d9fa708dc | |
parent | 311f5a8d78d22b2d1034f1e54c783c1b71100e9a (diff) |
Bugfix 25871
Using displacement with new bump caused NaN values or crashes.
Since displace code doesn't provide derivatives, it now falls
back to "old bump" by default.
-rw-r--r-- | source/blender/render/intern/source/texture.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c index 1ed1ba998cc..a62c4bd8e74 100644 --- a/source/blender/render/intern/source/texture.c +++ b/source/blender/render/intern/source/texture.c @@ -2113,7 +2113,8 @@ void do_material_tex(ShadeInput *shi) use_ntap_bump= (mtex->texflag & (MTEX_3TAP_BUMP|MTEX_5TAP_BUMP)); /* XXX texture node trees don't work for this yet */ - if(tex->nodetree && tex->use_nodes) { + /* it also needs derivatives */ + if((tex->nodetree && tex->use_nodes) || shi->osatex==0) { use_compat_bump = 0; use_ntap_bump = 0; } |