diff options
author | Ben Batt <benbatt@gmail.com> | 2008-07-09 19:54:53 +0400 |
---|---|---|
committer | Ben Batt <benbatt@gmail.com> | 2008-07-09 19:54:53 +0400 |
commit | 12c128ac040a842f3fb72a1f4e103abf061a47e2 (patch) | |
tree | f7d6dcaa85641d90cef756476197619f6c2a24f1 | |
parent | 732d886e0a8853ad8029e3e68cc826b69a28cf87 (diff) |
Fixed bug #14510 - wave modifier crash
CDDM_apply_vert_coords needs a CDDerivedMesh, but it was getting a
CCGDerivedMesh from the preceding Subsurf modifier. This fix just makes
a CDDerivedMesh copy of the supplied DerivedMesh rather than using it directly.
-rw-r--r-- | source/blender/blenkernel/intern/modifier.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index a0841bb9f03..f13f8ef0298 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -4920,7 +4920,7 @@ static void waveModifier_deformVertsEM( if(!wmd->texture && !wmd->defgrp_name[0] && !(wmd->flag & MOD_WAVE_NORM)) dm = derivedData; - else if(derivedData) dm = derivedData; + else if(derivedData) dm = CDDM_copy(derivedData); else dm = CDDM_from_editmesh(editData, ob->data); if(wmd->flag & MOD_WAVE_NORM) { |