diff options
| author | Monique Dewanchand <mdewanchand> | 2022-09-14 22:30:20 +0300 |
|---|---|---|
| committer | Monique <mdewanchand@atmind.nl> | 2022-09-14 22:30:56 +0300 |
| commit | 23276bcc37acc54f1e1814abdf482a432523c3a6 (patch) | |
| tree | 8677bacc96fb953fb27625a6ae563aa1ae5e1769 /source/blender/editors/object/object_add.cc | |
| parent | 1a4854898000661dd7cf57492a7a75cb60ea63ef (diff) | |
Adding `const Scene*` parameter in many areas.
Related to {D15885} that requires scene parameter
to be added in many places. To speed up the review process
the adding of the scene parameter was added in a separate
patch.
Reviewed By: mont29
Maniphest Tasks: T73411
Differential Revision: https://developer.blender.org/D15930
Diffstat (limited to 'source/blender/editors/object/object_add.cc')
| -rw-r--r-- | source/blender/editors/object/object_add.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/object/object_add.cc b/source/blender/editors/object/object_add.cc index c651affd96a..ee2bb551c40 100644 --- a/source/blender/editors/object/object_add.cc +++ b/source/blender/editors/object/object_add.cc @@ -619,14 +619,14 @@ Object *ED_object_add_type_with_obdata(bContext *C, Object *ob; if (obdata != nullptr) { BLI_assert(type == BKE_object_obdata_to_type(obdata)); - ob = BKE_object_add_for_data(bmain, view_layer, type, name, obdata, true); + ob = BKE_object_add_for_data(bmain, scene, view_layer, type, name, obdata, true); const short *materials_len_p = BKE_id_material_len_p(obdata); if (materials_len_p && *materials_len_p > 0) { BKE_object_materials_test(bmain, ob, static_cast<ID *>(ob->data)); } } else { - ob = BKE_object_add(bmain, view_layer, type, name); + ob = BKE_object_add(bmain, scene, view_layer, type, name); } Base *ob_base_act = view_layer->basact; @@ -3811,7 +3811,7 @@ static int object_add_named_exec(bContext *C, wmOperator *op) /* object_add_duplicate_internal() doesn't deselect other objects, unlike object_add_common() or * BKE_view_layer_base_deselect_all(). */ - ED_object_base_deselect_all(view_layer, nullptr, SEL_DESELECT); + ED_object_base_deselect_all(scene, view_layer, nullptr, SEL_DESELECT); ED_object_base_select(basen, BA_SELECT); ED_object_base_activate(C, basen); |