archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

2.5: code cleanup, added CTX_wm_space_* for each space type,

Browse Source 
instead of casting everywhere.
This commit is contained in:
Brecht Van Lommel
2009-07-28 16:33:02 +00:00
parent f4f3a9b08b
commit 74e4ad20c9
40 changed files with 267 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/editors/space_image/image_buttons.c
View File

@@ -127,7 +127,7 @@ static void image_editcursor_buts(const bContext *C, View2D *v2d, uiBlock *block
static void do_image_panel_events(bContext *C, void *arg, int event)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
ARegion *ar= CTX_wm_region(C);
switch(event) {
@@ -234,7 +234,7 @@ static void image_transform_but_attr(SpaceImage *sima, int *imx, int *imy, int *
/* is used for both read and write... */
static void image_editvertex_buts(const bContext *C, uiBlock *block)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
Object *obedit= CTX_data_edit_object(C);
static float ocent[2];
float cent[2]= {0.0, 0.0};
@@ -347,7 +347,7 @@ static void image_editvertex_buts(const bContext *C, uiBlock *block)
/* is used for both read and write... */
static void image_editcursor_buts(const bContext *C, View2D *v2d, uiBlock *block)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
static float ocent[2];
int imx= 256, imy= 256;
int step, digits;
@@ -386,7 +386,7 @@ static void image_editcursor_buts(const bContext *C, View2D *v2d, uiBlock *block
#if 0
static void image_panel_view_properties(const bContext *C, Panel *pa)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
ARegion *ar= CTX_wm_region(C);
Object *obedit= CTX_data_edit_object(C);
uiBlock *block;
@@ -448,7 +448,7 @@ void brush_buttons(const bContext *C, uiBlock *block, short fromsima,
int evt_del, int evt_keepdata,
int evt_texbrowse, int evt_texdel)
{
// SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
// SpaceImage *sima= CTX_wm_space_image(C);
ToolSettings *settings= CTX_data_tool_settings(C);
Brush *brush= settings->imapaint.brush;
ID *id;
@@ -565,14 +565,14 @@ void brush_buttons(const bContext *C, uiBlock *block, short fromsima,
static int image_panel_paint_poll(const bContext *C, PanelType *pt)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
return (sima->image && (sima->flag & SI_DRAWTOOL));
}
static void image_panel_paintcolor(const bContext *C, Panel *pa)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
ToolSettings *settings= CTX_data_tool_settings(C);
Brush *brush= settings->imapaint.brush;
uiBlock *block;
@@ -591,7 +591,7 @@ static void image_panel_paintcolor(const bContext *C, Panel *pa)
static void image_panel_paint(const bContext *C, Panel *pa)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
uiBlock *block;
if(!sima->image || (sima->flag & SI_DRAWTOOL)==0)
@@ -605,7 +605,7 @@ static void image_panel_paint(const bContext *C, Panel *pa)
static void image_panel_curves_reset(bContext *C, void *cumap_v, void *ibuf_v)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
CurveMapping *cumap = cumap_v;
int a;
@@ -625,7 +625,7 @@ static void image_panel_curves_reset(bContext *C, void *cumap_v, void *ibuf_v)
static void image_panel_curves(const bContext *C, Panel *pa)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
ImBuf *ibuf;
uiBlock *block;
uiBut *bt;
@@ -1201,7 +1201,7 @@ void ED_image_uiblock_panel(const bContext *C, uiBlock *block, Image **ima_pp, I
short redraw, short imagechanged)
{
Scene *scene= CTX_data_scene(C);
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
Image *ima= *ima_pp;
uiBut *but;
char str[128], *strp;
@@ -1397,7 +1397,7 @@ void uiTemplateImageLayers(uiLayout *layout, bContext *C, Image *ima, ImageUser
static void image_panel_properties(const bContext *C, Panel *pa)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
uiBlock *block;
block= uiLayoutFreeBlock(pa->layout);

2
source/blender/editors/space_image/image_header.c
View File

@@ -416,7 +416,7 @@ static void do_image_buttons(bContext *C, void *arg, int event)
static int toolbox_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
Object *obedit= CTX_data_edit_object(C);
uiPopupMenu *pup;
uiLayout *layout;

66
source/blender/editors/space_image/image_ops.c
View File

@@ -109,7 +109,7 @@ static void sima_zoom_set_factor(SpaceImage *sima, ARegion *ar, float zoomfac)
static int space_image_poll(bContext *C)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
if(sima && sima->spacetype==SPACE_IMAGE)
if(ED_space_image_buffer(sima))
return 1;
@@ -119,7 +119,7 @@ static int space_image_poll(bContext *C)
static int space_image_file_exists_poll(bContext *C)
{
if(space_image_poll(C)) {
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
ImBuf *ibuf= ED_space_image_buffer(sima);
if(ibuf && BLI_exists(ibuf->name) && BLI_is_writable(ibuf->name))
@@ -131,10 +131,10 @@ static int space_image_file_exists_poll(bContext *C)
int space_image_main_area_poll(bContext *C)
{
SpaceLink *slink= CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
// XXX ARegion *ar= CTX_wm_region(C);
if(slink && (slink->spacetype == SPACE_IMAGE))
if(sima)
return 1; // XXX (ar && ar->type->regionid == RGN_TYPE_WINDOW);
return 0;
@@ -149,7 +149,7 @@ typedef struct ViewPanData {
static void view_pan_init(bContext *C, wmOperator *op, wmEvent *event)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
ViewPanData *vpd;
op->customdata= vpd= MEM_callocN(sizeof(ViewPanData), "ImageViewPanData");
@@ -165,7 +165,7 @@ static void view_pan_init(bContext *C, wmOperator *op, wmEvent *event)
static void view_pan_exit(bContext *C, wmOperator *op, int cancel)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
ViewPanData *vpd= op->customdata;
if(cancel) {
@@ -180,7 +180,7 @@ static void view_pan_exit(bContext *C, wmOperator *op, int cancel)
static int view_pan_exec(bContext *C, wmOperator *op)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
float offset[2];
RNA_float_get_array(op->ptr, "offset", offset);
@@ -209,7 +209,7 @@ static int view_pan_invoke(bContext *C, wmOperator *op, wmEvent *event)
static int view_pan_modal(bContext *C, wmOperator *op, wmEvent *event)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
ViewPanData *vpd= op->customdata;
float offset[2];
@@ -269,7 +269,7 @@ typedef struct ViewZoomData {
static void view_zoom_init(bContext *C, wmOperator *op, wmEvent *event)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
ViewZoomData *vpd;
op->customdata= vpd= MEM_callocN(sizeof(ViewZoomData), "ImageViewZoomData");
@@ -284,7 +284,7 @@ static void view_zoom_init(bContext *C, wmOperator *op, wmEvent *event)
static void view_zoom_exit(bContext *C, wmOperator *op, int cancel)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
ViewZoomData *vpd= op->customdata;
if(cancel) {
@@ -298,7 +298,7 @@ static void view_zoom_exit(bContext *C, wmOperator *op, int cancel)
static int view_zoom_exec(bContext *C, wmOperator *op)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
ARegion *ar= CTX_wm_region(C);
sima_zoom_set_factor(sima, ar, RNA_float_get(op->ptr, "factor"));
@@ -325,7 +325,7 @@ static int view_zoom_invoke(bContext *C, wmOperator *op, wmEvent *event)
static int view_zoom_modal(bContext *C, wmOperator *op, wmEvent *event)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
ARegion *ar= CTX_wm_region(C);
ViewZoomData *vpd= op->customdata;
float factor;
@@ -392,7 +392,7 @@ static int view_all_exec(bContext *C, wmOperator *op)
int width, height;
/* retrieve state */
sima= (SpaceImage*)CTX_wm_space_data(C);
sima= CTX_wm_space_image(C);
ar= CTX_wm_region(C);
scene= (Scene*)CTX_data_scene(C);
obedit= CTX_data_edit_object(C);
@@ -449,7 +449,7 @@ static int view_selected_exec(bContext *C, wmOperator *op)
int width, height;
/* retrieve state */
sima= (SpaceImage*)CTX_wm_space_data(C);
sima= CTX_wm_space_image(C);
ar= CTX_wm_region(C);
scene= (Scene*)CTX_data_scene(C);
obedit= CTX_data_edit_object(C);
@@ -493,7 +493,7 @@ void IMAGE_OT_view_selected(wmOperatorType *ot)
static int view_zoom_in_exec(bContext *C, wmOperator *op)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
ARegion *ar= CTX_wm_region(C);
sima_zoom_set_factor(sima, ar, 1.25f);
@@ -516,7 +516,7 @@ void IMAGE_OT_view_zoom_in(wmOperatorType *ot)
static int view_zoom_out_exec(bContext *C, wmOperator *op)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
ARegion *ar= CTX_wm_region(C);
sima_zoom_set_factor(sima, ar, 0.8f);
@@ -541,7 +541,7 @@ void IMAGE_OT_view_zoom_out(wmOperatorType *ot)
static int view_zoom_ratio_exec(bContext *C, wmOperator *op)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
ARegion *ar= CTX_wm_region(C);
sima_zoom_set(sima, ar, RNA_float_get(op->ptr, "ratio"));
@@ -620,7 +620,7 @@ static void image_filesel(bContext *C, wmOperator *op, const char *path)
static int open_exec(bContext *C, wmOperator *op)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
Scene *scene= CTX_data_scene(C);
Object *obedit= CTX_data_edit_object(C);
Image *ima= NULL;
@@ -640,7 +640,7 @@ static int open_exec(bContext *C, wmOperator *op)
static int open_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
char *path= (sima->image)? sima->image->name: U.textudir;
if(RNA_property_is_set(op->ptr, "filename"))
@@ -711,7 +711,7 @@ static int replace_exec(bContext *C, wmOperator *op)
static int replace_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
char *path= (sima->image)? sima->image->name: U.textudir;
if(!sima->image)
@@ -816,7 +816,7 @@ static void save_image_doit(bContext *C, SpaceImage *sima, Scene *scene, wmOpera
static int save_as_exec(bContext *C, wmOperator *op)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
Scene *scene= CTX_data_scene(C);
Image *ima = ED_space_image(sima);
char str[FILE_MAX];
@@ -834,7 +834,7 @@ static int save_as_exec(bContext *C, wmOperator *op)
static int save_as_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
Image *ima = ED_space_image(sima);
ImBuf *ibuf= ED_space_image_buffer(sima);
Scene *scene= CTX_data_scene(C);
@@ -941,7 +941,7 @@ void IMAGE_OT_save(wmOperatorType *ot)
static int save_sequence_exec(bContext *C, wmOperator *op)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
ImBuf *ibuf;
int tot= 0;
char di[FILE_MAX], fi[FILE_MAX];
@@ -1020,7 +1020,7 @@ static int reload_exec(bContext *C, wmOperator *op)
SpaceImage *sima;
/* retrieve state */
sima= (SpaceImage*)CTX_wm_space_data(C);
sima= CTX_wm_space_image(C);
if(!sima->image)
return OPERATOR_CANCELLED;
@@ -1062,7 +1062,7 @@ static int new_exec(bContext *C, wmOperator *op)
int width, height, floatbuf, uvtestgrid;
/* retrieve state */
sima= (SpaceImage*)CTX_wm_space_data(C);
sima= CTX_wm_space_image(C);
scene= (Scene*)CTX_data_scene(C);
obedit= CTX_data_edit_object(C);
@@ -1127,7 +1127,7 @@ static int pack_test(bContext *C, wmOperator *op)
static int pack_exec(bContext *C, wmOperator *op)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
Image *ima= ED_space_image(sima);
ImBuf *ibuf= ED_space_image_buffer(sima);
int as_png= RNA_boolean_get(op->ptr, "as_png");
@@ -1150,7 +1150,7 @@ static int pack_exec(bContext *C, wmOperator *op)
static int pack_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
ImBuf *ibuf= ED_space_image_buffer(sima);
uiPopupMenu *pup;
uiLayout *layout;
@@ -1336,7 +1336,7 @@ typedef struct ImageSampleInfo {
static void sample_draw(const bContext *C, ARegion *ar, void *arg_info)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
ImBuf *ibuf= ED_space_image_buffer(sima);
ImageSampleInfo *info= arg_info;
@@ -1349,7 +1349,7 @@ static void sample_draw(const bContext *C, ARegion *ar, void *arg_info)
static void sample_apply(bContext *C, wmOperator *op, wmEvent *event)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
ARegion *ar= CTX_wm_region(C);
ImBuf *ibuf= ED_space_image_buffer(sima);
ImageSampleInfo *info= op->customdata;
@@ -1464,7 +1464,7 @@ static void sample_exit(bContext *C, wmOperator *op)
static int sample_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
ARegion *ar= CTX_wm_region(C);
ImBuf *ibuf= ED_space_image_buffer(sima);
ImageSampleInfo *info;
@@ -1557,7 +1557,7 @@ typedef struct RecordCompositeData {
int record_composite_apply(bContext *C, wmOperator *op)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
RecordCompositeData *rcd= op->customdata;
Scene *scene= CTX_data_scene(C);
ImBuf *ibuf;
@@ -1585,7 +1585,7 @@ int record_composite_apply(bContext *C, wmOperator *op)
static int record_composite_init(bContext *C, wmOperator *op)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
Scene *scene= CTX_data_scene(C);
RecordCompositeData *rcd;
@@ -1607,7 +1607,7 @@ static int record_composite_init(bContext *C, wmOperator *op)
static void record_composite_exit(bContext *C, wmOperator *op)
{
Scene *scene= CTX_data_scene(C);
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
RecordCompositeData *rcd= op->customdata;
scene->r.cfra= rcd->old_cfra;

6
source/blender/editors/space_image/space_image.c
View File

@@ -246,7 +246,7 @@ void image_keymap(struct wmWindowManager *wm)
static void image_refresh(const bContext *C, ScrArea *sa)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
Object *obedit= CTX_data_edit_object(C);
Image *ima;
@@ -306,7 +306,7 @@ static void image_listener(ScrArea *sa, wmNotifier *wmn)
static int image_context(const bContext *C, const char *member, bContextDataResult *result)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
if(CTX_data_dir(member)) {
static const char *dir[] = {"edit_image", NULL};
@@ -416,7 +416,7 @@ static void image_main_area_init(wmWindowManager *wm, ARegion *ar)
static void image_main_area_draw(const bContext *C, ARegion *ar)
{
/* draw entirely, view changes should be handled here */
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
SpaceImage *sima= CTX_wm_space_image(C);
Object *obedit= CTX_data_edit_object(C);
Scene *scene= CTX_data_scene(C);
View2D *v2d= &ar->v2d;