2.5: Image window, some small changes:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 11 Feb 2009 19:16:14 +0000 (19:16 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 11 Feb 2009 19:16:14 +0000 (19:16 +0000)
* Added notifier for edited images.
* Fix main region emboss drawing when showing render.
* Don't go fullscreen with fileselect for now to work
  around context getting lost, so open/replace works.
* Save operators are more complete now, but still lack
  confirmation and choosing image type.
* Pack operators work correctly now (but not unpack).
* Setting white/black point for curves.
* Time cursor for record composite.

source/blender/editors/space_image/image_draw.c
source/blender/editors/space_image/image_header.c
source/blender/editors/space_image/image_intern.h
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_image/space_image.c
source/blender/windowmanager/WM_types.h

index 7311821a5ef50deb6a3b4f4bedb5422116fa6fc3..1b7a96459ff96b262210d6904cdb1279cf33ae7d 100644 (file)
@@ -125,7 +125,7 @@ static void image_verify_buffer_float(SpaceImage *sima, ImBuf *ibuf)
        }
 }
 
-static void sima_draw_render_info(SpaceImage *sima, ARegion *ar)
+static void draw_render_info(SpaceImage *sima, ARegion *ar)
 {
        rcti rect;
        float colf[3];
@@ -136,23 +136,24 @@ static void sima_draw_render_info(SpaceImage *sima, ARegion *ar)
                return;
        
        rect= ar->winrct;
-       rect.ymin= rect.ymax - HEADER_HEIGHT;
-       
-       glaDefine2DArea(&rect);
+       rect.xmin= 0;
+       rect.ymin= ar->winrct.ymax - ar->winrct.ymin - HEADER_HEIGHT;
+       rect.xmax= ar->winrct.xmax - ar->winrct.xmin;
+       rect.ymax= ar->winrct.ymax - ar->winrct.ymin;
        
        /* clear header rect */
        UI_GetThemeColor3fv(TH_BACK, colf);
-       glClearColor(colf[0]+0.1f, colf[1]+0.1f, colf[2]+0.1f, 1.0); 
-       glClear(GL_COLOR_BUFFER_BIT);
+       glColor3f(colf[0]+0.1f, colf[1]+0.1f, colf[2]+0.1f);
+       glRecti(rect.xmin, rect.ymin, rect.xmax, rect.ymax);
        
        UI_ThemeColor(TH_TEXT_HI);
-       glRasterPos2i(12, 5);
-       UI_RasterPos(12, 5);
+       glRasterPos2i(12, rect.ymin + 5);
+       UI_RasterPos(12, rect.ymin + 5);
 
        if(showspare) {
                UI_DrawString(G.fonts, "(Previous)", 0);
-               glRasterPos2i(72, 5);
-               UI_RasterPos(72, 5);
+               glRasterPos2i(72, rect.ymin + 5);
+               UI_RasterPos(72, rect.ymin + 5);
        }
 
        UI_DrawString(G.fonts, str, 0);
@@ -668,7 +669,7 @@ void draw_image_main(SpaceImage *sima, ARegion *ar, Scene *scene)
 
        /* render info */
        if(ibuf && show_render)
-               sima_draw_render_info(sima, ar);
+               draw_render_info(sima, ar);
 
        /* XXX integrate this code */
 #if 0
index 997ba867121e84b28a68b9fd40b690d8bd0e10b9..120d1debde2f02e80dff1246060eb619d1c73383 100644 (file)
@@ -186,37 +186,6 @@ static void do_image_imagemenu(void *arg, int event)
 #ifndef DISABLE_PYTHON
        if (event >= 20) BPY_menu_do_python(PYMENU_IMAGE, event - 20);
 #endif 
-       switch(event)
-       {
-       case 0:
-               open_image_sima((G.qual==LR_CTRLKEY));
-               break;
-       case 1:
-               replace_image_sima((G.qual==LR_CTRLKEY));
-               break;
-       case 2:
-               pack_image_sima();
-               break;
-       case 5:
-               save_as_image_sima();
-               break;
-       case 6:
-               reload_image_sima();
-               break;
-       case 7:
-               new_image_sima();
-               break;
-       case 8:
-               save_image_sima();
-               break;
-       case 9:
-               save_image_sequence_sima();
-               break;
-       case 10:
-               BKE_image_memorypack(sima->image);
-               allqueue(REDRAWIMAGE, 0);
-               break;
-       }
 }
 #endif
 
@@ -242,12 +211,14 @@ static void image_imagemenu(bContext *C, uiMenuItem *head, void *arg_unused)
        uiMenuItemO(head, 0, "IMAGE_OT_open"); // Open...
 
        if(ima) {
-               uiMenuItemO(head, 0, "IMAGE_OT_replace"); // Replace...
-               uiMenuItemO(head, 0, "IMAGE_OT_reload"); // Reload...
+               if(!show_render) {
+                       uiMenuItemO(head, 0, "IMAGE_OT_replace"); // Replace...
+                       uiMenuItemO(head, 0, "IMAGE_OT_reload"); // Reload...
+               }
                uiMenuItemO(head, 0, "IMAGE_OT_save"); // Save
                uiMenuItemO(head, 0, "IMAGE_OT_save_as"); // Save As...
                if(ima->source == IMA_SRC_SEQUENCE)
-                       uiMenuItemO(head, 0, "IMAGE_OT_save_changed"); // Save Changed Images
+                       uiMenuItemO(head, 0, "IMAGE_OT_save_sequence"); // Save Changed Sequence Images
 
                if(!show_render) {
                        uiMenuSeparator(head);
index 384689bb000d81049ac31d8827042c6a0f4eff94..c4363f3981a08e85026f910f7cc705f3ac8bf6c3 100644 (file)
@@ -68,7 +68,9 @@ void IMAGE_OT_save_as(struct wmOperatorType *ot);
 void IMAGE_OT_save_sequence(struct wmOperatorType *ot);
 void IMAGE_OT_pack(struct wmOperatorType *ot);
 void IMAGE_OT_unpack(struct wmOperatorType *ot);
+
 void IMAGE_OT_sample(struct wmOperatorType *ot);
+void IMAGE_OT_set_curves_point(struct wmOperatorType *ot);
 
 void IMAGE_OT_record_composite(struct wmOperatorType *ot);
 
index 6ad1207f7cde020f8f3a2a19f30fbf37f6d99d36..e24e7254553cd3ab909a3bae2a7a923676899072 100644 (file)
@@ -68,6 +68,8 @@
 #include "ED_space_api.h"
 #include "ED_uvedit.h"
 
+#include "UI_interface.h"
+#include "UI_resources.h"
 #include "UI_view2d.h"
 
 #include "WM_api.h"
@@ -591,13 +593,15 @@ static void image_filesel(bContext *C, wmOperator *op, const char *path)
 {
        SpaceFile *sfile;
 
-       ED_screen_full_newspace(C, CTX_wm_area(C), SPACE_FILE);
+       // XXX context is not set back ok afterwards
+       // ED_screen_full_newspace(C, CTX_wm_area(C), SPACE_FILE);
+       ED_area_newspace(C, CTX_wm_area(C), SPACE_FILE);
        
        /* settings for filebrowser */
        sfile= (SpaceFile*)CTX_wm_space_data(C);
        sfile->op= op;
 
-       /* XXX right params for image filter browse, filters, .. */
+       /* XXX right params for image save, with pupmenu and image type .. */
        ED_fileselect_set_params(sfile, FILE_SPECIAL, op->type->name, path, 0, 0, 0);
 }
 
@@ -618,8 +622,6 @@ static int open_exec(bContext *C, wmOperator *op)
        if(!ima)
                return OPERATOR_CANCELLED;
 
-       return OPERATOR_FINISHED; // XXX context not correct!
-
        BKE_image_signal(ima, &sima->iuser, IMA_SIGNAL_RELOAD);
        ED_space_image_set(C, sima, scene, obedit, ima);
 
@@ -664,8 +666,6 @@ static int replace_exec(bContext *C, wmOperator *op)
        SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
        char *str;
 
-       return OPERATOR_CANCELLED; // XXX context not correct!
-
        if(!sima->image)
                return OPERATOR_CANCELLED;
        
@@ -674,6 +674,7 @@ static int replace_exec(bContext *C, wmOperator *op)
        MEM_freeN(str);
 
        BKE_image_signal(sima->image, &sima->iuser, IMA_SIGNAL_RELOAD);
+       WM_event_add_notifier(C, NC_IMAGE|NA_EDITED, sima->image);
 
        return OPERATOR_FINISHED;
 }
@@ -714,7 +715,7 @@ void IMAGE_OT_replace(wmOperatorType *ot)
 
 /******************** save image as operator ********************/
 
-static void save_image_doit(SpaceImage *sima, Scene *scene, char *name)
+static void save_image_doit(bContext *C, SpaceImage *sima, Scene *scene, wmOperator *op, char *name)
 {
        Image *ima= ED_space_image(sima);
        ImBuf *ibuf= ED_space_image_buffer(sima);
@@ -756,7 +757,8 @@ static void save_image_doit(SpaceImage *sima, Scene *scene, char *name)
                                                ibuf->userflags &= ~IB_BITMAPDIRTY;
                                        
                                }
-                               else; // XXX error("Did not write, no Multilayer Image");
+                               else
+                                       BKE_report(op->reports, RPT_ERROR, "Did not write, no Multilayer Image");
                        }
                        else if (BKE_write_ibuf(scene, ibuf, str, sima->imtypenr, scene->r.subimtype, scene->r.quality)) {
                                BLI_strncpy(ima->name, name, sizeof(ima->name));
@@ -777,12 +779,10 @@ static void save_image_doit(SpaceImage *sima, Scene *scene, char *name)
                                while (len > 0 && str[len - 1] != '/' && str[len - 1] != '\\') len--;
                                rename_id(&ima->id, str+len);
                        } 
-                       else {
-                               ; // XXX error("Couldn't write image: %s", str);
-                       }
+                       else
+                               BKE_reportf(op->reports, RPT_ERROR, "Couldn't write image: %s", str);
 
-                       // XXX allqueue(REDRAWHEADERS, 0);
-                       // XXX allqueue(REDRAWBUTSSHADING, 0);
+                       WM_event_add_notifier(C, NC_IMAGE|NA_EDITED, sima->image);
 
                        WM_cursor_wait(0);
                }
@@ -793,16 +793,14 @@ static int save_as_exec(bContext *C, wmOperator *op)
 {
        SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
        Scene *scene= CTX_data_scene(C);
-       //Image *ima = ED_space_image(sima);
+       Image *ima = ED_space_image(sima);
        char *str;
 
-       return OPERATOR_CANCELLED; // XXX context not correct!
-
-       /*if(!ima)
-               return OPERATOR_CANCELLED;*/
+       if(!ima)
+               return OPERATOR_CANCELLED;
 
        str= RNA_string_get_alloc(op->ptr, "filename", NULL, 0);
-       save_image_doit(sima, scene, str);
+       save_image_doit(C, sima, scene, op, str);
        MEM_freeN(str);
 
        return OPERATOR_FINISHED;
@@ -887,7 +885,7 @@ static int save_exec(bContext *C, wmOperator *op)
                        else 
                                sima->imtypenr= BKE_ftype_to_imtype(ibuf->ftype);
                        
-                       save_image_doit(sima, scene, ibuf->name);
+                       save_image_doit(C, sima, scene, op, ibuf->name);
                }
                else
                        return save_as_exec(C, op);
@@ -950,24 +948,22 @@ static int save_sequence_exec(bContext *C, wmOperator *op)
        BLI_strncpy(di, ibuf->name, FILE_MAX);
        BLI_splitdirstring(di, fi);
        
-       sprintf(fi, "%d Image(s) will be saved in %s", tot, di);
+       BKE_reportf(op->reports, RPT_INFO, "%d Image(s) will be saved in %s", tot, di);
 
-       if(1) { // XXX okee(fi)) {
-               
-               for(ibuf= sima->image->ibufs.first; ibuf; ibuf= ibuf->next) {
-                       if(ibuf->userflags & IB_BITMAPDIRTY) {
-                               char name[FILE_MAX];
-                               BLI_strncpy(name, ibuf->name, sizeof(name));
-                               
-                               BLI_convertstringcode(name, G.sce);
+       for(ibuf= sima->image->ibufs.first; ibuf; ibuf= ibuf->next) {
+               if(ibuf->userflags & IB_BITMAPDIRTY) {
+                       char name[FILE_MAX];
+                       BLI_strncpy(name, ibuf->name, sizeof(name));
+                       
+                       BLI_convertstringcode(name, G.sce);
 
-                               if(0 == IMB_saveiff(ibuf, name, IB_rect | IB_zbuf | IB_zbuffloat)) {
-                                       BKE_reportf(op->reports, RPT_ERROR, "Could not write image %s.", name);
-                                       break;
-                               }
-                               printf("Saved: %s\n", ibuf->name);
-                               ibuf->userflags &= ~IB_BITMAPDIRTY;
+                       if(0 == IMB_saveiff(ibuf, name, IB_rect | IB_zbuf | IB_zbuffloat)) {
+                               BKE_reportf(op->reports, RPT_ERROR, "Could not write image %s.", name);
+                               break;
                        }
+
+                       printf("Saved: %s\n", ibuf->name);
+                       ibuf->userflags &= ~IB_BITMAPDIRTY;
                }
        }
 
@@ -1003,8 +999,8 @@ static int reload_exec(bContext *C, wmOperator *op)
        BKE_image_signal(sima->image, &sima->iuser, IMA_SIGNAL_RELOAD);
        /* ED_space_image_set(C, sima, scene, obedit, NULL); - do we really need this? */
 
-       // XXX notifier
        // XXX BIF_preview_changed(ID_TE);
+       WM_event_add_notifier(C, NC_IMAGE|NA_EDITED, sima->image);
        ED_area_tag_redraw(CTX_wm_area(C));
        
        return OPERATOR_FINISHED;
@@ -1081,33 +1077,66 @@ void IMAGE_OT_new(wmOperatorType *ot)
 
 /********************* pack operator *********************/
 
-static int pack_exec(bContext *C, wmOperator *op)
+static int pack_test(bContext *C, wmOperator *op)
 {
-       SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
        Image *ima= CTX_data_edit_image(C);
-       ImBuf *ibuf= ED_space_image_buffer(sima);
        int as_png= RNA_boolean_get(op->ptr, "as_png");
 
        if(!ima)
-               return OPERATOR_CANCELLED;
+               return 0;
        if(!as_png && ima->packedfile)
-               return OPERATOR_CANCELLED;
+               return 0;
 
        if(ima->source==IMA_SRC_SEQUENCE || ima->source==IMA_SRC_MOVIE) {
                BKE_report(op->reports, RPT_ERROR, "Can't pack movie or image sequence.");
-               return OPERATOR_CANCELLED;
+               return 0;
        }
 
-       if(as_png || (ibuf && (ibuf->userflags & IB_BITMAPDIRTY))) {
-               if(1) // XXX okee("Can't pack painted image. Use Repack as PNG?"))
-                       BKE_image_memorypack(ima);
+       return 1;
+}
+
+static int pack_exec(bContext *C, wmOperator *op)
+{
+       SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
+       Image *ima= ED_space_image(sima);
+       ImBuf *ibuf= ED_space_image_buffer(sima);
+       int as_png= RNA_boolean_get(op->ptr, "as_png");
+
+       if(!pack_test(C, op))
+               return OPERATOR_CANCELLED;
+       
+       if(!as_png && (ibuf && (ibuf->userflags & IB_BITMAPDIRTY))) {
+               BKE_report(op->reports, RPT_ERROR, "Can't pack edited image from disk, only as internal PNG.");
+               return OPERATOR_CANCELLED;
        }
-       else {
-               ima->packedfile = newPackedFile(ima->name);
-               // XXX BIF_undo_push("Pack image");
+
+       if(as_png)
+               BKE_image_memorypack(ima);
+       else
+               ima->packedfile= newPackedFile(ima->name);
+
+       return OPERATOR_FINISHED;
+}
+
+static int pack_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+       SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
+       ImBuf *ibuf= ED_space_image_buffer(sima);
+       uiMenuItem *head;
+       int as_png= RNA_boolean_get(op->ptr, "as_png");
+
+       if(!pack_test(C, op))
+               return OPERATOR_CANCELLED;
+       
+       if(!as_png && (ibuf && (ibuf->userflags & IB_BITMAPDIRTY))) {
+               head= uiPupMenuBegin("OK", ICON_HELP);
+               uiMenuItemBooleanO(head, "Can't pack edited image from disk. Pack as internal PNG?", 0, op->idname, "as_png", 1);
+               uiPupMenuEnd(C, head);
+
+               return OPERATOR_CANCELLED;
        }
 
-       return OPERATOR_CANCELLED;
+       return pack_exec(C, op);
 }
 
 void IMAGE_OT_pack(wmOperatorType *ot)
@@ -1118,6 +1147,7 @@ void IMAGE_OT_pack(wmOperatorType *ot)
        
        /* api callbacks */
        ot->exec= pack_exec;
+       ot->invoke= pack_invoke;
        ot->poll= space_image_poll;
 
        /* flags */
@@ -1144,15 +1174,11 @@ static int unpack_exec(bContext *C, wmOperator *op)
        }
 
        if(G.fileflags & G_AUTOPACK)
-               if(1) // XXX okee("Disable AutoPack?"))
-                       G.fileflags &= ~G_AUTOPACK;
+               BKE_report(op->reports, RPT_WARNING, "AutoPack is enabled, so image will be packed again on file save.");
        
-       if((G.fileflags & G_AUTOPACK) == 0) {
-               unpackImage(ima, PF_ASK);
-               // XXX BIF_undo_push("Ununpack image");
-       }
+       unpackImage(ima, PF_ASK);
 
-       return OPERATOR_CANCELLED;
+       return OPERATOR_FINISHED;
 }
 
 void IMAGE_OT_unpack(wmOperatorType *ot)
@@ -1266,15 +1292,17 @@ static void sample_apply(bContext *C, wmOperator *op, wmEvent *event)
                        info->zfp= &info->zf;
                }
                
-               // XXX set white/black point
-               if(sima->cumap) {
-                       if(ibuf->channels==4) {
-                               if(0) { // XXX G.qual & LR_CTRLKEY) {
-                                       curvemapping_set_black_white(sima->cumap, NULL, fp);
+               if(sima->cumap && ibuf->channels==4) {
+                       /* we reuse this callback for set curves point operators */
+                       if(RNA_struct_find_property(op->ptr, "point")) {
+                               int point= RNA_enum_get(op->ptr, "point");
+
+                               if(point == 1) {
+                                       curvemapping_set_black_white(sima->cumap, NULL, info->colfp);
                                        curvemapping_do_ibuf(sima->cumap, ibuf);
                                }
-                               else if(0) { // XXX G.qual & LR_SHIFTKEY) {
-                                       curvemapping_set_black_white(sima->cumap, fp, NULL);
+                               else if(point == 0) {
+                                       curvemapping_set_black_white(sima->cumap, info->colfp, NULL);
                                        curvemapping_do_ibuf(sima->cumap, ibuf);
                                }
                        }
@@ -1368,6 +1396,32 @@ void IMAGE_OT_sample(wmOperatorType *ot)
        ot->poll= space_image_main_area_poll;
 }
 
+/******************** set curve point operator ********************/
+
+void IMAGE_OT_set_curves_point(wmOperatorType *ot)
+{
+       static EnumPropertyItem point_items[]= {
+               {0, "BLACK_POINT", "Black Point", ""},
+               {1, "WHITE_POINT", "White Point", ""},
+               {0, NULL, NULL, NULL}};
+
+       /* identifiers */
+       ot->name= "Set Curves Point";
+       ot->idname= "IMAGE_OT_set_curves_point";
+
+       /* flags */
+       ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+       
+       /* api callbacks */
+       ot->invoke= sample_invoke;
+       ot->modal= sample_modal;
+       ot->cancel= sample_cancel;
+       ot->poll= space_image_main_area_poll;
+
+       /* properties */
+       RNA_def_enum(ot->srna, "point", point_items, 0, "Point", "Set black point or white point for curves.");
+}
+
 /******************** record composite operator *********************/
 
 typedef struct RecordCompositeData {
@@ -1383,11 +1437,12 @@ int record_composite_apply(bContext *C, wmOperator *op)
        Scene *scene= CTX_data_scene(C);
        ImBuf *ibuf;
        
+       WM_timecursor(CTX_wm_window(C), scene->r.cfra);
+
        // XXX scene->nodetree->test_break= blender_test_break;
        // XXX scene->nodetree->test_break= NULL;
-       // XXX set_timecursor(CFRA);
        
-       BKE_image_all_free_anim_ibufs(CFRA);
+       BKE_image_all_free_anim_ibufs(scene->r.cfra);
        ntreeCompositTagAnimated(scene->nodetree);
        ntreeCompositExecTree(scene->nodetree, &scene->r, scene->r.cfra != rcd->old_cfra);      /* 1 is no previews */
 
@@ -1421,27 +1476,26 @@ static int record_composite_init(bContext *C, wmOperator *op)
        rcd->efra= sima->iuser.sfra + sima->iuser.frames-1;
        scene->r.cfra= rcd->sfra;
 
-       WM_cursor_wait(1);
-
        return 1;
 }
 
 static void record_composite_exit(bContext *C, wmOperator *op)
 {
        Scene *scene= CTX_data_scene(C);
+       SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
        RecordCompositeData *rcd= op->customdata;
 
        scene->r.cfra= rcd->old_cfra;
 
-       WM_cursor_wait(0);
+       WM_cursor_restore(CTX_wm_window(C));
 
        if(rcd->timer)
                WM_event_remove_window_timer(CTX_wm_window(C), rcd->timer);
 
+       WM_event_add_notifier(C, NC_IMAGE|NA_EDITED, sima->image);
+
        // XXX play_anim(0);
-       
        // XXX allqueue(REDRAWNODE, 1);
-       // XXX allqueue(REDRAWIMAGE, 1);
 
        MEM_freeN(rcd);
 }
index a3208331a3f6b0a01212e7f4409b7d5b92a6dd06..f3b414262a8844986856ad873c8b43b21f59a295 100644 (file)
@@ -101,9 +101,6 @@ static SpaceLink *image_new(const bContext *C)
        BLI_addtail(&simage->regionbase, ar);
        ar->regiontype= RGN_TYPE_WINDOW;
        
-       /* channel list region XXX */
-
-       
        return (SpaceLink *)simage;
 }
 
@@ -156,7 +153,9 @@ void image_operatortypes(void)
        WM_operatortype_append(IMAGE_OT_save_sequence);
        WM_operatortype_append(IMAGE_OT_pack);
        WM_operatortype_append(IMAGE_OT_unpack);
+
        WM_operatortype_append(IMAGE_OT_sample);
+       WM_operatortype_append(IMAGE_OT_set_curves_point);
 
        WM_operatortype_append(IMAGE_OT_record_composite);
 
@@ -189,7 +188,10 @@ void image_keymap(struct wmWindowManager *wm)
        WM_keymap_add_item(keymap, "IMAGE_OT_open", OKEY, KM_PRESS, KM_ALT, 0);
        WM_keymap_add_item(keymap, "IMAGE_OT_reload", RKEY, KM_PRESS, KM_ALT, 0);
        WM_keymap_add_item(keymap, "IMAGE_OT_save", SKEY, KM_PRESS, KM_ALT, 0);
+
        WM_keymap_add_item(keymap, "IMAGE_OT_sample", ACTIONMOUSE, KM_PRESS, 0, 0);
+       RNA_enum_set(WM_keymap_add_item(keymap, "IMAGE_OT_set_curves_point", ACTIONMOUSE, KM_PRESS, KM_CTRL, 0)->ptr, "point", 0);
+       RNA_enum_set(WM_keymap_add_item(keymap, "IMAGE_OT_set_curves_point", ACTIONMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "point", 1);
 
        WM_keymap_add_item(keymap, "IMAGE_OT_toolbox", SPACEKEY, KM_PRESS, 0, 0);
 }
@@ -234,6 +236,8 @@ static void image_refresh(const bContext *C, ScrArea *sa)
 
 static void image_listener(ScrArea *sa, wmNotifier *wmn)
 {
+       SpaceImage *sima= sa->spacedata.first;
+
        /* context changes */
        switch(wmn->category) {
                case NC_SCENE:
@@ -246,6 +250,10 @@ static void image_listener(ScrArea *sa, wmNotifier *wmn)
                                        break;
                        }
                        break;
+               case NC_IMAGE:  
+                       if(!wmn->reference || wmn->reference == sima->image)
+                               ED_area_tag_redraw(sa);
+                       break;
        }
 }
 
@@ -277,7 +285,7 @@ static void image_main_area_set_view2d(SpaceImage *sima, ARegion *ar)
 #if 0
        if(image_preview_active(curarea, &xim, &yim));
        else if(sima->image) {
-               ImBuf *ibuf= imagewindow_get_ibuf(sima);
+               ImBuf *ibuf= ED_space_image_buffer(sima);
                float xuser_asp, yuser_asp;
                
                ED_image_aspect(sima->image, &xuser_asp, &yuser_asp);
@@ -507,9 +515,6 @@ void ED_space_image_set(bContext *C, SpaceImage *sima, Scene *scene, Object *obe
         * to check if the face is displayed in UV-localview */
        sima->image= ima;
 
-       if(ima)
-               printf("assign %s\n", ima->id.name);
-
        if(ima == NULL || ima->type==IMA_TYPE_R_RESULT || ima->type==IMA_TYPE_COMPOSITE)
                sima->flag &= ~SI_DRAWTOOL;
 
index 9382e170a21ab834759ae3b20a949dd9a50d2c3f..a8fb42c4ed0896ad4648ae39afaafb39c9c9d3f4 100644 (file)
@@ -153,6 +153,7 @@ typedef struct wmNotifier {
 #define        NC_TEXTURE                      (7<<24)
 #define        NC_LAMP                         (8<<24)
 #define        NC_GROUP                        (9<<24)
+#define        NC_IMAGE                        (10<<24)
 
 /* data type, 256 entries is enough, it can overlap */
 #define NOTE_DATA                      0x00FF0000