diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-02-16 01:47:19 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-16 01:48:29 +0300 |
commit | 374cbdc63bde61d590340b824039f6aa892c79e7 (patch) | |
tree | afccde6dbd75c45838dd6e1f8dbd305aa19cd605 /source/blender/editors/space_outliner/outliner_collections.c | |
parent | 51c034686a2a86629030a02c398d2686b8331ad4 (diff) |
DNA: rename SpaceOops -> SpaceOutliner
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_collections.c')
-rw-r--r-- | source/blender/editors/space_outliner/outliner_collections.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/source/blender/editors/space_outliner/outliner_collections.c b/source/blender/editors/space_outliner/outliner_collections.c index 49a77af2bbf..e71e518c2c7 100644 --- a/source/blender/editors/space_outliner/outliner_collections.c +++ b/source/blender/editors/space_outliner/outliner_collections.c @@ -133,13 +133,13 @@ TreeTraversalAction outliner_find_selected_objects(TreeElement *te, void *custom bool ED_outliner_collections_editor_poll(bContext *C) { - SpaceOops *so = CTX_wm_space_outliner(C); + SpaceOutliner *so = CTX_wm_space_outliner(C); return (so != NULL) && ELEM(so->outlinevis, SO_VIEW_LAYER, SO_SCENES, SO_LIBRARIES); } static bool outliner_view_layer_collections_editor_poll(bContext *C) { - SpaceOops *so = CTX_wm_space_outliner(C); + SpaceOutliner *so = CTX_wm_space_outliner(C); return (so != NULL) && (so->outlinevis == SO_VIEW_LAYER); } @@ -171,7 +171,7 @@ static TreeTraversalAction collection_find_selected_to_add(TreeElement *te, void static int collection_new_exec(bContext *C, wmOperator *op) { - SpaceOops *soops = CTX_wm_space_outliner(C); + SpaceOutliner *soops = CTX_wm_space_outliner(C); ARegion *ar = CTX_wm_region(C); Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); @@ -233,7 +233,7 @@ void OUTLINER_OT_collection_new(wmOperatorType *ot) struct CollectionEditData { Scene *scene; - SpaceOops *soops; + SpaceOutliner *soops; GSet *collections_to_edit; }; @@ -264,7 +264,7 @@ static int collection_delete_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SpaceOops *soops = CTX_wm_space_outliner(C); + SpaceOutliner *soops = CTX_wm_space_outliner(C); struct CollectionEditData data = {.scene = scene, .soops = soops,}; bool hierarchy = RNA_boolean_get(op->ptr, "hierarchy"); @@ -340,7 +340,7 @@ static TreeTraversalAction outliner_find_first_selected_layer_collection(TreeEle static LayerCollection *outliner_active_layer_collection(bContext *C) { - SpaceOops *soops = CTX_wm_space_outliner(C); + SpaceOutliner *soops = CTX_wm_space_outliner(C); struct CollectionObjectsSelectData data = { .layer_collection = NULL, @@ -424,7 +424,7 @@ static TreeTraversalAction outliner_find_first_selected_collection(TreeElement * static TreeElement *outliner_active_collection(bContext *C) { - SpaceOops *soops = CTX_wm_space_outliner(C); + SpaceOutliner *soops = CTX_wm_space_outliner(C); struct CollectionDuplicateData data = { .te = NULL, @@ -437,7 +437,7 @@ static TreeElement *outliner_active_collection(bContext *C) static int collection_duplicate_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); - SpaceOops *soops = CTX_wm_space_outliner(C); + SpaceOutliner *soops = CTX_wm_space_outliner(C); TreeElement *te = outliner_active_collection(C); /* Can happen when calling from a key binding. */ @@ -490,7 +490,7 @@ static int collection_link_exec(bContext *C, wmOperator *UNUSED(op)) Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); Collection *active_collection = CTX_data_layer_collection(C)->collection; - SpaceOops *soops = CTX_wm_space_outliner(C); + SpaceOutliner *soops = CTX_wm_space_outliner(C); struct CollectionEditData data = {.scene = scene, .soops = soops,}; data.collections_to_edit = BLI_gset_ptr_new(__func__); @@ -538,7 +538,7 @@ static int collection_instance_exec(bContext *C, wmOperator *UNUSED(op)) Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); - SpaceOops *soops = CTX_wm_space_outliner(C); + SpaceOutliner *soops = CTX_wm_space_outliner(C); struct CollectionEditData data = {.scene = scene, .soops = soops,}; data.collections_to_edit = BLI_gset_ptr_new(__func__); @@ -620,7 +620,7 @@ static TreeTraversalAction layer_collection_find_data_to_edit(TreeElement *te, v static bool collections_view_layer_poll(bContext *C, bool clear, int flag) { /* Poll function so the right click menu show current state of selected collections. */ - SpaceOops *soops = CTX_wm_space_outliner(C); + SpaceOutliner *soops = CTX_wm_space_outliner(C); if (!(soops && soops->outlinevis == SO_VIEW_LAYER)) { return false; } @@ -697,7 +697,7 @@ static int collection_view_layer_exec(bContext *C, wmOperator *op) Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); - SpaceOops *soops = CTX_wm_space_outliner(C); + SpaceOutliner *soops = CTX_wm_space_outliner(C); struct CollectionEditData data = {.scene = scene, .soops = soops,}; bool clear = strstr(op->idname, "clear") != NULL; int flag = strstr(op->idname, "holdout") ? LAYER_COLLECTION_HOLDOUT : @@ -828,7 +828,7 @@ static int collection_isolate_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); - SpaceOops *soops = CTX_wm_space_outliner(C); + SpaceOutliner *soops = CTX_wm_space_outliner(C); const bool extend = RNA_boolean_get(op->ptr, "extend"); bool depsgraph_changed = false; struct CollectionEditData data = {.scene = scene, .soops = soops,}; @@ -914,7 +914,7 @@ static int collection_visibility_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); - SpaceOops *soops = CTX_wm_space_outliner(C); + SpaceOutliner *soops = CTX_wm_space_outliner(C); const bool is_inside = strstr(op->idname, "inside") != NULL; const bool show = strstr(op->idname, "show") != NULL; bool depsgraph_changed = false; @@ -1051,7 +1051,7 @@ static int collection_flag_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); - SpaceOops *soops = CTX_wm_space_outliner(C); + SpaceOutliner *soops = CTX_wm_space_outliner(C); const bool is_render = strstr(op->idname, "render"); const bool clear = strstr(op->idname, "show") || strstr(op->idname, "enable"); int flag = is_render ? COLLECTION_RESTRICT_RENDER : COLLECTION_RESTRICT_VIEW; @@ -1172,7 +1172,7 @@ void OUTLINER_OT_collection_disable_render(wmOperatorType *ot) struct OutlinerHideEditData { Scene *scene; ViewLayer *view_layer; - SpaceOops *soops; + SpaceOutliner *soops; GSet *collections_to_edit; GSet *bases_to_edit; }; @@ -1212,7 +1212,7 @@ static int outliner_hide_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); - SpaceOops *soops = CTX_wm_space_outliner(C); + SpaceOutliner *soops = CTX_wm_space_outliner(C); struct OutlinerHideEditData data = {.scene = scene, .view_layer = view_layer, .soops = soops,}; data.collections_to_edit = BLI_gset_ptr_new("outliner_hide_exec__collections_to_edit"); data.bases_to_edit = BLI_gset_ptr_new("outliner_hide_exec__bases_to_edit"); @@ -1301,7 +1301,7 @@ void OUTLINER_OT_unhide_all(wmOperatorType *ot) */ void ED_outliner_selected_objects_get(const bContext *C, ListBase *objects) { - SpaceOops *soops = CTX_wm_space_outliner(C); + SpaceOutliner *soops = CTX_wm_space_outliner(C); struct IDsSelectedData data = {{NULL}}; outliner_tree_traverse(soops, &soops->tree, 0, TSE_SELECTED, outliner_find_selected_objects, &data); LISTBASE_FOREACH (LinkData *, link, &data.selected_array) { |