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

fix: ignore strobe default value

Browse Source
This commit is contained in:
Swann
2020-11-04 22:55:17 +01:00
parent c00a7184ff
commit db4e495183
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
multi_user/bl_types/bl_datablock.py
View File

@ -127,7 +127,10 @@ class BlDatablock(ReplicatedDatablock):
if instance and hasattr(instance, 'uuid'): if instance and hasattr(instance, 'uuid'):
instance.uuid = self.uuid instance.uuid = self.uuid
self.diff_method = DIFF_BINARY if logging.getLogger().level == logging.DEBUG:
self.diff_method = DIFF_JSON
else:
self.diff_method = DIFF_BINARY
def resolve(self): def resolve(self):
datablock_ref = None datablock_ref = None

3
multi_user/bl_types/bl_sequencer.py
View File

@ -32,6 +32,7 @@ def dump_sequence(sequence: bpy.types.Sequence) -> dict:
'select', 'select',
'select_left_handle', 'select_left_handle',
'select_right_handle', 'select_right_handle',
'strobe'
] ]
dumper.depth = 1 dumper.depth = 1
data = dumper.dump(sequence) data = dumper.dump(sequence)
@ -83,7 +84,7 @@ def load_sequence(sequence_data: dict, sequence_editor: bpy.types.SequenceEditor
seq = {} seq = {}
for i in range(sequence_data['input_count']): for i in range(sequence_data['input_count']):
seq[f"seq{i}"] = sequence_editor.sequences_all.get(sequence_data.get("input_{i}", None)) seq[f"seq{i+1}"] = sequence_editor.sequences_all.get(sequence_data.get(f"input_{i+1}", None))
sequence = sequence_editor.sequences.new_effect(name=strip_name, sequence = sequence_editor.sequences.new_effect(name=strip_name,
type=strip_type, type=strip_type,