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/makesrna/intern/rna_space.c | |
| 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/makesrna/intern/rna_space.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 3e253d9da8e..9b08b6ef665 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -1664,7 +1664,7 @@ static bool rna_SpaceImageEditor_show_uvedit_get(PointerRNA *ptr) wmWindow *win = ED_screen_window_find(screen, G_MAIN->wm.first); if (win != NULL) { ViewLayer *view_layer = WM_window_get_active_view_layer(win); - obedit = OBEDIT_FROM_VIEW_LAYER(view_layer); + obedit = BKE_view_layer_edit_object_get(view_layer); } return ED_space_image_show_uvedit(sima, obedit); } @@ -1677,7 +1677,7 @@ static bool rna_SpaceImageEditor_show_maskedit_get(PointerRNA *ptr) wmWindow *win = ED_screen_window_find(screen, G_MAIN->wm.first); if (win != NULL) { ViewLayer *view_layer = WM_window_get_active_view_layer(win); - obedit = OBEDIT_FROM_VIEW_LAYER(view_layer); + obedit = BKE_view_layer_edit_object_get(view_layer); } return ED_space_image_check_show_maskedit(sima, obedit); } @@ -2177,7 +2177,7 @@ static void rna_SpaceDopeSheetEditor_action_update(bContext *C, PointerRNA *ptr) ViewLayer *view_layer = CTX_data_view_layer(C); Main *bmain = CTX_data_main(C); - Object *obact = OBACT(view_layer); + Object *obact = BKE_view_layer_active_object_get(view_layer); if (obact == NULL) { return; } @@ -2250,7 +2250,7 @@ static void rna_SpaceDopeSheetEditor_mode_update(bContext *C, PointerRNA *ptr) SpaceAction *saction = (SpaceAction *)(ptr->data); ScrArea *area = CTX_wm_area(C); ViewLayer *view_layer = CTX_data_view_layer(C); - Object *obact = OBACT(view_layer); + Object *obact = BKE_view_layer_active_object_get(view_layer); /* special exceptions for ShapeKey Editor mode */ if (saction->mode == SACTCONT_SHAPEKEY) { |