sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix #19802: tweaking the values of e.g. the add tube operator when

Browse Source 
entering editmode on a second mesh would create a duplicate tube.

Cleaning the undo stack from the previous mesh would mess up the redo.
Also, OBJECT_OT_mode_set was causing enter/exit editmode undo push to
be done twice, now it leaves undo push to the operator it calls.
This commit is contained in:
Brecht Van Lommel 2010-01-26 15:54:42 +00:00
parent dcf54b9b66
commit 8d6a40c016
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/object/object_edit.c
View File

@ -2077,7 +2077,7 @@ void OBJECT_OT_mode_set(wmOperatorType *ot)
ot->poll= ED_operator_object_active_editable;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
ot->flag= 0; /* no register/undo here, leave it to operators being called */
prop= RNA_def_enum(ot->srna, "mode", object_mode_items, OB_MODE_OBJECT, "Mode", "");
RNA_def_enum_funcs(prop, object_mode_set_itemsf);

7
source/blender/editors/util/editmode_undo.c
View File

@ -203,7 +203,6 @@ static void undo_clean_stack(bContext *C)
{
UndoElem *uel, *next;
Object *obedit= CTX_data_edit_object(C);
int mixed= 0;
/* global undo changes pointers, so we also allow identical names */
/* side effect: when deleting/renaming object and start editing new one with same name */
@ -226,7 +225,9 @@ static void undo_clean_stack(bContext *C)
if(isvalid)
uel->ob= obedit;
else {
mixed= 1;
if(uel == curundo)
curundo= NULL;
uel->freedata(uel->undodata);
BLI_freelinkN(&undobase, uel);
}
@ -234,7 +235,7 @@ static void undo_clean_stack(bContext *C)
uel= next;
}
if(mixed) curundo= undobase.last;
if(curundo == NULL) curundo= undobase.last;
}
/* 1= an undo, -1 is a redo. we have to make sure 'curundo' remains at current situation */