archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: format

Browse Source
This commit is contained in:
Campbell Barton
2022-07-05 14:32:53 +10:00
parent 9145a4d08f
commit 8c33a53b17
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/space_sequencer/sequencer_select.c
View File

@@ -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]); const float x = UI_view2d_region_to_view_x(v2d, mval[0]);
LISTBASE_FOREACH (Sequence *, seq_iter, SEQ_active_seqbase_get(ed)) { 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)) || if (((x < scene->r.cfra) &&
((x >= scene->r.cfra) && (SEQ_time_left_handle_frame_get(scene, seq_iter) >= 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. */ /* Select left or right. */
seq_iter->flag |= SELECT; seq_iter->flag |= SELECT;
recurs_sel_seq(seq_iter); recurs_sel_seq(seq_iter);

11
tests/python/bl_blendfile_library_overrides.py
View File

@@ -230,7 +230,11 @@ class TestLibraryOverridesResync(TestHelper, unittest.TestCase):
bpy.data.orphans_purge() bpy.data.orphans_purge()
link_dir = self.output_path / "Collection" 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] linked_collection_container = bpy.data.collections[TestLibraryOverridesResync.DATA_NAME_CONTAINER]
assert(linked_collection_container.library is not None) assert(linked_collection_container.library is not None)
@@ -244,7 +248,10 @@ class TestLibraryOverridesResync(TestHelper, unittest.TestCase):
assert(len(bpy.data.armatures) == 1) assert(len(bpy.data.armatures) == 1)
assert(all(id_.library is not None for id_ in bpy.data.armatures)) 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.library is None)
assert(override_collection_container.override_library is not 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. # Objects and collections are duplicated as overrides, but meshes and armatures remain only linked data.