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

Multi-value cancel, keeps scale set

Browse Source
This commit is contained in:
Campbell Barton
2015-05-28 15:41:17 +10:00
parent dc1586063b
commit 2480bbff56
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/interface/interface_handlers.c
View File

@@ -1932,11 +1932,9 @@ static void ui_apply_but(bContext *C, uiBlock *block, uiBut *but, uiHandleButton
if (data->str) MEM_freeN(data->str);
data->str = data->origstr;
data->origstr = NULL;
data->value = data->origvalue;
data->origvalue = 0.0;
copy_v3_v3(data->vec, data->origvec);
data->origvec[0] = data->origvec[1] = data->origvec[2] = 0.0f;
/* postpone clearing origdata */
}
else {
/* we avoid applying interactive edits a second time
@@ -2076,6 +2074,12 @@ static void ui_apply_but(bContext *C, uiBlock *block, uiBut *but, uiHandleButton
ui_selectcontext_apply(C, but, &data->select_others, data->value, data->origvalue);
#endif
if (data->cancel) {
data->origstr = NULL;
data->origvalue = 0.0;
zero_v3(data->origvec);
}
but->editstr = editstr;
but->editval = editval;
but->editvec = editvec;