Commit: 175110ec8753a94bc265beb47ff3767e65a82ecc
Author: Julian Eisel
Date: Sat Nov 28 17:14:45 2015 +0100
Branches: master
https://developer.blender.org/rB175110ec8753a94bc265beb47ff3767e65a82ecc
Cleanup: 'area' vs 'region'
Apparently this is the result of some sloppiness during 2.5 project and since
then it confused people who were trying to understand the area-region relation
(myself included).
Sorry if this causes merge conflicts for anyone, but at some point we really
had to do it :/
===================================================================
M source/blender/editors/interface/interface_panel.c
M source/blender/editors/space_action/space_action.c
M source/blender/editors/space_buttons/space_buttons.c
M source/blender/editors/space_clip/space_clip.c
M source/blender/editors/space_console/space_console.c
M source/blender/editors/space_file/space_file.c
M source/blender/editors/space_graph/graph_draw.c
M source/blender/editors/space_graph/space_graph.c
M source/blender/editors/space_image/image_buttons.c
M source/blender/editors/space_image/image_draw.c
M source/blender/editors/space_image/image_intern.h
M source/blender/editors/space_image/image_ops.c
M source/blender/editors/space_image/space_image.c
M source/blender/editors/space_info/space_info.c
M source/blender/editors/space_logic/space_logic.c
M source/blender/editors/space_nla/nla_channels.c
M source/blender/editors/space_nla/space_nla.c
M source/blender/editors/space_node/node_ops.c
M source/blender/editors/space_node/space_node.c
M source/blender/editors/space_outliner/outliner_select.c
M source/blender/editors/space_outliner/space_outliner.c
M source/blender/editors/space_script/space_script.c
M source/blender/editors/space_sequencer/space_sequencer.c
M source/blender/editors/space_text/space_text.c
M source/blender/editors/space_text/text_draw.c
M source/blender/editors/space_time/space_time.c
M source/blender/editors/space_userpref/space_userpref.c
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/editors/space_view3d/view3d_intern.h
===================================================================
diff --git a/source/blender/editors/interface/interface_panel.c
b/source/blender/editors/interface/interface_panel.c
index 5ee7556..8242d02 100644
--- a/source/blender/editors/interface/interface_panel.c
+++ b/source/blender/editors/interface/interface_panel.c
@@ -1648,7 +1648,7 @@ void UI_panel_category_draw_all(ARegion *ar, const char
*category_id_active)
/* Secondary theme colors */
unsigned char theme_col_tab_outline[3];
- unsigned char theme_col_tab_divider[3]; /* line that divides tabs from
the main area */
+ unsigned char theme_col_tab_divider[3]; /* line that divides tabs from
the main region */
unsigned char theme_col_tab_highlight[3];
unsigned char theme_col_tab_highlight_inactive[3];
diff --git a/source/blender/editors/space_action/space_action.c
b/source/blender/editors/space_action/space_action.c
index 5d0b34a..b6f4600 100644
--- a/source/blender/editors/space_action/space_action.c
+++ b/source/blender/editors/space_action/space_action.c
@@ -83,7 +83,7 @@ static SpaceLink *action_new(const bContext *C)
ar->alignment = RGN_ALIGN_BOTTOM;
/* channel list region */
- ar = MEM_callocN(sizeof(ARegion), "channel area for action");
+ ar = MEM_callocN(sizeof(ARegion), "channel region for action");
BLI_addtail(&saction->regionbase, ar);
ar->regiontype = RGN_TYPE_CHANNELS;
ar->alignment = RGN_ALIGN_LEFT;
@@ -92,8 +92,8 @@ static SpaceLink *action_new(const bContext *C)
ar->v2d.scroll = V2D_SCROLL_BOTTOM;
ar->v2d.flag = V2D_VIEWSYNC_AREA_VERTICAL;
- /* main area */
- ar = MEM_callocN(sizeof(ARegion), "main area for action");
+ /* main region */
+ ar = MEM_callocN(sizeof(ARegion), "main region for action");
BLI_addtail(&saction->regionbase, ar);
ar->regiontype = RGN_TYPE_WINDOW;
@@ -149,7 +149,7 @@ static SpaceLink *action_duplicate(SpaceLink *sl)
/* add handlers, stuff you only do once or on area/region changes */
-static void action_main_area_init(wmWindowManager *wm, ARegion *ar)
+static void action_main_region_init(wmWindowManager *wm, ARegion *ar)
{
wmKeyMap *keymap;
@@ -160,7 +160,7 @@ static void action_main_area_init(wmWindowManager *wm,
ARegion *ar)
WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask,
&ar->winrct);
}
-static void action_main_area_draw(const bContext *C, ARegion *ar)
+static void action_main_region_draw(const bContext *C, ARegion *ar)
{
/* draw entirely, view changes should be handled here */
SpaceAction *saction = CTX_wm_space_action(C);
@@ -218,7 +218,7 @@ static void action_main_area_draw(const bContext *C,
ARegion *ar)
}
/* add handlers, stuff you only do once or on area/region changes */
-static void action_channel_area_init(wmWindowManager *wm, ARegion *ar)
+static void action_channel_region_init(wmWindowManager *wm, ARegion *ar)
{
wmKeyMap *keymap;
@@ -232,7 +232,7 @@ static void action_channel_area_init(wmWindowManager *wm,
ARegion *ar)
WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask,
&ar->winrct);
}
-static void action_channel_area_draw(const bContext *C, ARegion *ar)
+static void action_channel_region_draw(const bContext *C, ARegion *ar)
{
/* draw entirely, view changes should be handled here */
bAnimContext ac;
@@ -257,17 +257,17 @@ static void action_channel_area_draw(const bContext *C,
ARegion *ar)
/* add handlers, stuff you only do once or on area/region changes */
-static void action_header_area_init(wmWindowManager *UNUSED(wm), ARegion *ar)
+static void action_header_region_init(wmWindowManager *UNUSED(wm), ARegion *ar)
{
ED_region_header_init(ar);
}
-static void action_header_area_draw(const bContext *C, ARegion *ar)
+static void action_header_region_draw(const bContext *C, ARegion *ar)
{
ED_region_header(C, ar);
}
-static void action_channel_area_listener(bScreen *UNUSED(sc), ScrArea
*UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void action_channel_region_listener(bScreen *UNUSED(sc), ScrArea
*UNUSED(sa), ARegion *ar, wmNotifier *wmn)
{
/* context changes */
switch (wmn->category) {
@@ -306,7 +306,7 @@ static void action_channel_area_listener(bScreen
*UNUSED(sc), ScrArea *UNUSED(sa
}
}
-static void action_main_area_listener(bScreen *UNUSED(sc), ScrArea
*UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void action_main_region_listener(bScreen *UNUSED(sc), ScrArea
*UNUSED(sa), ARegion *ar, wmNotifier *wmn)
{
/* context changes */
switch (wmn->category) {
@@ -457,7 +457,7 @@ static void action_listener(bScreen *UNUSED(sc), ScrArea
*sa, wmNotifier *wmn)
}
}
-static void action_header_area_listener(bScreen *UNUSED(sc), ScrArea
*UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void action_header_region_listener(bScreen *UNUSED(sc), ScrArea
*UNUSED(sa), ARegion *ar, wmNotifier *wmn)
{
// SpaceAction *saction = (SpaceAction *)sa->spacedata.first;
@@ -543,9 +543,9 @@ void ED_spacetype_action(void)
/* regions: main window */
art = MEM_callocN(sizeof(ARegionType), "spacetype action region");
art->regionid = RGN_TYPE_WINDOW;
- art->init = action_main_area_init;
- art->draw = action_main_area_draw;
- art->listener = action_main_area_listener;
+ art->init = action_main_region_init;
+ art->draw = action_main_region_draw;
+ art->listener = action_main_region_listener;
art->keymapflag = ED_KEYMAP_VIEW2D | ED_KEYMAP_MARKERS |
ED_KEYMAP_ANIMATION | ED_KEYMAP_FRAMES;
BLI_addhead(&st->regiontypes, art);
@@ -556,9 +556,9 @@ void ED_spacetype_action(void)
art->prefsizey = HEADERY;
art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_FRAMES |
ED_KEYMAP_HEADER;
- art->init = action_header_area_init;
- art->draw = action_header_area_draw;
- art->listener = action_header_area_listener;
+ art->init = action_header_region_init;
+ art->draw = action_header_region_draw;
+ art->listener = action_header_region_listener;
BLI_addhead(&st->regiontypes, art);
@@ -568,9 +568,9 @@ void ED_spacetype_action(void)
art->prefsizex = 200;
art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_FRAMES;
- art->init = action_channel_area_init;
- art->draw = action_channel_area_draw;
- art->listener = action_channel_area_listener;
+ art->init = action_channel_region_init;
+ art->draw = action_channel_region_draw;
+ art->listener = action_channel_region_listener;
BLI_addhead(&st->regiontypes, art);
diff --git a/source/blender/editors/space_buttons/space_buttons.c
b/source/blender/editors/space_buttons/space_buttons.c
index e28ad68..126a27c 100644
--- a/source/blender/editors/space_buttons/space_buttons.c
+++ b/source/blender/editors/space_buttons/space_buttons.c
@@ -66,15 +66,15 @@ static SpaceLink *buttons_new(const bContext *UNUSED(C))
ar->alignment = RGN_ALIGN_TOP;
#if 0
- /* context area */
- ar = MEM_callocN(sizeof(ARegion), "context area for buts");
+ /* context region */
+ ar = MEM_callocN(sizeof(ARegion), "context region for buts");
BLI_addtail(&sbuts->regionbase, ar);
ar->regiontype = RGN_TYPE_CHANNELS;
ar->alignment = RGN_ALIGN_TOP;
#endif
- /* main area */
- ar = MEM_callocN(sizeof(ARegion), "main area for buts");
+ /* main region */
+ ar = MEM_callocN(sizeof(ARegion), "main region for buts");
BLI_addtail(&sbuts->regionbase, ar);
ar->regiontype = RGN_TYPE_WINDOW;
@@ -123,7 +123,7 @@ static SpaceLink *buttons_duplicate(SpaceLink *sl)
}
/* add handlers, stuff you only do once or on area/region changes */
-static void buttons_main_area_init(wmWindowManager *wm, ARegion *ar)
+static void buttons_main_region_init(wmWindowManager *wm, ARegion *ar)
{
wmKeyMap *keymap;
@@ -133,7 +133,7 @@ static void buttons_main_area_init(wmWindowManager *wm,
ARegion *ar)
WM_event_add_keymap_handler(&ar->handlers, keymap);
}
-static void buttons_main_area_draw(const bContext *C, ARegion *ar)
+static void buttons_main_region_draw(const bContext *C, ARegion *ar)
{
/* draw entirely, view changes should be handled here */
SpaceButs *sbuts = CTX_wm_space_buts(C);
@@ -189,12 +189,12 @@ static void buttons_keymap(struct wmKeyConfig *keyconf)
}
/* add handlers, stuff you only do once or on area/region changes */
-static void buttons_header_area_init(wmWindowManager *UNUSED(wm), ARegion *ar)
+static void buttons_header_region_init(wmWindowManager *UNUSED(wm), ARegion
*ar)
{
ED_region_header_init(ar);
}
-static void buttons_header_area_draw(const bContext *C, ARegion *ar)
+static void buttons_header_region_draw(const bContext *C, ARegion *ar)
{
SpaceButs *sbuts = CTX_wm_space_buts(C);
@@ -410,8 +410,8 @@ void ED_spacetype_buttons(void)
/* regions: main window */
art = MEM_callocN(sizeof(ARegionType), "spacetype buttons region");
art->regionid = RGN_TYPE_WINDOW;
- art->init = buttons_main_area_init;
- art->draw = buttons_main_area_draw;
+ art->init = buttons_main_region_init;
+ art->draw = buttons_main_region_draw;
art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_FRAMES;
BLI_addhead(&st->regiontypes, art);
@@ -423,8 +423,8 @@ void ED_spacetype_buttons(void)
art->prefsizey = HEADERY;
art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_FRAMES |
ED_KEYMAP_HEADER;
- art->init = buttons_header_area_init;
- art->draw = buttons_header_area_draw;
+ art->init = buttons_header_region_init;
+ art->draw = buttons_header_region_draw;
BLI_addhead(&st->regiontypes, art);
BKE_spacetype_register(st);
diff --git a/source/blender/editors/space_clip/space_clip.c
b/source/blender/editors/space_clip/space_clip.c
index f119fe2..8c4b97b 100644
--- a/source/blender/editors/space_clip/space_clip.c
+++ b/source/blender/editors/space_clip/space_clip.c
@@ -296,8 +296,8 @@ static SpaceLink *clip_new(const bContext *C)
BLI_addtail(&sc->regionbase, ar);
init_preview_region(C, ar);
- /* main area */
- ar = MEM_callocN(sizeof(ARegion), "main area for clip");
+ /* main region */
+ ar = MEM_callocN(sizeof(ARegion), "main region for clip");
BLI_addtail(&sc->regionbase, ar);
ar->regiontype = RGN_TYPE_WINDOW;
@@ -1132,7 +1132,7 @@ static void movieclip_main_area_set_view2d(const bContext
*C, ARegion *ar)
}
/* add handlers, stuff you only do once or on area/region changes */
-static void clip_main_area_init(wmWindowManager *wm, ARegion *ar)
+static void clip_main_region_init(wmWindowManager *wm,
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
