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

Fix [#22088] Object's material changes (links) to other when moving an object

Browse Source 
to an other layer

WM_operator_props_popup() and subsequent block handle function redo_cb()
was popping an operator undo, without having pushed one previously - 
this would undo one too many times when using the properties invoke popup.

Fixed by adding an undo push to WM_operator_props_popup()
This commit is contained in:
Matt Ebb
2010-04-22 11:35:11 +00:00
parent a56b72fd82
commit 3df0db98d3
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/windowmanager/intern/wm_operators.c
View File

@@ -1016,9 +1016,13 @@ int WM_operator_props_popup(bContext *C, wmOperator *op, wmEvent *event)
{ {
int retval= OPERATOR_CANCELLED; int retval= OPERATOR_CANCELLED;
if(op->type->exec) if(op->type->exec) {
retval= op->type->exec(C, op); retval= op->type->exec(C, op);
if(op->type->flag & OPTYPE_UNDO)
ED_undo_push_op(C, op);
}
if(retval != OPERATOR_CANCELLED) if(retval != OPERATOR_CANCELLED)
uiPupBlock(C, wm_block_create_redo, op); uiPupBlock(C, wm_block_create_redo, op);