[Bf-blender-cvs] [e2e75128257] temp-T78835: Make sure sequence's UUID is always initialized on read

Sergey Sharybin noreply at git.blender.org
Thu Jul 30 16:41:03 CEST 2020


Commit: e2e75128257c0055b576da8aae29bf710e660ed0
Author: Sergey Sharybin
Date:   Thu Jul 30 16:37:03 2020 +0200
Branches: temp-T78835
https://developer.blender.org/rBe2e75128257c0055b576da8aae29bf710e660ed0

Make sure sequence's UUID is always initialized on read

Previously it would only be assigned if sequence has strip, which
might not be the case if, for example, .blend file is from the future.

This change also makes it possible to use UUID in other functions
involved in reading, like BKE_sequencer_proxy_set().

===================================================================

M	source/blender/blenloader/intern/readfile.c

===================================================================

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index f127a2ba9d8..20362b66392 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -6461,6 +6461,8 @@ static void direct_link_scene(BlendDataReader *reader, Scene *sce)
     link_recurs_seq(reader, &ed->seqbase);
 
     SEQ_BEGIN (ed, seq) {
+      BKE_sequence_session_uuid_generate(seq);
+
       BLO_read_data_address(reader, &seq->seq1);
       BLO_read_data_address(reader, &seq->seq2);
       BLO_read_data_address(reader, &seq->seq3);
@@ -6514,8 +6516,6 @@ static void direct_link_scene(BlendDataReader *reader, Scene *sce)
           BKE_sequencer_proxy_set(seq, true);
         }
 
-        BKE_sequence_session_uuid_generate(seq);
-
         /* need to load color balance to it could be converted to modifier */
         BLO_read_data_address(reader, &seq->strip->color_balance);
       }



More information about the Bf-blender-cvs mailing list