Cleanup: format
This commit is contained in:
parent
4fa4f5432d
commit
def4a06fc9
|
@ -960,30 +960,29 @@ class VIEW3D_HT_header(Header):
|
|||
sub.popover(panel="VIEW3D_PT_overlay", text="")
|
||||
|
||||
show_bone_overlays = (
|
||||
(object_mode == 'POSE') or
|
||||
(object_mode == 'PAINT_WEIGHT' and context.pose_object) or
|
||||
(object_mode in {'EDIT_ARMATURE', 'OBJECT'} and
|
||||
VIEW3D_PT_overlay_bones.is_using_wireframe(context))
|
||||
)
|
||||
(object_mode == 'POSE') or
|
||||
(object_mode == 'PAINT_WEIGHT' and context.pose_object) or
|
||||
(object_mode in {'EDIT_ARMATURE', 'OBJECT'} and VIEW3D_PT_overlay_bones.is_using_wireframe(context))
|
||||
)
|
||||
|
||||
if show_bone_overlays:
|
||||
sub.popover(panel="VIEW3D_PT_overlay_bones", text="", icon="POSE_HLT")
|
||||
sub.popover(panel="VIEW3D_PT_overlay_bones", text="", icon='POSE_HLT')
|
||||
elif context.mode == 'EDIT_MESH':
|
||||
sub.popover(panel="VIEW3D_PT_overlay_edit_mesh", text="", icon="EDITMODE_HLT")
|
||||
sub.popover(panel="VIEW3D_PT_overlay_edit_mesh", text="", icon='EDITMODE_HLT')
|
||||
if context.mode == 'EDIT_CURVE':
|
||||
sub.popover(panel="VIEW3D_PT_overlay_edit_curve", text="", icon="EDITMODE_HLT")
|
||||
sub.popover(panel="VIEW3D_PT_overlay_edit_curve", text="", icon='EDITMODE_HLT')
|
||||
elif context.mode == 'SCULPT' and context.sculpt_object:
|
||||
sub.popover(panel="VIEW3D_PT_overlay_sculpt", text="", icon="SCULPTMODE_HLT")
|
||||
sub.popover(panel="VIEW3D_PT_overlay_sculpt", text="", icon='SCULPTMODE_HLT')
|
||||
elif context.mode == 'SCULPT_CURVES' and context.object:
|
||||
sub.popover(panel="VIEW3D_PT_overlay_sculpt_curves", text="", icon="SCULPTMODE_HLT")
|
||||
sub.popover(panel="VIEW3D_PT_overlay_sculpt_curves", text="", icon='SCULPTMODE_HLT')
|
||||
elif context.mode == 'PAINT_WEIGHT':
|
||||
sub.popover(panel="VIEW3D_PT_overlay_weight_paint", text="", icon="WPAINT_HLT")
|
||||
sub.popover(panel="VIEW3D_PT_overlay_weight_paint", text="", icon='WPAINT_HLT')
|
||||
elif context.mode == 'PAINT_TEXTURE':
|
||||
sub.popover(panel="VIEW3D_PT_overlay_texture_paint", text="", icon="TPAINT_HLT")
|
||||
sub.popover(panel="VIEW3D_PT_overlay_texture_paint", text="", icon='TPAINT_HLT')
|
||||
elif context.mode == 'PAINT_VERTEX':
|
||||
sub.popover(panel="VIEW3D_PT_overlay_vertex_paint", text="", icon="VPAINT_HLT")
|
||||
sub.popover(panel="VIEW3D_PT_overlay_vertex_paint", text="", icon='VPAINT_HLT')
|
||||
elif context.object and context.object.type == 'GPENCIL':
|
||||
sub.popover(panel="VIEW3D_PT_overlay_gpencil_options", text="", icon="OUTLINER_DATA_GREASEPENCIL")
|
||||
sub.popover(panel="VIEW3D_PT_overlay_gpencil_options", text="", icon='OUTLINER_DATA_GREASEPENCIL')
|
||||
|
||||
row = layout.row()
|
||||
row.active = (object_mode == 'EDIT') or (shading.type in {'WIREFRAME', 'SOLID'})
|
||||
|
|
|
@ -173,7 +173,6 @@ class KeyframeInsertTest(AbstractAnimationTest, unittest.TestCase):
|
|||
super().setUp()
|
||||
bpy.ops.wm.read_homefile()
|
||||
|
||||
|
||||
def test_keyframe_insertion_basic(self):
|
||||
bpy.ops.mesh.primitive_monkey_add()
|
||||
key_count = 100
|
||||
|
@ -201,7 +200,7 @@ class KeyframeInsertTest(AbstractAnimationTest, unittest.TestCase):
|
|||
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)
|
||||
self.assertEqual(key.co.x, key_index + frame_offset)
|
||||
|
||||
bpy.ops.object.delete(use_global=False)
|
||||
|
||||
|
@ -210,13 +209,13 @@ class KeyframeInsertTest(AbstractAnimationTest, unittest.TestCase):
|
|||
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.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)
|
||||
self.assertAlmostEqual(key.co.x, key_index / key_count)
|
||||
|
||||
bpy.ops.object.delete(use_global=False)
|
||||
|
||||
|
@ -226,7 +225,7 @@ class KeyframeInsertTest(AbstractAnimationTest, unittest.TestCase):
|
|||
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.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
|
||||
|
@ -248,7 +247,8 @@ class KeyframeInsertTest(AbstractAnimationTest, unittest.TestCase):
|
|||
1000000.8125,
|
||||
1000000.875,
|
||||
1000000.9375,
|
||||
1000001.0 # Even though range() is exclusive, the floating point limitations mean keys end up on that position.
|
||||
# Even though range() is exclusive, the floating point limitations mean keys end up on that position.
|
||||
1000001.0
|
||||
]
|
||||
keyframe_points = key_object.animation_data.action.fcurves[0].keyframe_points
|
||||
for i, value in enumerate(floating_point_steps):
|
||||
|
@ -299,11 +299,11 @@ class KeyframeDeleteTest(AbstractAnimationTest, unittest.TestCase):
|
|||
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)
|
||||
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.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
|
||||
|
@ -321,11 +321,11 @@ class KeyframeDeleteTest(AbstractAnimationTest, unittest.TestCase):
|
|||
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)
|
||||
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.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
|
||||
|
@ -344,11 +344,11 @@ class KeyframeDeleteTest(AbstractAnimationTest, unittest.TestCase):
|
|||
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)
|
||||
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.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
|
||||
|
|
Loading…
Reference in New Issue