Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <julian@blender.org>2020-08-07 14:04:31 +0300
committerJulian Eisel <julian@blender.org>2020-08-07 14:04:31 +0300
commit0d2d4a6d4a75ac38c41f872c88255eab70e88ab7 (patch)
treeb7a7518af86dddba48e05a98b3c2be55e8804721 /source/blender/makesdna/DNA_sequence_types.h
parent9b416c66fb714bdfd15a481489dbf650d0f389ea (diff)
parentcfc6f9eb18e701f5be601b95c45004e8cf7fbc81 (diff)
Merge branch 'master' into temp-ui-button-type-refactortemp-ui-button-type-refactor
Diffstat (limited to 'source/blender/makesdna/DNA_sequence_types.h')
-rw-r--r--source/blender/makesdna/DNA_sequence_types.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h
index 9fee839f979..850b906af39 100644
--- a/source/blender/makesdna/DNA_sequence_types.h
+++ b/source/blender/makesdna/DNA_sequence_types.h
@@ -28,12 +28,12 @@
* - Meta Strip (SEQ_TYPE_META): Support for nesting Sequences.
*/
-#ifndef __DNA_SEQUENCE_TYPES_H__
-#define __DNA_SEQUENCE_TYPES_H__
+#pragma once
#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 +119,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 +241,7 @@ typedef struct Sequence {
int cache_flag;
int _pad2[3];
- struct Sequence *orig_sequence;
- void *_pad3;
+ SequenceRuntime runtime;
} Sequence;
typedef struct MetaStack {
@@ -692,5 +695,3 @@ enum {
#ifdef __cplusplus
}
#endif
-
-#endif /* __DNA_SEQUENCE_TYPES_H__ */