griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix for fix [#24955] Generating UV-Images within blender (Alt-N) not possible

Browse Source 
We had 3 reports of not being able to add images in editmode which was a workaround for redo in editmode bug.
Rather then having it use operator redo, just give an OK button.
This commit is contained in:
Campbell Barton
2010-11-28 12:38:29 +00:00
parent 34ea1cf0b2
commit 2840d524e0
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1244,7 +1244,7 @@ void IMAGE_OT_reload(wmOperatorType *ot)
/********************** new image operator *********************/
static int new_exec(bContext *C, wmOperator *op)
static int image_new_exec(bContext *C, wmOperator *op)
{
SpaceImage *sima;
Scene *scene;
@@ -1301,16 +1301,11 @@ static int new_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
/* XXX is temp, redo is not possible in editmode due to undo conflicts */
static int space_image_no_editmode_poll(bContext *C)
/* XXX, Ton is not a fan of OK buttons but using this function to avoid undo/redo bug while in mesh-editmode, - campbell */
static int image_new_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event))
{
SpaceImage *sima= CTX_wm_space_image(C);
Object *ob= CTX_data_edit_object(C);
return WM_operator_props_dialog_popup(C, op, 300, 100);
if(sima && ob)
return 0;
return 1;
}
void IMAGE_OT_new(wmOperatorType *ot)
@@ -1323,9 +1318,8 @@ void IMAGE_OT_new(wmOperatorType *ot)
ot->idname= "IMAGE_OT_new";
/* api callbacks */
ot->exec= new_exec;
ot->invoke= WM_operator_props_popup;
ot->poll= space_image_no_editmode_poll;
ot->exec= image_new_exec;
ot->invoke= image_new_invoke;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;