diff options
author | Nathan Craddock <nzcraddock@gmail.com> | 2020-08-07 20:47:23 +0300 |
---|---|---|
committer | Nathan Craddock <nzcraddock@gmail.com> | 2020-08-07 20:49:58 +0300 |
commit | 915cc956baff85d47387736ab367ab3774ee3353 (patch) | |
tree | 13b33fe57adc9f2818d19fd18595aac9f805c572 /source/blender/editors/space_outliner/outliner_sync.c | |
parent | 2597c12b0c103ec922d1ec5ff912dbd9d691f1b3 (diff) |
Cleanup: Rename soops to space_outliner
No functional changes. Rename soops, soutliner, and so to
space_outliner.
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_sync.c')
-rw-r--r-- | source/blender/editors/space_outliner/outliner_sync.c | 62 |
1 files changed, 33 insertions, 29 deletions
diff --git a/source/blender/editors/space_outliner/outliner_sync.c b/source/blender/editors/space_outliner/outliner_sync.c index a4be4062746..3055d15725b 100644 --- a/source/blender/editors/space_outliner/outliner_sync.c +++ b/source/blender/editors/space_outliner/outliner_sync.c @@ -99,9 +99,9 @@ void ED_outliner_select_sync_flag_outliners(const bContext *C) LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) { LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) { if (sl->spacetype == SPACE_OUTLINER) { - SpaceOutliner *soutliner = (SpaceOutliner *)sl; + SpaceOutliner *space_outliner = (SpaceOutliner *)sl; - soutliner->sync_select_dirty |= wm->outliner_sync_select_dirty; + space_outliner->sync_select_dirty |= wm->outliner_sync_select_dirty; } } } @@ -128,13 +128,13 @@ typedef struct SyncSelectTypes { * interaction mode and outliner display mode */ static void outliner_sync_select_from_outliner_set_types(bContext *C, - SpaceOutliner *soops, + SpaceOutliner *space_outliner, SyncSelectTypes *sync_types) { TreeViewContext tvc; outliner_viewcontext_init(C, &tvc); - const bool sequence_view = soops->outlinevis == SO_SEQUENCE; + const bool sequence_view = space_outliner->outlinevis == SO_SEQUENCE; sync_types->object = !sequence_view; sync_types->edit_bone = !sequence_view && (tvc.ob_edit && tvc.ob_edit->type == OB_ARMATURE); @@ -148,22 +148,24 @@ static void outliner_sync_select_from_outliner_set_types(bContext *C, * Returns true if a sync is needed. */ static bool outliner_sync_select_to_outliner_set_types(const bContext *C, - SpaceOutliner *soops, + SpaceOutliner *space_outliner, SyncSelectTypes *sync_types) { TreeViewContext tvc; outliner_viewcontext_init(C, &tvc); - const bool sequence_view = soops->outlinevis == SO_SEQUENCE; + const bool sequence_view = space_outliner->outlinevis == SO_SEQUENCE; sync_types->object = !sequence_view && - (soops->sync_select_dirty & WM_OUTLINER_SYNC_SELECT_FROM_OBJECT); + (space_outliner->sync_select_dirty & WM_OUTLINER_SYNC_SELECT_FROM_OBJECT); sync_types->edit_bone = !sequence_view && (tvc.ob_edit && tvc.ob_edit->type == OB_ARMATURE) && - (soops->sync_select_dirty & WM_OUTLINER_SYNC_SELECT_FROM_EDIT_BONE); + (space_outliner->sync_select_dirty & + WM_OUTLINER_SYNC_SELECT_FROM_EDIT_BONE); sync_types->pose_bone = !sequence_view && (tvc.ob_pose && tvc.ob_pose->mode == OB_MODE_POSE) && - (soops->sync_select_dirty & WM_OUTLINER_SYNC_SELECT_FROM_POSE_BONE); - sync_types->sequence = sequence_view && - (soops->sync_select_dirty & WM_OUTLINER_SYNC_SELECT_FROM_SEQUENCE); + (space_outliner->sync_select_dirty & + WM_OUTLINER_SYNC_SELECT_FROM_POSE_BONE); + sync_types->sequence = sequence_view && (space_outliner->sync_select_dirty & + WM_OUTLINER_SYNC_SELECT_FROM_SEQUENCE); return sync_types->object || sync_types->edit_bone || sync_types->pose_bone || sync_types->sequence; @@ -349,11 +351,11 @@ static void outliner_sync_selection_from_outliner(Scene *scene, } /* Set clean outliner and mark other outliners for syncing */ -void ED_outliner_select_sync_from_outliner(bContext *C, SpaceOutliner *soops) +void ED_outliner_select_sync_from_outliner(bContext *C, SpaceOutliner *space_outliner) { /* Don't sync if not checked or in certain outliner display modes */ - if (!(soops->flag & SO_SYNC_SELECT) || - ELEM(soops->outlinevis, SO_LIBRARIES, SO_DATA_API, SO_ID_ORPHANS)) { + if (!(space_outliner->flag & SO_SYNC_SELECT) || + ELEM(space_outliner->outlinevis, SO_LIBRARIES, SO_DATA_API, SO_ID_ORPHANS)) { return; } @@ -361,7 +363,7 @@ void ED_outliner_select_sync_from_outliner(bContext *C, SpaceOutliner *soops) ViewLayer *view_layer = CTX_data_view_layer(C); SyncSelectTypes sync_types; - outliner_sync_select_from_outliner_set_types(C, soops, &sync_types); + outliner_sync_select_from_outliner_set_types(C, space_outliner, &sync_types); /* To store elements that have been selected to prevent linked object sync errors */ SelectedItems selected_items; @@ -369,24 +371,24 @@ void ED_outliner_select_sync_from_outliner(bContext *C, SpaceOutliner *soops) selected_items_init(&selected_items); outliner_sync_selection_from_outliner( - scene, view_layer, &soops->tree, &sync_types, &selected_items); + scene, view_layer, &space_outliner->tree, &sync_types, &selected_items); selected_items_free(&selected_items); /* Tag for updates and clear dirty flag toprevent a sync to the outliner on draw */ if (sync_types.object) { - soops->sync_select_dirty &= ~WM_OUTLINER_SYNC_SELECT_FROM_OBJECT; + space_outliner->sync_select_dirty &= ~WM_OUTLINER_SYNC_SELECT_FROM_OBJECT; DEG_id_tag_update(&scene->id, ID_RECALC_SELECT); WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene); } else if (sync_types.edit_bone) { - soops->sync_select_dirty &= ~WM_OUTLINER_SYNC_SELECT_FROM_EDIT_BONE; + space_outliner->sync_select_dirty &= ~WM_OUTLINER_SYNC_SELECT_FROM_EDIT_BONE; } else if (sync_types.pose_bone) { - soops->sync_select_dirty &= ~WM_OUTLINER_SYNC_SELECT_FROM_POSE_BONE; + space_outliner->sync_select_dirty &= ~WM_OUTLINER_SYNC_SELECT_FROM_POSE_BONE; } if (sync_types.sequence) { - soops->sync_select_dirty &= ~WM_OUTLINER_SYNC_SELECT_FROM_SEQUENCE; + space_outliner->sync_select_dirty &= ~WM_OUTLINER_SYNC_SELECT_FROM_SEQUENCE; WM_event_add_notifier(C, NC_SCENE | ND_SEQUENCER | NA_SELECTED, scene); } } @@ -491,7 +493,7 @@ typedef struct SyncSelectActiveData { /** Sync select and active flags from active view layer, bones, and sequences to the outliner. */ static void outliner_sync_selection_to_outliner(ViewLayer *view_layer, - SpaceOutliner *soops, + SpaceOutliner *space_outliner, ListBase *tree, SyncSelectActiveData *active_data, const SyncSelectTypes *sync_types) @@ -524,7 +526,8 @@ static void outliner_sync_selection_to_outliner(ViewLayer *view_layer, } /* Sync subtree elements */ - outliner_sync_selection_to_outliner(view_layer, soops, &te->subtree, active_data, sync_types); + outliner_sync_selection_to_outliner( + view_layer, space_outliner, &te->subtree, active_data, sync_types); } } @@ -540,11 +543,12 @@ static void get_sync_select_active_data(const bContext *C, SyncSelectActiveData } /* If outliner is dirty sync selection from view layer and sequwncer */ -void outliner_sync_selection(const bContext *C, SpaceOutliner *soops) +void outliner_sync_selection(const bContext *C, SpaceOutliner *space_outliner) { /* Set which types of data to sync from sync dirty flag and outliner display mode */ SyncSelectTypes sync_types; - const bool sync_required = outliner_sync_select_to_outliner_set_types(C, soops, &sync_types); + const bool sync_required = outliner_sync_select_to_outliner_set_types( + C, space_outliner, &sync_types); if (sync_required) { ViewLayer *view_layer = CTX_data_view_layer(C); @@ -554,20 +558,20 @@ void outliner_sync_selection(const bContext *C, SpaceOutliner *soops) get_sync_select_active_data(C, &active_data); outliner_sync_selection_to_outliner( - view_layer, soops, &soops->tree, &active_data, &sync_types); + view_layer, space_outliner, &space_outliner->tree, &active_data, &sync_types); /* Keep any unsynced data in the dirty flag */ if (sync_types.object) { - soops->sync_select_dirty &= ~WM_OUTLINER_SYNC_SELECT_FROM_OBJECT; + space_outliner->sync_select_dirty &= ~WM_OUTLINER_SYNC_SELECT_FROM_OBJECT; } if (sync_types.edit_bone) { - soops->sync_select_dirty &= ~WM_OUTLINER_SYNC_SELECT_FROM_EDIT_BONE; + space_outliner->sync_select_dirty &= ~WM_OUTLINER_SYNC_SELECT_FROM_EDIT_BONE; } if (sync_types.pose_bone) { - soops->sync_select_dirty &= ~WM_OUTLINER_SYNC_SELECT_FROM_POSE_BONE; + space_outliner->sync_select_dirty &= ~WM_OUTLINER_SYNC_SELECT_FROM_POSE_BONE; } if (sync_types.sequence) { - soops->sync_select_dirty &= ~WM_OUTLINER_SYNC_SELECT_FROM_SEQUENCE; + space_outliner->sync_select_dirty &= ~WM_OUTLINER_SYNC_SELECT_FROM_SEQUENCE; } } } |