Merging r58475 through r58700 from trunk into soc-2013-depsgraph_mt
[blender.git] / source / blender / editors / object / object_add.c
index 381d1780187ff1e3d0f2bebad346640709d739d9..b907cba33e2ef4e566411b95d9444bc887ff7b8e 100644 (file)
@@ -1431,7 +1431,7 @@ static int convert_exec(bContext *C, wmOperator *op)
 {
        Main *bmain = CTX_data_main(C);
        Scene *scene = CTX_data_scene(C);
-       Base *basen = NULL, *basact = NULL, *basedel = NULL;
+       Base *basen = NULL, *basact = NULL;
        Object *ob, *ob1, *newob, *obact = CTX_data_active_object(C);
        DerivedMesh *dm;
        Curve *cu;
@@ -1687,14 +1687,6 @@ static int convert_exec(bContext *C, wmOperator *op)
                        DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
                        ((ID *)ob->data)->flag &= ~LIB_DOIT; /* flag not to convert this datablock again */
                }
-
-               /* delete original if needed */
-               if (basedel) {
-                       if (!keep_original)
-                               ED_base_object_free_and_unlink(bmain, scene, basedel);
-
-                       basedel = NULL;
-               }
        }
        CTX_DATA_END;