Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-03-02 18:33:33 +0300
committerCampbell Barton <ideasman42@gmail.com>2010-03-02 18:33:33 +0300
commitcb22649e0b5ef2cb4ddfac5d4dccec102e44ce0e (patch)
treef30ac8cfe2a862b540d4ff6fd923aff0fb72a6c6 /source/blender/editors
parentaec7174a42908671953805bb8f6424bd10641d6d (diff)
convert to mesh (Alt+C), was failing in cases when MDef was used. make the mesh from the original rather then the copy.
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/object/object_add.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 1ec3a82fc58..f0aaef63c68 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -1261,7 +1261,10 @@ static int convert_exec(bContext *C, wmOperator *op)
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);