[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29618] trunk/blender/source/blender/ modifiers/intern/MOD_displace.c: Don' t evaluate displace modifier with strength 0, avoids multires

[Brecht Van Lommel]

Revision: 29618
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29618
Author:   blendix
Date:     2010-06-22 17:08:39 +0200 (Tue, 22 Jun 2010)

Log Message:
-----------
Don't evaluate displace modifier with strength 0, avoids multires
subdividing vertex group here in some cases.

(merge from render25 branch)

Modified Paths:
--------------
    trunk/blender/source/blender/modifiers/intern/MOD_displace.c

Modified: trunk/blender/source/blender/modifiers/intern/MOD_displace.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_displace.c        
2010-06-22 15:04:03 UTC (rev 29617)
+++ trunk/blender/source/blender/modifiers/intern/MOD_displace.c        
2010-06-22 15:08:39 UTC (rev 29618)
@@ -124,7 +124,7 @@
 {
        DisplaceModifierData *dmd = (DisplaceModifierData*) md;
 
-       return !dmd->texture;
+       return (!dmd->texture || dmd->strength == 0.0f);
 }
 
 static void updateDepgraph(


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