svn merge -r39877:39878 https://svn.blender.org/svnroot/bf-blender/trunk/blender...

[blender-staging.git] / source / blender / bmesh / operators / mesh_conv.c

diff --git a/source/blender/bmesh/operators/mesh_conv.c b/source/blender/bmesh/operators/mesh_conv.c
index 60b8b2770f25094edfd17a9dc56f7ac9fcedee2f..0df65d0f28183572f9955b5654c6e81297687974 100644 (file)
--- a/source/blender/bmesh/operators/mesh_conv.c
+++ b/source/blender/bmesh/operators/mesh_conv.c
@@ -620,7 +620,7 @@ void bmesh_to_mesh_exec(BMesh *bm, BMOperator *op) {
                int i,j;
 
                for (ob=G.main->object.first; ob; ob=ob->id.next) {
-                       if (ob->parent==ob && ELEM(ob->partype, PARVERT1,PARVERT3)) {
+                       if (ob->parent==bm->ob && ELEM(ob->partype, PARVERT1,PARVERT3)) {
                                
                                /* duplicate code from below, make it function later...? */
                                if (!vertMap) {