diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-09 18:11:20 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-09 18:23:41 +0300 |
| commit | c35f1d05eaa13348d4f33cdb44f6fb62f68e1ba3 (patch) | |
| tree | 698066b5eade15949b0453796c4d9fc466df42ac /source/blender/editors/object/object_add.c | |
| parent | 09d26cab0bdde16529debd3e0271252012ba69eb (diff) | |
Farewell Scene->basact
Diffstat (limited to 'source/blender/editors/object/object_add.c')
| -rw-r--r-- | source/blender/editors/object/object_add.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index f6a23a03aa4..2f9dbb657c4 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -1204,7 +1204,7 @@ static void object_delete_check_glsl_update(Object *ob) /* remove base from a specific scene */ /* note: now unlinks constraints as well */ -void ED_base_object_free_and_unlink(Main *bmain, Scene *scene, Object *ob) +void ED_object_base_free_and_unlink(Main *bmain, Scene *scene, Object *ob) { if (BKE_library_ID_is_indirectly_used(bmain, ob) && ID_REAL_USERS(ob) <= 1 && ID_EXTRA_USERS(ob) == 0) @@ -1272,7 +1272,7 @@ static int object_delete_exec(bContext *C, wmOperator *op) } /* remove from current scene only */ - ED_base_object_free_and_unlink(bmain, scene, ob); + ED_object_base_free_and_unlink(bmain, scene, ob); changed = true; if (use_global) { @@ -1285,7 +1285,7 @@ static int object_delete_exec(bContext *C, wmOperator *op) ob->id.name + 2, scene_iter->id.name + 2); break; } - ED_base_object_free_and_unlink(bmain, scene_iter, ob); + ED_object_base_free_and_unlink(bmain, scene_iter, ob); } } } @@ -2013,7 +2013,7 @@ static int convert_exec(bContext *C, wmOperator *op) if (BKE_mball_is_basis(ob_mball) || ((ob_basis = BKE_mball_basis_find(scene, ob_mball)) && (ob_basis->flag & OB_DONE))) { - ED_base_object_free_and_unlink(bmain, scene, ob_mball); + ED_object_base_free_and_unlink(bmain, scene, ob_mball); } } } |