[Bf-blender-cvs] [57142cf2ec9] temp-graph-select-changes: Fix incorrect selection flag usage
Julian Eisel
noreply at git.blender.org
Fri Nov 15 17:07:30 CET 2019
Commit: 57142cf2ec9f1570f6085f68b19905d825d67627
Author: Julian Eisel
Date: Thu Nov 14 17:23:24 2019 +0100
Branches: temp-graph-select-changes
https://developer.blender.org/rB57142cf2ec9f1570f6085f68b19905d825d67627
Fix incorrect selection flag usage
===================================================================
M source/blender/blenkernel/intern/fcurve.c
M source/blender/editors/transform/transform_convert.c
===================================================================
diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c
index 1709e7a61dd..3876033eaaa 100644
--- a/source/blender/blenkernel/intern/fcurve.c
+++ b/source/blender/blenkernel/intern/fcurve.c
@@ -1163,7 +1163,7 @@ void testhandles_fcurve(FCurve *fcu, eBezTriple_Flag sel_flag, const bool use_ha
}
/* recalculate handles */
- calchandles_fcurve(fcu);
+ calchandles_fcurve_ex(fcu, sel_flag);
}
/* This function sorts BezTriples so that they are arranged in chronological order,
diff --git a/source/blender/editors/transform/transform_convert.c b/source/blender/editors/transform/transform_convert.c
index 3347997ecf6..16ab468c139 100644
--- a/source/blender/editors/transform/transform_convert.c
+++ b/source/blender/editors/transform/transform_convert.c
@@ -1043,7 +1043,7 @@ static void posttrans_fcurve_clean(FCurve *fcu,
}
/* 3) Recalculate handles */
- testhandles_fcurve(fcu, BEZT_FLAG_TEMP_TAG, use_handle);
+ testhandles_fcurve(fcu, sel_flag, use_handle);
/* cleanup */
BLI_freelistN(&retained_keys);
@@ -1071,11 +1071,11 @@ static void posttrans_action_clean(bAnimContext *ac, bAction *act)
if (adt) {
ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 0, 0);
- posttrans_fcurve_clean(ale->key_data, false); /* only use handles in graph editor */
+ posttrans_fcurve_clean(ale->key_data, SELECT, false); /* only use handles in graph editor */
ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 1, 0);
}
else {
- posttrans_fcurve_clean(ale->key_data, false); /* only use handles in graph editor */
+ posttrans_fcurve_clean(ale->key_data, SELECT, false); /* only use handles in graph editor */
}
}
@@ -1965,11 +1965,11 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
if ((saction->flag & SACTION_NOTRANSKEYCULL) == 0 && ((canceled == 0) || (duplicate))) {
if (adt) {
ANIM_nla_mapping_apply_fcurve(adt, fcu, 0, 0);
- posttrans_fcurve_clean(fcu, false); /* only use handles in graph editor */
+ posttrans_fcurve_clean(fcu, SELECT, false); /* only use handles in graph editor */
ANIM_nla_mapping_apply_fcurve(adt, fcu, 1, 0);
}
else {
- posttrans_fcurve_clean(fcu, false); /* only use handles in graph editor */
+ posttrans_fcurve_clean(fcu, SELECT, false); /* only use handles in graph editor */
}
}
}
@@ -2109,11 +2109,11 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
if ((sipo->flag & SIPO_NOTRANSKEYCULL) == 0 && ((canceled == 0) || (duplicate))) {
if (adt) {
ANIM_nla_mapping_apply_fcurve(adt, fcu, 0, 0);
- posttrans_fcurve_clean(fcu, use_handle);
+ posttrans_fcurve_clean(fcu, BEZT_FLAG_TEMP_TAG, use_handle);
ANIM_nla_mapping_apply_fcurve(adt, fcu, 1, 0);
}
else {
- posttrans_fcurve_clean(fcu, use_handle);
+ posttrans_fcurve_clean(fcu, BEZT_FLAG_TEMP_TAG, use_handle);
}
}
}
More information about the Bf-blender-cvs
mailing list