From ecc4e55b6666bdb20ed8e2e8e9a7fc2fbeff3731 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 18 Dec 2008 02:56:48 +0000 Subject: 2.5 Context API This adds the context API as described here. The main practical change now is that C is not longer directly accessible but has to be accessed through accessor functions. This basically adds the implementation of the API and adaption of existing code with some minor changes. The next task of course is to actually use this design to cleanup of bad level calls and global access, in blenkernel, blenloader. http://wiki.blender.org/index.php/BlenderDev/Blender2.5/Context Error, Warning and Debug Info Reporting This adds the error reporting API as described here. It should help clean up error() calls in non-ui code, but eventually can become used for gathering messages for a console window, and throwing exceptions in python scripts when an error happens executing something. http://wiki.blender.org/index.php/BlenderDev/Blender2.5/Reports --- source/blender/editors/space_buttons/buttons_header.c | 12 ++++++------ source/blender/editors/space_buttons/space_buttons.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'source/blender/editors/space_buttons') diff --git a/source/blender/editors/space_buttons/buttons_header.c b/source/blender/editors/space_buttons/buttons_header.c index 9ffcc107753..74e062f5888 100644 --- a/source/blender/editors/space_buttons/buttons_header.c +++ b/source/blender/editors/space_buttons/buttons_header.c @@ -38,7 +38,7 @@ #include "BLI_blenlib.h" -#include "BKE_global.h" +#include "BKE_context.h" #include "BKE_screen.h" #include "ED_screen.h" @@ -66,7 +66,7 @@ static void do_viewmenu(bContext *C, void *arg, int event) static uiBlock *dummy_viewmenu(bContext *C, uiMenuBlockHandle *handle, void *arg_unused) { - ScrArea *curarea= C->area; + ScrArea *curarea= CTX_wm_area(C); uiBlock *block; short yco= 0, menuwidth=120; @@ -106,8 +106,8 @@ static void do_buttons_buttons(bContext *C, void *arg, int event) void buttons_header_buttons(const bContext *C, ARegion *ar) { - ScrArea *sa= C->area; - SpaceButs *sbuts= sa->spacedata.first; + ScrArea *sa= CTX_wm_area(C); + SpaceButs *sbuts= (SpaceButs*)CTX_wm_space_data(C); uiBlock *block; int xco, yco= 3; @@ -123,7 +123,7 @@ void buttons_header_buttons(const bContext *C, ARegion *ar) uiBlockSetEmboss(block, UI_EMBOSSP); xmax= GetButStringLength("View"); - uiDefPulldownBut(block, dummy_viewmenu, C->area, + uiDefPulldownBut(block, dummy_viewmenu, CTX_wm_area(C), "View", xco, yco-2, xmax-3, 24, ""); xco+=XIC+xmax; @@ -182,7 +182,7 @@ void buttons_header_buttons(const bContext *C, ARegion *ar) uiBlockEndAlign(block); xco+=XIC; - uiDefButI(block, NUM, B_NEWFRAME, "", (xco+20),yco,60,YIC, &(C->scene->r.cfra), 1.0, MAXFRAMEF, 0, 0, "Displays Current Frame of animation. Click to change."); + uiDefButI(block, NUM, B_NEWFRAME, "", (xco+20),yco,60,YIC, &(CTX_data_scene(C)->r.cfra), 1.0, MAXFRAMEF, 0, 0, "Displays Current Frame of animation. Click to change."); xco+= 80; // XXX buttons_active_id(&id, &idfrom); diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c index 9ed56afec18..6819a28406d 100644 --- a/source/blender/editors/space_buttons/space_buttons.c +++ b/source/blender/editors/space_buttons/space_buttons.c @@ -41,7 +41,7 @@ #include "BLI_rand.h" #include "BKE_colortools.h" -#include "BKE_global.h" +#include "BKE_context.h" #include "BKE_screen.h" #include "ED_space_api.h" @@ -158,7 +158,7 @@ static void buttons_main_area_init(wmWindowManager *wm, ARegion *ar) static void buttons_main_area_draw(const bContext *C, ARegion *ar) { /* draw entirely, view changes should be handled here */ - // SpaceButs *sbuts= C->area->spacedata.first; + // SpaceButs *sbuts= (SpaceButs*)CTX_wm_space_data(C); View2D *v2d= &ar->v2d; float col[3], fac; -- cgit v1.2.3