[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29643] trunk/blender/source/blender/ blenkernel/intern/DerivedMesh.c: Converting a mesh into a mesh (alt-c), was broken with shape keys and modifiers that changed the vertex count.

Campbell Barton ideasman42 at gmail.com
Wed Jun 23 12:18:52 CEST 2010


Revision: 29643
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29643
Author:   campbellbarton
Date:     2010-06-23 12:18:51 +0200 (Wed, 23 Jun 2010)

Log Message:
-----------
Converting a mesh into a mesh (alt-c), was broken with shape keys and modifiers that changed the vertex count.
removal of the shape key was undone in DM_to_mesh().

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

Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2010-06-23 09:58:32 UTC (rev 29642)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2010-06-23 10:18:51 UTC (rev 29643)
@@ -247,8 +247,8 @@
 
 	/* if the number of verts has changed, remove invalid data */
 	if(tmp.totvert != me->totvert) {
-		if(me->key) me->key->id.us--;
-		me->key = NULL;
+		if(tmp.key) tmp.key->id.us--;
+		tmp.key = NULL;
 	}
 
 	*me = tmp;





More information about the Bf-blender-cvs mailing list