Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2015-04-09 19:29:58 +0300
committerAntony Riakiotakis <kalast@gmail.com>2015-04-09 19:30:14 +0300
commit851ea206d05b4d91423bc754ab2cc4bb0d1f6f38 (patch)
tree1ed416c189aa41c5d1f9e71b00855e514f343e2f /source/blender/editors/transform/transform_generics.c
parentcca4405437363bd1cb3d8ee9a77691fd8225d76f (diff)
Separate proportional editing options for graph and action editor.
Diffstat (limited to 'source/blender/editors/transform/transform_generics.c')
-rw-r--r--source/blender/editors/transform/transform_generics.c7
1 files changed, 5 insertions, 2 deletions
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);