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:
authorSybren A. Stüvel <sybren@blender.org>2022-03-07 18:48:44 +0300
committerSybren A. Stüvel <sybren@blender.org>2022-03-07 18:48:44 +0300
commit5ae26e410ab1c23a705f7d9a4873f3bb29ba86d2 (patch)
tree3855317ae5a24cffdeb3833d0d754f299b7c1e48 /source/blender/editors/animation
parent5b2d9c0cbe7566ac8289c41c0ee705e409013be4 (diff)
Fix T94360: Assert on dragging keyframes
Fix an assert by commenting out the assert. In normal situations all keyframes are sorted. However, while keys are transformed, they may change order and then this assertion no longer holds. The effect is that the drawing isn't perfect during the transform; the "constant value" bars aren't updated until the transformation is confirmed. Apart from that, the code runs fine, so it seems like a workable workaround.
Diffstat (limited to 'source/blender/editors/animation')
-rw-r--r--source/blender/editors/animation/keyframes_keylist.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/editors/animation/keyframes_keylist.cc b/source/blender/editors/animation/keyframes_keylist.cc
index 0b795fea278..7dc3415c904 100644
--- a/source/blender/editors/animation/keyframes_keylist.cc
+++ b/source/blender/editors/animation/keyframes_keylist.cc
@@ -807,8 +807,11 @@ static void add_bezt_to_keyblocks_list(AnimKeylist *keylist, BezTriple *bezt, co
continue;
}
- /* Normal sequence */
- BLI_assert(is_cfra_eq(col->cfra, bezt[0].vec[1][0]));
+ /* In normal situations all keyframes are sorted. However, while keys are transformed, they
+ * may change order and then this assertion no longer holds. The effect is that the drawing
+ * isn't perfect during the transform; the "constant value" bars aren't updated until the
+ * transformation is confirmed. */
+ /* BLI_assert(is_cfra_eq(col->cfra, bezt[0].vec[1][0])); */
compute_keyblock_data(&block, bezt, bezt + 1);