[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34652] trunk/blender/source/blender/ render/intern/source/texture.c: Bugfix 25871

[Ton Roosendaal]

Revision: 34652
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34652
Author:   ton
Date:     2011-02-05 13:07:51 +0000 (Sat, 05 Feb 2011)
Log Message:
-----------
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.

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 2011-02-05 
11:46:44 UTC (rev 34651)
+++ trunk/blender/source/blender/render/intern/source/texture.c 2011-02-05 
13:07:51 UTC (rev 34652)
@@ -2113,7 +2113,8 @@
                        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;
                        }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs