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

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-01-19 21:44:03 +11:00
parent e46c49ff3d 889321e22b
commit 08fe885d06
23 changed files with 83 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/transform/transform.c
View File

@@ -1969,7 +1969,7 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
}
// If modal, save settings back in scene if not set as operator argument
if (t->flag & T_MODAL) {
if ((t->flag & T_MODAL) || (op->flag & OP_IS_REPEAT)) {
/* save settings if not set in operator */
/* skip saving proportional edit if it was not actually used */
@@ -1989,10 +1989,9 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
ts->proportional_objects = (proportional != PROP_EDIT_OFF);
}
if ((prop = RNA_struct_find_property(op->ptr, "proportional_size")) &&
!RNA_property_is_set(op->ptr, prop))
{
ts->proportional_size = t->prop_size;
if ((prop = RNA_struct_find_property(op->ptr, "proportional_size"))) {
ts->proportional_size =
RNA_property_is_set(op->ptr, prop) ? RNA_property_float_get(op->ptr, prop) : t->prop_size;
}
if ((prop = RNA_struct_find_property(op->ptr, "proportional_edit_falloff")) &&