diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-04-09 19:29:58 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-04-09 19:30:14 +0300 |
| commit | 851ea206d05b4d91423bc754ab2cc4bb0d1f6f38 (patch) | |
| tree | 1ed416c189aa41c5d1f9e71b00855e514f343e2f /source/blender/editors/transform | |
| parent | cca4405437363bd1cb3d8ee9a77691fd8225d76f (diff) | |
Separate proportional editing options for graph and action editor.
Diffstat (limited to 'source/blender/editors/transform')
| -rw-r--r-- | source/blender/editors/transform/transform.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_generics.c | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 0d5e496ee07..ddd2df80d1a 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -1938,7 +1938,11 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op) if ((prop = RNA_struct_find_property(op->ptr, "proportional")) && !RNA_property_is_set(op->ptr, prop)) { - if (t->obedit) + if (t->spacetype == SPACE_IPO) + ts->proportional_ipo = proportional; + else if (t->spacetype == SPACE_ACTION) + ts->proportional_action = proportional; + else if (t->obedit) ts->proportional = proportional; else if (t->options & CTX_MASK) ts->proportional_mask = (proportional != PROP_EDIT_OFF); diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 27a072c301b..b27f7c5ae12 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -1320,8 +1320,11 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve /* use settings from scene only if modal */ if (t->flag & T_MODAL) { if ((t->options & CTX_NO_PET) == 0) { - if (ELEM(t->spacetype, SPACE_IPO, SPACE_ACTION)) { - t->flag |= initTransInfo_edit_pet_to_flag(ts->proportional); + if (t->spacetype == SPACE_IPO) { + t->flag |= initTransInfo_edit_pet_to_flag(ts->proportional_ipo); + } + else if (t->spacetype == SPACE_ACTION) { + t->flag |= initTransInfo_edit_pet_to_flag(ts->proportional_action); } else if (t->obedit) { t->flag |= initTransInfo_edit_pet_to_flag(ts->proportional); |