diff options
| author | Monique Dewanchand <mdewanchand> | 2022-09-01 11:00:53 +0300 |
|---|---|---|
| committer | Monique <mdewanchand@atmind.nl> | 2022-09-01 11:22:43 +0300 |
| commit | 17501c146edc4af8a5e04565dc4d0b30ed5c5323 (patch) | |
| tree | 73fe3334ff45b67d45fa1b5a5ae7ff06ec990a5a /source/blender/blenkernel/intern/object.cc | |
| parent | f9c249917dbf9c450abf52df1f60b3d587bc106a (diff) | |
Cleanup: Remove/replace View Layer macros.
This patch is a cleanup required before refactoring the view layer syncing
process {T73411}.
* Remove FIRSTBASE.
* Remove LASTBASE.
* Remove BASACT.
* Remove OBEDIT_FROM_WORKSPACE.
* Replace OBACT with BKE_view_layer_active_object.
* Replace OBEDIT_FROM_VIEW_LAYER with BKE_view_layer_edit_object.
Reviewed By: mont29
Maniphest Tasks: T73411
Differential Revision: https://developer.blender.org/D15799
Diffstat (limited to 'source/blender/blenkernel/intern/object.cc')
| -rw-r--r-- | source/blender/blenkernel/intern/object.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc index c90c83074bd..0389fa2f1c6 100644 --- a/source/blender/blenkernel/intern/object.cc +++ b/source/blender/blenkernel/intern/object.cc @@ -2547,7 +2547,7 @@ Object **BKE_object_pose_array_get_ex(ViewLayer *view_layer, uint *r_objects_len, bool unique) { - Object *ob_active = OBACT(view_layer); + Object *ob_active = BKE_view_layer_active_object_get(view_layer); Object *ob_pose = BKE_object_pose_armature_get(ob_active); Object **objects = nullptr; if (ob_pose == ob_active) { @@ -2583,7 +2583,7 @@ Base **BKE_object_pose_base_array_get_ex(ViewLayer *view_layer, uint *r_bases_len, bool unique) { - Base *base_active = BASACT(view_layer); + Base *base_active = view_layer->basact; Object *ob_pose = base_active ? BKE_object_pose_armature_get(base_active->object) : nullptr; Base *base_pose = nullptr; Base **bases = nullptr; |