[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36847] branches/bmesh/blender/source/ blender/modifiers/intern/MOD_mask.c: =bmesh= fixed mask modifier stack bug

[Joseph Eagar]

Revision: 36847
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36847
Author:   joeedh
Date:     2011-05-24 01:54:13 +0000 (Tue, 24 May 2011)
Log Message:
-----------
=bmesh= fixed mask modifier stack bug

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_mask.c

Modified: branches/bmesh/blender/source/blender/modifiers/intern/MOD_mask.c
===================================================================
--- branches/bmesh/blender/source/blender/modifiers/intern/MOD_mask.c	2011-05-24 01:34:28 UTC (rev 36846)
+++ branches/bmesh/blender/source/blender/modifiers/intern/MOD_mask.c	2011-05-24 01:54:13 UTC (rev 36847)
@@ -376,13 +376,16 @@
 		if (source.v4)
 		   source.v4 = GET_INT_FROM_POINTER(BLI_ghash_lookup(vertHash, SET_INT_IN_POINTER(source.v4)));
 		
-		DM_copy_face_data(dm, result, oldIndex, newIndex, 1);
+		DM_copy_tessface_data(dm, result, oldIndex, newIndex, 1);
 		*dest = source;
 		
 		test_index_face(dest, &result->faceData, newIndex, (orig_v4 ? 4 : 3));
 	}
 	BLI_ghashIterator_free(hashIter);
 	
+	/* build polys from tess faces, for now */
+	CDDM_tessfaces_to_faces(result);
+
 	/* recalculate normals */
 	CDDM_calc_normals(result);
 	
@@ -392,11 +395,8 @@
 	BLI_ghash_free(faceHash, NULL, NULL);
 	
 	/* return the new mesh */
-	dm = CDDM_copy(result, 1); /*builds ngon faces from tess (mface) faces*/
-	result->needsFree = 1;
-	result->release(result);
 
-	return dm;
+	return result;
 }