Backups/multi-user
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean: removed logs

Browse Source
This commit is contained in:
Swann
2021-01-29 11:39:00 +01:00
parent 0325e9d0bd
commit c855b5a424
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
multi_user/bl_types/bl_scene.py
View File

@ -24,7 +24,7 @@ import mathutils
from deepdiff import DeepDiff from deepdiff import DeepDiff
from replication.constants import DIFF_JSON, MODIFIED from replication.constants import DIFF_JSON, MODIFIED
from ..utils import flush_history, current_milli_time from ..utils import flush_history
from .bl_collection import (dump_collection_children, dump_collection_objects, from .bl_collection import (dump_collection_children, dump_collection_objects,
load_collection_childrens, load_collection_objects, load_collection_childrens, load_collection_objects,
resolve_collection_dependencies) resolve_collection_dependencies)
@ -310,7 +310,6 @@ def load_sequence(sequence_data: dict, sequence_editor: bpy.types.SequenceEditor
:arg sequence_editor: root sequence editor :arg sequence_editor: root sequence editor
:type sequence_editor: bpy.types.SequenceEditor :type sequence_editor: bpy.types.SequenceEditor
""" """
start = current_milli_time()
strip_type = sequence_data.get('type') strip_type = sequence_data.get('type')
strip_name = sequence_data.get('name') strip_name = sequence_data.get('name')
strip_channel = sequence_data.get('channel') strip_channel = sequence_data.get('channel')
@ -362,10 +361,10 @@ def load_sequence(sequence_data: dict, sequence_editor: bpy.types.SequenceEditor
**seq) **seq)
loader = Loader() loader = Loader()
# TODO: Support filepath updates
loader.exclure_filter = ['filepath', 'sound', 'filenames','fps'] loader.exclure_filter = ['filepath', 'sound', 'filenames','fps']
loader.load(sequence, sequence_data) loader.load(sequence, sequence_data)
sequence.select = False sequence.select = False
logging.info(f"loading {strip_name} took {current_milli_time()-start} ms")
class BlScene(BlDatablock): class BlScene(BlDatablock):
@ -430,12 +429,15 @@ class BlScene(BlDatablock):
# Create sequencer data # Create sequencer data
target.sequence_editor_create() target.sequence_editor_create()
vse = target.sequence_editor vse = target.sequence_editor
# Clear removed sequences
for seq in vse.sequences_all: for seq in vse.sequences_all:
if seq.name not in sequences: if seq.name not in sequences:
vse.sequences.remove(seq) vse.sequences.remove(seq)
# Load existing sequences
for seq_name, seq_data in sequences.items(): for seq_name, seq_data in sequences.items():
load_sequence(seq_data, vse) load_sequence(seq_data, vse)
# If the sequence is no longer used, clear it
elif target.sequence_editor and not sequences: elif target.sequence_editor and not sequences:
target.sequence_editor_clear() target.sequence_editor_clear()