Merge branch 'blender-v2.90-release'

3 files changed, 54 insertions, 2 deletions

diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h
index 9fee839f979..0ede03e80e2 100644
--- a/source/blender/makesdna/DNA_sequence_types.h
+++ b/source/blender/makesdna/DNA_sequence_types.h
@@ -34,6 +34,7 @@
 #include "DNA_color_types.h"
 #include "DNA_defs.h"
 #include "DNA_listBase.h"
+#include "DNA_session_uuid_types.h"
 #include "DNA_vec_types.h"
 #include "DNA_vfont_types.h"
 
@@ -119,6 +120,10 @@ typedef struct Strip {
   ColorManagedColorspaceSettings colorspace_settings;
 } Strip;
 
+typedef struct SequenceRuntime {
+  SessionUUID session_uuid;
+} SequenceRuntime;
+
 /**
  * The sequence structure is the basic struct used by any strip.
  * each of the strips uses a different sequence structure.
@@ -237,8 +242,7 @@ typedef struct Sequence {
   int cache_flag;
   int _pad2[3];
 
-  struct Sequence *orig_sequence;
-  void *_pad3;
+  SequenceRuntime runtime;
 } Sequence;
 
 typedef struct MetaStack {
diff --git a/source/blender/makesdna/DNA_session_uuid_types.h b/source/blender/makesdna/DNA_session_uuid_types.h
new file mode 100644
index 00000000000..d2ec0eb3de1
--- /dev/null
+++ b/source/blender/makesdna/DNA_session_uuid_types.h
@@ -0,0 +1,46 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+/** \file
+ * \ingroup DNA
+ */
+
+#ifndef __DNA_SESSION_UUID_TYPES_H__
+#define __DNA_SESSION_UUID_TYPES_H__
+
+#include "BLI_sys_types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Is a structure because of the following considerations:
+ *
+ * - It is not possible to use custom types in DNA members: makesdna does not recognize them.
+ * - It allows to add more bits, more than standard fixed-size types can store. For example, if
+ *   we ever need to go 128 bits, it is as simple as adding extra 64bit field.
+ */
+typedef struct SessionUUID {
+  /* Never access directly, as it might cause a headache when more bits are needed: if the field
+   * is used directly it will not be easy to find all places where partial access is used. */
+  uint64_t uuid_;
+} SessionUUID;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __DNA_SESSION_UUID_TYPES_H__ */
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index 48258f39604..826fc53dce4 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -98,6 +98,7 @@ static const char *includefiles[] = {
     "DNA_sdna_types.h",
     "DNA_fileglobal_types.h",
     "DNA_sequence_types.h",
+    "DNA_session_uuid_types.h",
     "DNA_effect_types.h",
     "DNA_outliner_types.h",
     "DNA_sound_types.h",
@@ -1547,6 +1548,7 @@ int main(int argc, char **argv)
 #  pragma GCC poison int8_t
 #endif
 
+#include "DNA_session_uuid_types.h"
 #include "DNA_ID.h"
 #include "DNA_action_types.h"
 #include "DNA_anim_types.h"