Commit: 705fe08b6113683d46b196442ef3bf484359d478 Author: Christoph Lendenfeld Date: Thu Nov 24 15:19:48 2022 +0100 Branches: blender-v3.4-release https://developer.blender.org/rB705fe08b6113683d46b196442ef3bf484359d478
Fix T99400: "Jump to Keyframe" preserves subframe offset Previously when using the "Jump To Keyframe" operator in conjunction with subframes, the decimal part would be kept. Meaning that it wouldn't jump exactly to the frame. This fix also makes it so it is possible to jump to keyframes that are on subframes. Reviewed by: Sybren Differential Revision: https://developer.blender.org/D16595 =================================================================== M release/datafiles/locale M release/scripts/addons M release/scripts/addons_contrib M source/blender/editors/screen/screen_ops.c =================================================================== diff --git a/release/datafiles/locale b/release/datafiles/locale index fe221a8bc93..ef57e2c2c65 160000 --- a/release/datafiles/locale +++ b/release/datafiles/locale @@ -1 +1 @@ -Subproject commit fe221a8bc934385d9f302c46a5c7cbeacddafe3b +Subproject commit ef57e2c2c65933a68811d58b40ed62b775e9b4b0 diff --git a/release/scripts/addons b/release/scripts/addons index 5a818af9508..946b62da3f9 160000 --- a/release/scripts/addons +++ b/release/scripts/addons @@ -1 +1 @@ -Subproject commit 5a818af95080cccf04dfa8317f0e966bff515c64 +Subproject commit 946b62da3f9c93b4add8596aef836bf3a29ea27c diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib index c43c0b2bcf0..69b1305f4b7 160000 --- a/release/scripts/addons_contrib +++ b/release/scripts/addons_contrib @@ -1 +1 @@ -Subproject commit c43c0b2bcf08c34d933c3b56f096c9a23c8eff68 +Subproject commit 69b1305f4b74fbd7e847acc6a5566755b9803d78 diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 6a910170e44..9c0963d0fb1 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -3106,7 +3106,9 @@ static int keyframe_jump_exec(bContext *C, wmOperator *op) while ((ak != NULL) && (done == false)) { if (scene->r.cfra != (int)ak->cfra) { /* this changes the frame, so set the frame and we're done */ - scene->r.cfra = (int)ak->cfra; + const int whole_frame = (int)ak->cfra; + scene->r.cfra = whole_frame; + scene->r.subframe = ak->cfra - whole_frame; done = true; } else { _______________________________________________ Bf-blender-cvs mailing list [email protected] List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
