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/editors/screen | |
| 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/editors/screen')
| -rw-r--r-- | source/blender/editors/screen/screen_context.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/screen/screen_edit.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c index 83e6c837eac..7bdae1464c0 100644 --- a/source/blender/editors/screen/screen_context.c +++ b/source/blender/editors/screen/screen_context.c @@ -243,7 +243,7 @@ static eContextResult screen_ctx_visible_or_editable_bones_(const bContext *C, { wmWindow *win = CTX_wm_window(C); ViewLayer *view_layer = WM_window_get_active_view_layer(win); - Object *obedit = OBEDIT_FROM_VIEW_LAYER(view_layer); + Object *obedit = BKE_view_layer_edit_object_get(view_layer); bArmature *arm = (obedit && obedit->type == OB_ARMATURE) ? obedit->data : NULL; EditBone *flipbone = NULL; @@ -314,7 +314,7 @@ static eContextResult screen_ctx_selected_bones_(const bContext *C, { wmWindow *win = CTX_wm_window(C); ViewLayer *view_layer = WM_window_get_active_view_layer(win); - Object *obedit = OBEDIT_FROM_VIEW_LAYER(view_layer); + Object *obedit = BKE_view_layer_edit_object_get(view_layer); bArmature *arm = (obedit && obedit->type == OB_ARMATURE) ? obedit->data : NULL; EditBone *flipbone = NULL; @@ -524,7 +524,7 @@ static eContextResult screen_ctx_edit_object(const bContext *C, bContextDataResu { wmWindow *win = CTX_wm_window(C); ViewLayer *view_layer = WM_window_get_active_view_layer(win); - Object *obedit = OBEDIT_FROM_VIEW_LAYER(view_layer); + Object *obedit = BKE_view_layer_edit_object_get(view_layer); /* convenience for now, 1 object per scene in editmode */ if (obedit) { CTX_data_id_pointer_set(result, &obedit->id); diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 8d871ddee23..67871d08089 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -1212,10 +1212,10 @@ void ED_screen_scene_change(bContext *C, /* Mode Syncing. */ if (view_layer_old) { WorkSpace *workspace = CTX_wm_workspace(C); - Object *obact_new = OBACT(view_layer); + Object *obact_new = BKE_view_layer_active_object_get(view_layer); UNUSED_VARS(obact_new); eObjectMode object_mode_old = workspace->object_mode; - Object *obact_old = OBACT(view_layer_old); + Object *obact_old = BKE_view_layer_active_object_get(view_layer_old); UNUSED_VARS(obact_old, object_mode_old); } #endif |