Fix #112085: Not able to insert keys on subframes
When subframes were enabled, and the time cursor was at a subframe position, the keying would still insert the key at the full frame. This was because the value passed to the key insertion functions was just the full frame value and not the subframe part. Fixing it by using `BKE_scene_frame_get()` which returns the floating point frame including the subframe part. I've added unit tests to ensure that inserting keys at subframe values doesn't cause issues. Pull Request: https://projects.blender.org/blender/blender/pulls/112131
This commit is contained in:
Christoph Lendenfeld
committed by
Christoph Lendenfeld
Christoph Lendenfeld
parent
456d65b00a
commit
8f1bd71992
@@ -152,6 +152,213 @@ class EulerFilterTest(AbstractAnimationTest, unittest.TestCase):
|
||||
ob = bpy.context.view_layer.objects.active
|
||||
action = ob.animation_data.action
|
||||
return [action.fcurves.find('rotation_euler', index=idx) for idx in range(3)]
|
||||
|
||||
|
||||
def get_view3d_context():
|
||||
ctx = bpy.context.copy()
|
||||
|
||||
for area in bpy.context.window.screen.areas:
|
||||
if area.type != 'VIEW_3D':
|
||||
continue
|
||||
|
||||
ctx['area'] = area
|
||||
ctx['space'] = area.spaces.active
|
||||
break
|
||||
|
||||
return ctx
|
||||
|
||||
|
||||
class KeyframeInsertTest(AbstractAnimationTest, unittest.TestCase):
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
bpy.ops.wm.read_homefile()
|
||||
|
||||
|
||||
def test_keyframe_insertion_basic(self):
|
||||
bpy.ops.mesh.primitive_monkey_add()
|
||||
key_count = 100
|
||||
with bpy.context.temp_override(**get_view3d_context()):
|
||||
for frame in range(key_count):
|
||||
bpy.context.scene.frame_set(frame)
|
||||
bpy.ops.anim.keyframe_insert_by_name(type="Location")
|
||||
|
||||
key_object = bpy.context.active_object
|
||||
for key_index in range(key_count):
|
||||
key = key_object.animation_data.action.fcurves[0].keyframe_points[key_index]
|
||||
self.assertEqual(key.co.x, key_index)
|
||||
|
||||
bpy.ops.object.delete(use_global=False)
|
||||
|
||||
def test_keyframe_insertion_high_frame_number(self):
|
||||
bpy.ops.mesh.primitive_monkey_add()
|
||||
key_count = 100
|
||||
frame_offset = 1000000
|
||||
with bpy.context.temp_override(**get_view3d_context()):
|
||||
for frame in range(key_count):
|
||||
bpy.context.scene.frame_set(frame + frame_offset)
|
||||
bpy.ops.anim.keyframe_insert_by_name(type="Location")
|
||||
|
||||
key_object = bpy.context.active_object
|
||||
for key_index in range(key_count):
|
||||
key = key_object.animation_data.action.fcurves[0].keyframe_points[key_index]
|
||||
self.assertEqual(key.co.x, key_index+frame_offset)
|
||||
|
||||
bpy.ops.object.delete(use_global=False)
|
||||
|
||||
def test_keyframe_insertion_subframes_basic(self):
|
||||
bpy.ops.mesh.primitive_monkey_add()
|
||||
key_count = 50
|
||||
with bpy.context.temp_override(**get_view3d_context()):
|
||||
for i in range(key_count):
|
||||
bpy.context.scene.frame_set(0, subframe=i/key_count)
|
||||
bpy.ops.anim.keyframe_insert_by_name(type="Location")
|
||||
|
||||
key_object = bpy.context.active_object
|
||||
for key_index in range(key_count):
|
||||
key = key_object.animation_data.action.fcurves[0].keyframe_points[key_index]
|
||||
self.assertAlmostEqual(key.co.x, key_index/key_count)
|
||||
|
||||
bpy.ops.object.delete(use_global=False)
|
||||
|
||||
def test_keyframe_insertion_subframes_high_frame_number(self):
|
||||
bpy.ops.mesh.primitive_monkey_add()
|
||||
key_count = 50
|
||||
frame_offset = 1000000
|
||||
with bpy.context.temp_override(**get_view3d_context()):
|
||||
for i in range(key_count):
|
||||
bpy.context.scene.frame_set(frame_offset, subframe=i/key_count)
|
||||
bpy.ops.anim.keyframe_insert_by_name(type="Location")
|
||||
|
||||
key_object = bpy.context.active_object
|
||||
# These are the possible floating point steps from "1.000.000" up to "1.000.001".
|
||||
floating_point_steps = [
|
||||
1000000.0,
|
||||
1000000.0625,
|
||||
1000000.125,
|
||||
1000000.1875,
|
||||
1000000.25,
|
||||
1000000.3125,
|
||||
1000000.375,
|
||||
1000000.4375,
|
||||
1000000.5,
|
||||
1000000.5625,
|
||||
1000000.625,
|
||||
1000000.6875,
|
||||
1000000.75,
|
||||
1000000.8125,
|
||||
1000000.875,
|
||||
1000000.9375,
|
||||
1000001.0 # Even though range() is exclusive, the floating point limitations mean keys end up on that position.
|
||||
]
|
||||
keyframe_points = key_object.animation_data.action.fcurves[0].keyframe_points
|
||||
for i, value in enumerate(floating_point_steps):
|
||||
key = keyframe_points[i]
|
||||
self.assertAlmostEqual(key.co.x, value)
|
||||
|
||||
# This checks that there is a key on every possible floating point value and not more than that.
|
||||
self.assertEqual(len(floating_point_steps), len(keyframe_points))
|
||||
|
||||
bpy.ops.object.delete(use_global=False)
|
||||
|
||||
|
||||
class KeyframeDeleteTest(AbstractAnimationTest, unittest.TestCase):
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
bpy.ops.wm.read_homefile()
|
||||
|
||||
def test_keyframe_deletion_basic(self):
|
||||
bpy.ops.mesh.primitive_monkey_add()
|
||||
key_count = 100
|
||||
with bpy.context.temp_override(**get_view3d_context()):
|
||||
bpy.context.scene.frame_set(-1)
|
||||
bpy.ops.anim.keyframe_insert_by_name(type="Location")
|
||||
|
||||
key_object = bpy.context.active_object
|
||||
fcu = key_object.animation_data.action.fcurves[0]
|
||||
for i in range(key_count):
|
||||
fcu.keyframe_points.insert(frame=i, value=0)
|
||||
|
||||
with bpy.context.temp_override(**get_view3d_context()):
|
||||
for frame in range(key_count):
|
||||
bpy.context.scene.frame_set(frame)
|
||||
bpy.ops.anim.keyframe_delete_by_name(type="Location")
|
||||
|
||||
# Only the key on frame -1 should be left
|
||||
self.assertEqual(len(fcu.keyframe_points), 1)
|
||||
|
||||
bpy.ops.object.delete(use_global=False)
|
||||
|
||||
def test_keyframe_deletion_high_frame_number(self):
|
||||
bpy.ops.mesh.primitive_monkey_add()
|
||||
key_count = 100
|
||||
frame_offset = 1000000
|
||||
with bpy.context.temp_override(**get_view3d_context()):
|
||||
bpy.context.scene.frame_set(-1)
|
||||
bpy.ops.anim.keyframe_insert_by_name(type="Location")
|
||||
|
||||
key_object = bpy.context.active_object
|
||||
fcu = key_object.animation_data.action.fcurves[0]
|
||||
for i in range(key_count):
|
||||
fcu.keyframe_points.insert(frame=i+frame_offset, value=0)
|
||||
|
||||
with bpy.context.temp_override(**get_view3d_context()):
|
||||
for frame in range(key_count):
|
||||
bpy.context.scene.frame_set(frame+frame_offset)
|
||||
bpy.ops.anim.keyframe_delete_by_name(type="Location")
|
||||
|
||||
# Only the key on frame -1 should be left
|
||||
self.assertEqual(len(fcu.keyframe_points), 1)
|
||||
|
||||
bpy.ops.object.delete(use_global=False)
|
||||
|
||||
def test_keyframe_deletion_subframe_basic(self):
|
||||
bpy.ops.mesh.primitive_monkey_add()
|
||||
key_count = 50
|
||||
with bpy.context.temp_override(**get_view3d_context()):
|
||||
bpy.context.scene.frame_set(-1)
|
||||
bpy.ops.anim.keyframe_insert_by_name(type="Location")
|
||||
|
||||
key_object = bpy.context.active_object
|
||||
fcu = key_object.animation_data.action.fcurves[0]
|
||||
for i in range(key_count):
|
||||
fcu.keyframe_points.insert(frame=i/key_count, value=0)
|
||||
|
||||
with bpy.context.temp_override(**get_view3d_context()):
|
||||
for frame in range(key_count):
|
||||
bpy.context.scene.frame_set(0, subframe=frame/key_count)
|
||||
bpy.ops.anim.keyframe_delete_by_name(type="Location")
|
||||
|
||||
# Only the key on frame -1 should be left
|
||||
self.assertEqual(len(fcu.keyframe_points), 1)
|
||||
|
||||
bpy.ops.object.delete(use_global=False)
|
||||
|
||||
def test_keyframe_deletion_subframe_high_frame_number(self):
|
||||
bpy.ops.mesh.primitive_monkey_add()
|
||||
key_count = 50
|
||||
frame_offset = 1000000
|
||||
with bpy.context.temp_override(**get_view3d_context()):
|
||||
bpy.context.scene.frame_set(-1)
|
||||
bpy.ops.anim.keyframe_insert_by_name(type="Location")
|
||||
|
||||
key_object = bpy.context.active_object
|
||||
fcu = key_object.animation_data.action.fcurves[0]
|
||||
for i in range(key_count):
|
||||
fcu.keyframe_points.insert(frame=i/key_count+frame_offset, value=0)
|
||||
|
||||
with bpy.context.temp_override(**get_view3d_context()):
|
||||
for frame in range(key_count):
|
||||
bpy.context.scene.frame_set(frame_offset, subframe=frame/key_count)
|
||||
bpy.ops.anim.keyframe_delete_by_name(type="Location")
|
||||
|
||||
# Only the key on frame -1 should be left
|
||||
# This works even though there are floating point precision issues,
|
||||
# because the deletion has the exact same precision as the insertion.
|
||||
# Due to that, the code calls keyframe_delete_by_name for
|
||||
# every floating point step multiple times.
|
||||
self.assertEqual(len(fcu.keyframe_points), 1)
|
||||
|
||||
bpy.ops.object.delete(use_global=False)
|
||||
|
||||
|
||||
def main():
|
||||
|
||||
Reference in New Issue
Block a user