diff options
-rw-r--r-- | source/blender/editors/screen/screen_ops.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_image/image_ops.c | 23 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_header.c | 10 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h | 6 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 3 |
5 files changed, 20 insertions, 24 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 67ca31fbfff..2f9028d819c 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -307,7 +307,7 @@ int ED_operator_posemode(bContext *C) { Object *obact= CTX_data_active_object(C); - if ((obact != CTX_data_edit_object(C))) { + if (!(obact->mode & OB_MODE_EDIT)) { Object *obpose; if((obpose= ED_object_pose_armature(obact))) { if((obact == obpose) || (obact->mode & OB_MODE_WEIGHT_PAINT)) { diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 7dae17ff9e0..d2cf3365423 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -876,15 +876,19 @@ static void save_image_doit(bContext *C, SpaceImage *sima, Scene *scene, wmOpera short ok= FALSE; BLI_path_abs(path, bmain->name); - + WM_cursor_wait(1); - /* enforce user setting for RGB or RGBA, but skip BW */ - if(scene->r.planes==32) - ibuf->depth= 32; - else if(scene->r.planes==24) - ibuf->depth= 24; - + if(ima->type == IMA_TYPE_R_RESULT) { + /* enforce user setting for RGB or RGBA, but skip BW */ + if(scene->r.planes==32) { + ibuf->depth= 32; + } + else if(scene->r.planes==24) { + ibuf->depth= 24; + } + } + if(scene->r.scemode & R_EXTENSION) { BKE_add_image_extension(path, sima->imtypenr); } @@ -946,9 +950,8 @@ static void save_image_doit(bContext *C, SpaceImage *sima, Scene *scene, wmOpera else { BKE_reportf(op->reports, RPT_ERROR, "Couldn't write image: %s", path); } - - - + + WM_event_add_notifier(C, NC_IMAGE|NA_EDITED, sima->image); WM_cursor_wait(0); diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index 746c6acae1c..5a7616bb2ec 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -446,16 +446,6 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C) v3d->modeselect = ob->mode; else v3d->modeselect = OB_MODE_OBJECT; - - v3d->flag &= ~V3D_MODE; - - /* not sure what the v3d->flag is useful for now... modeselect is confusing */ - if(obedit) v3d->flag |= V3D_EDITMODE; - if(ob && (ob->mode & OB_MODE_POSE)) v3d->flag |= V3D_POSEMODE; - if(ob && (ob->mode & OB_MODE_VERTEX_PAINT)) v3d->flag |= V3D_VERTEXPAINT; - if(ob && (ob->mode & OB_MODE_WEIGHT_PAINT)) v3d->flag |= V3D_WEIGHTPAINT; - if(ob && (ob->mode & OB_MODE_TEXTURE_PAINT)) v3d->flag |= V3D_TEXTUREPAINT; - if(paint_facesel_test(ob)) v3d->flag |= V3D_FACESELECT; uiBlockBeginAlign(block); uiDefIconTextButS(block, MENU, B_MODESELECT, object_mode_icon(v3d->modeselect), view3d_modeselect_pup(scene) , diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index dcc620463c9..00e5db0a639 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -203,20 +203,22 @@ typedef struct View3D { } View3D; -/* XXX this needs cleaning */ /* View3D->flag (short) */ -#define V3D_MODE (16+32+64+128+256+512) #define V3D_DISPIMAGE 1 #define V3D_DISPBGPICS 2 #define V3D_HIDE_HELPLINES 4 #define V3D_INVALID_BACKBUF 8 +/* deprecated */ +/* +#define V3D_MODE (16+32+64+128+256+512) #define V3D_EDITMODE 16 #define V3D_VERTEXPAINT 32 #define V3D_FACESELECT 64 #define V3D_POSEMODE 128 #define V3D_TEXTUREPAINT 256 #define V3D_WEIGHTPAINT 512 +*/ #define V3D_ALIGN 1024 #define V3D_SELECT_OUTLINE 2048 #define V3D_ZBUF_SELECT 4096 diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 74eaeed0ac0..6a0b04346dc 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -987,7 +987,8 @@ static uiBlock *wm_block_create_dialog(bContext *C, ARegion *ar, void *userData) btn= uiDefBut(block, BUT, 0, "OK", 0, 0, 0, 20, NULL, 0, 0, 0, 0, ""); uiButSetFunc(btn, dialog_exec_cb, op, block); - uiPopupBoundsBlock(block, 4.0f, 0, 0); + /* center around the mouse */ + uiPopupBoundsBlock(block, 4.0f, data->width/-2, data->height/2); uiEndBlock(C, block); return block; |