diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-06-22 19:08:39 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-06-22 19:08:39 +0400 |
| commit | 844274c27ab557c53288ead3944c2981e700f962 (patch) | |
| tree | 83a45a86677b65d53970be2aef353be2d2c2d1e5 /source/blender/modifiers | |
| parent | c0be8ee8cb1bf2f0a92e9475415ae00d1a645cbe (diff) | |
Don't evaluate displace modifier with strength 0, avoids multires
subdividing vertex group here in some cases.
(merge from render25 branch)
Diffstat (limited to 'source/blender/modifiers')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_displace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c index 531aaff504b..e73c3e29f66 100644 --- a/source/blender/modifiers/intern/MOD_displace.c +++ b/source/blender/modifiers/intern/MOD_displace.c @@ -124,7 +124,7 @@ static int isDisabled(ModifierData *md, int useRenderParams) { DisplaceModifierData *dmd = (DisplaceModifierData*) md; - return !dmd->texture; + return (!dmd->texture || dmd->strength == 0.0f); } static void updateDepgraph( |