[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15505] trunk/blender/source/blender/ blenkernel/intern/modifier.c: Fixed bug #14510 - wave modifier crash

[Ben Batt]

Revision: 15505
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15505
Author:   artificer
Date:     2008-07-09 17:54:53 +0200 (Wed, 09 Jul 2008)

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/modifier.c

Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifier.c	2008-07-09 15:30:15 UTC (rev 15504)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c	2008-07-09 15:54:53 UTC (rev 15505)
@@ -4920,7 +4920,7 @@
 
 	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) {