From 915cc956baff85d47387736ab367ab3774ee3353 Mon Sep 17 00:00:00 2001 From: Nathan Craddock Date: Fri, 7 Aug 2020 11:47:23 -0600 Subject: Cleanup: Rename soops to space_outliner No functional changes. Rename soops, soutliner, and so to space_outliner. --- .../editors/space_outliner/space_outliner.c | 70 +++++++++++----------- 1 file changed, 35 insertions(+), 35 deletions(-) (limited to 'source/blender/editors/space_outliner/space_outliner.c') diff --git a/source/blender/editors/space_outliner/space_outliner.c b/source/blender/editors/space_outliner/space_outliner.c index 63abc22f367..b14afed81dd 100644 --- a/source/blender/editors/space_outliner/space_outliner.c +++ b/source/blender/editors/space_outliner/space_outliner.c @@ -242,14 +242,14 @@ static void outliner_main_region_message_subscribe(const struct bContext *UNUSED struct ARegion *region, struct wmMsgBus *mbus) { - SpaceOutliner *soops = area->spacedata.first; + SpaceOutliner *space_outliner = area->spacedata.first; wmMsgSubscribeValue msg_sub_value_region_tag_redraw = { .owner = region, .user_data = region, .notify = ED_region_do_msg_notify_tag_redraw, }; - if (ELEM(soops->outlinevis, SO_VIEW_LAYER, SO_SCENES)) { + if (ELEM(space_outliner->outlinevis, SO_VIEW_LAYER, SO_SCENES)) { WM_msg_subscribe_rna_anon_prop(mbus, Window, view_layer, &msg_sub_value_region_tag_redraw); } } @@ -297,43 +297,43 @@ static void outliner_header_region_listener(wmWindow *UNUSED(win), static SpaceLink *outliner_create(const ScrArea *UNUSED(area), const Scene *UNUSED(scene)) { ARegion *region; - SpaceOutliner *soutliner; + SpaceOutliner *space_outliner; - soutliner = MEM_callocN(sizeof(SpaceOutliner), "initoutliner"); - soutliner->spacetype = SPACE_OUTLINER; - soutliner->filter_id_type = ID_GR; - soutliner->show_restrict_flags = SO_RESTRICT_ENABLE | SO_RESTRICT_HIDE; - soutliner->outlinevis = SO_VIEW_LAYER; - soutliner->sync_select_dirty |= WM_OUTLINER_SYNC_SELECT_FROM_ALL; - soutliner->flag |= SO_SYNC_SELECT; + space_outliner = MEM_callocN(sizeof(SpaceOutliner), "initoutliner"); + space_outliner->spacetype = SPACE_OUTLINER; + space_outliner->filter_id_type = ID_GR; + space_outliner->show_restrict_flags = SO_RESTRICT_ENABLE | SO_RESTRICT_HIDE; + space_outliner->outlinevis = SO_VIEW_LAYER; + space_outliner->sync_select_dirty |= WM_OUTLINER_SYNC_SELECT_FROM_ALL; + space_outliner->flag |= SO_SYNC_SELECT; /* header */ region = MEM_callocN(sizeof(ARegion), "header for outliner"); - BLI_addtail(&soutliner->regionbase, region); + BLI_addtail(&space_outliner->regionbase, region); region->regiontype = RGN_TYPE_HEADER; region->alignment = (U.uiflag & USER_HEADER_BOTTOM) ? RGN_ALIGN_BOTTOM : RGN_ALIGN_TOP; /* main region */ region = MEM_callocN(sizeof(ARegion), "main region for outliner"); - BLI_addtail(&soutliner->regionbase, region); + BLI_addtail(&space_outliner->regionbase, region); region->regiontype = RGN_TYPE_WINDOW; - return (SpaceLink *)soutliner; + return (SpaceLink *)space_outliner; } /* not spacelink itself */ static void outliner_free(SpaceLink *sl) { - SpaceOutliner *soutliner = (SpaceOutliner *)sl; + SpaceOutliner *space_outliner = (SpaceOutliner *)sl; - outliner_free_tree(&soutliner->tree); - if (soutliner->treestore) { - BLI_mempool_destroy(soutliner->treestore); + outliner_free_tree(&space_outliner->tree); + if (space_outliner->treestore) { + BLI_mempool_destroy(space_outliner->treestore); } - if (soutliner->treehash) { - BKE_outliner_treehash_free(soutliner->treehash); + if (space_outliner->treehash) { + BKE_outliner_treehash_free(space_outliner->treehash); } } @@ -344,47 +344,47 @@ static void outliner_init(wmWindowManager *UNUSED(wm), ScrArea *UNUSED(area)) static SpaceLink *outliner_duplicate(SpaceLink *sl) { - SpaceOutliner *soutliner = (SpaceOutliner *)sl; - SpaceOutliner *soutlinern = MEM_dupallocN(soutliner); + SpaceOutliner *space_outliner = (SpaceOutliner *)sl; + SpaceOutliner *space_outliner_new = MEM_dupallocN(space_outliner); - BLI_listbase_clear(&soutlinern->tree); - soutlinern->treestore = NULL; - soutlinern->treehash = NULL; + BLI_listbase_clear(&space_outliner_new->tree); + space_outliner_new->treestore = NULL; + space_outliner_new->treehash = NULL; - soutlinern->sync_select_dirty = WM_OUTLINER_SYNC_SELECT_FROM_ALL; + space_outliner_new->sync_select_dirty = WM_OUTLINER_SYNC_SELECT_FROM_ALL; - return (SpaceLink *)soutlinern; + return (SpaceLink *)space_outliner_new; } static void outliner_id_remap(ScrArea *UNUSED(area), SpaceLink *slink, ID *old_id, ID *new_id) { - SpaceOutliner *so = (SpaceOutliner *)slink; + SpaceOutliner *space_outliner = (SpaceOutliner *)slink; /* Some early out checks. */ if (!TREESTORE_ID_TYPE(old_id)) { return; /* ID type is not used by outilner... */ } - if (so->search_tse.id == old_id) { - so->search_tse.id = new_id; + if (space_outliner->search_tse.id == old_id) { + space_outliner->search_tse.id = new_id; } - if (so->treestore) { + if (space_outliner->treestore) { TreeStoreElem *tselem; BLI_mempool_iter iter; bool changed = false; - BLI_mempool_iternew(so->treestore, &iter); + BLI_mempool_iternew(space_outliner->treestore, &iter); while ((tselem = BLI_mempool_iterstep(&iter))) { if (tselem->id == old_id) { tselem->id = new_id; changed = true; } } - if (so->treehash && changed) { + if (space_outliner->treehash && changed) { /* rebuild hash table, because it depends on ids too */ /* postpone a full rebuild because this can be called many times on-free */ - so->storeflag |= SO_TREESTORE_REBUILD; + space_outliner->storeflag |= SO_TREESTORE_REBUILD; } } } @@ -392,8 +392,8 @@ static void outliner_id_remap(ScrArea *UNUSED(area), SpaceLink *slink, ID *old_i static void outliner_deactivate(struct ScrArea *area) { /* Remove hover highlights */ - SpaceOutliner *soops = area->spacedata.first; - outliner_flag_set(&soops->tree, TSE_HIGHLIGHTED, false); + SpaceOutliner *space_outliner = area->spacedata.first; + outliner_flag_set(&space_outliner->tree, TSE_HIGHLIGHTED, false); ED_region_tag_redraw_no_rebuild(BKE_area_find_region_type(area, RGN_TYPE_WINDOW)); } -- cgit v1.2.3