[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27220] trunk/blender/source/blender/ editors/object/object_add.c: convert to mesh (Alt+C), was failing in cases when MDef was used.

[Campbell Barton]

Revision: 27220
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27220
Author:   campbellbarton
Date:     2010-03-02 16:33:33 +0100 (Tue, 02 Mar 2010)

Log Message:
-----------
convert to mesh (Alt+C), was failing in cases when MDef was used. make the mesh from the original rather then the copy.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_add.c

Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c	2010-03-02 15:05:40 UTC (rev 27219)
+++ trunk/blender/source/blender/editors/object/object_add.c	2010-03-02 15:33:33 UTC (rev 27220)
@@ -1261,7 +1261,10 @@
 			ob1->data= copy_mesh(me);
 
 			/* make new mesh data from the original copy */
-			dm= mesh_get_derived_final(scene, ob1, CD_MASK_MESH);
+			/* note: get the mesh from the original, not from the copy in some
+			 * cases this doesnt give correct results (when MDEF is used for eg)
+			 */
+			dm= mesh_get_derived_final(scene, ob, CD_MASK_MESH);
 			/* dm= mesh_create_derived_no_deform(ob1, NULL);	this was called original (instead of get_derived). man o man why! (ton) */
 
 			DM_to_mesh(dm, ob1->data);