diff options
| -rw-r--r-- | source/blender/editors/object/object_vgroup.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_select.c | 6 | ||||
| -rw-r--r-- | tests/python/bl_blendfile_library_overrides.py | 11 |
3 files changed, 14 insertions, 5 deletions
diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 88b27bd4cea..158bc28662a 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -733,7 +733,7 @@ const EnumPropertyItem *ED_object_vgroup_selection_itemf_helper(const bContext * /* Set `Deform Bone` as default selection if armature is present. */ RNA_def_property_enum_default( - prop, BKE_modifiers_is_deformed_by_armature(ob) ? WT_VGROUP_BONE_DEFORM : WT_VGROUP_ALL); + prop, BKE_modifiers_is_deformed_by_armature(ob) ? WT_VGROUP_BONE_DEFORM : WT_VGROUP_ALL); RNA_enum_item_end(&item, &totitem); *r_free = true; diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index 3f48404053d..4aaa3aeb2ff 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -589,8 +589,10 @@ static void sequencer_select_side_of_frame(const bContext *C, const float x = UI_view2d_region_to_view_x(v2d, mval[0]); LISTBASE_FOREACH (Sequence *, seq_iter, SEQ_active_seqbase_get(ed)) { - if (((x < scene->r.cfra) && (SEQ_time_right_handle_frame_get(scene, seq_iter) <= scene->r.cfra)) || - ((x >= scene->r.cfra) && (SEQ_time_left_handle_frame_get(scene, seq_iter) >= scene->r.cfra))) { + if (((x < scene->r.cfra) && + (SEQ_time_right_handle_frame_get(scene, seq_iter) <= scene->r.cfra)) || + ((x >= scene->r.cfra) && + (SEQ_time_left_handle_frame_get(scene, seq_iter) >= scene->r.cfra))) { /* Select left or right. */ seq_iter->flag |= SELECT; recurs_sel_seq(seq_iter); diff --git a/tests/python/bl_blendfile_library_overrides.py b/tests/python/bl_blendfile_library_overrides.py index 46954c08b8c..3ba99bd61e4 100644 --- a/tests/python/bl_blendfile_library_overrides.py +++ b/tests/python/bl_blendfile_library_overrides.py @@ -230,7 +230,11 @@ class TestLibraryOverridesResync(TestHelper, unittest.TestCase): bpy.data.orphans_purge() link_dir = self.output_path / "Collection" - bpy.ops.wm.link(directory=str(link_dir), filename=TestLibraryOverridesResync.DATA_NAME_CONTAINER, instance_collections=False) + bpy.ops.wm.link( + directory=str(link_dir), + filename=TestLibraryOverridesResync.DATA_NAME_CONTAINER, + instance_collections=False, + ) linked_collection_container = bpy.data.collections[TestLibraryOverridesResync.DATA_NAME_CONTAINER] assert(linked_collection_container.library is not None) @@ -244,7 +248,10 @@ class TestLibraryOverridesResync(TestHelper, unittest.TestCase): assert(len(bpy.data.armatures) == 1) assert(all(id_.library is not None for id_ in bpy.data.armatures)) - override_collection_container = linked_collection_container.override_hierarchy_create(bpy.context.scene, bpy.context.view_layer) + override_collection_container = linked_collection_container.override_hierarchy_create( + bpy.context.scene, + bpy.context.view_layer, + ) assert(override_collection_container.library is None) assert(override_collection_container.override_library is not None) # Objects and collections are duplicated as overrides, but meshes and armatures remain only linked data. |