diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-02-16 02:44:15 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-16 02:44:15 +0300 |
commit | ec471a9b1c14ea5dcb855de7e570e27ad70661c5 (patch) | |
tree | ab84e5d466b440a0202ff6271f43484763902f79 /source/blender/editors/interface | |
parent | 419911b1d19ceeb87cd1c0a7b78f0133bee4a6cd (diff) |
DNA: rename SpaceButs -> SpaceProperties
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r-- | source/blender/editors/interface/interface_panel.c | 10 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_templates.c | 2 | ||||
-rw-r--r-- | source/blender/editors/interface/resources.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c index 69b43fefdb3..410478fc628 100644 --- a/source/blender/editors/interface/interface_panel.c +++ b/source/blender/editors/interface/interface_panel.c @@ -124,7 +124,7 @@ static void panel_title_color_get(bool show_background, uchar color[4]) /*********************** space specific code ************************/ /* temporary code to remove all sbuts stuff from panel code */ -/* SpaceButs.align */ +/* SpaceProperties.align */ typedef enum eSpaceButtons_Align { BUT_HORIZONTAL = 0, BUT_VERTICAL = 1, @@ -133,7 +133,7 @@ typedef enum eSpaceButtons_Align { static int panel_aligned(ScrArea *sa, ARegion *ar) { - if (sa->spacetype == SPACE_BUTS && ar->regiontype == RGN_TYPE_WINDOW) + if (sa->spacetype == SPACE_PROPERTIES && ar->regiontype == RGN_TYPE_WINDOW) return BUT_VERTICAL; else if (sa->spacetype == SPACE_USERPREF && ar->regiontype == RGN_TYPE_WINDOW) return BUT_VERTICAL; @@ -189,8 +189,8 @@ static bool panels_need_realign(ScrArea *sa, ARegion *ar, Panel **pa_animate) { *pa_animate = NULL; - if (sa->spacetype == SPACE_BUTS && ar->regiontype == RGN_TYPE_WINDOW) { - SpaceButs *sbuts = sa->spacedata.first; + if (sa->spacetype == SPACE_PROPERTIES && ar->regiontype == RGN_TYPE_WINDOW) { + SpaceProperties *sbuts = sa->spacedata.first; if (sbuts->mainbo != sbuts->mainb) { return true; @@ -2313,7 +2313,7 @@ int ui_handler_panel_region(bContext *C, const wmEvent *event, ARegion *ar, cons ScrArea *sa = CTX_wm_area(C); SpaceLink *sl = sa->spacedata.first; - if (sa->spacetype != SPACE_BUTS) { + if (sa->spacetype != SPACE_PROPERTIES) { if (!(pa->control & UI_PNL_SCALE)) { if (event->type == PADPLUSKEY) sl->blockscale += 0.1; else sl->blockscale -= 0.1; diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 0262237a051..df233cd6e41 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -5049,7 +5049,7 @@ void uiTemplateCacheFile(uiLayout *layout, bContext *C, PointerRNA *ptr, const c return; } - SpaceButs *sbuts = CTX_wm_space_buts(C); + SpaceProperties *sbuts = CTX_wm_space_properties(C); uiLayout *row = uiLayoutRow(layout, false); uiBlock *block = uiLayoutGetBlock(row); diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index 1751e43b973..bea8f8aed2b 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -108,7 +108,7 @@ const uchar *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid) else { switch (spacetype) { - case SPACE_BUTS: + case SPACE_PROPERTIES: ts = &btheme->tbuts; break; case SPACE_VIEW3D: @@ -779,7 +779,7 @@ void UI_SetTheme(int spacetype, int regionid) else if (regionid) { /* popups */ theme_active = U.themes.first; - theme_spacetype = SPACE_BUTS; + theme_spacetype = SPACE_PROPERTIES; theme_regionid = regionid; } else { |