[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29475] branches/render25/source/blender/ modifiers/intern/MOD_displace.c: Render Branch: don' t evaluate displace modifier with strength 0,

[Brecht Van Lommel]

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

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

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

Modified: branches/render25/source/blender/modifiers/intern/MOD_displace.c
===================================================================
--- branches/render25/source/blender/modifiers/intern/MOD_displace.c    
2010-06-15 18:19:35 UTC (rev 29474)
+++ branches/render25/source/blender/modifiers/intern/MOD_displace.c    
2010-06-15 18:22:28 UTC (rev 29475)
@@ -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