diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-07-27 13:20:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-07-27 13:20:10 +0400 |
| commit | 09aadea2cc26f710a73ba524b076eebada8c93b5 (patch) | |
| tree | 653d741706b53bf511a296ce5650a659bb1e5026 /source/blender/editors/object/object_add.c | |
| parent | e2ece45fec69c5ddefaba9ded8bdb358f9a84b8d (diff) | |
remove unused code from object convert and indent.
Diffstat (limited to 'source/blender/editors/object/object_add.c')
| -rw-r--r-- | source/blender/editors/object/object_add.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 5b100d7b6c2..ce61b4fce50 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -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; |