Merge branch 'master' into soc-2019-openxr

2 files changed, 18 insertions, 12 deletions

diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 0d87ae09943..a81bff60146 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -882,24 +882,17 @@ enum {
   MOD_MDEF_SURFACE = 1,
 };
 
-/* Is stored in ModifierData.runtime. */
-#
-#
-typedef struct ParticleSystemModifierDataRuntime {
+typedef struct ParticleSystemModifierData {
+  ModifierData modifier;
+
+  struct ParticleSystem *psys;
   /** Final Mesh - its topology may differ from orig mesh. */
   struct Mesh *mesh_final;
   /** Original mesh that particles are attached to. */
   struct Mesh *mesh_original;
   int totdmvert, totdmedge, totdmface;
-} ParticleSystemModifierDataRuntime;
-
-typedef struct ParticleSystemModifierData {
-  ModifierData modifier;
-
-  struct ParticleSystem *psys;
-  void *_pad1;
   short flag;
-  char _pad[6];
+  char _pad[2];
 } ParticleSystemModifierData;
 
 typedef enum {
diff --git a/source/blender/makesdna/DNA_movieclip_types.h b/source/blender/makesdna/DNA_movieclip_types.h
index c804a78eccb..efda24d6e0e 100644
--- a/source/blender/makesdna/DNA_movieclip_types.h
+++ b/source/blender/makesdna/DNA_movieclip_types.h
@@ -57,6 +57,17 @@ typedef struct MovieClipProxy {
   short build_tc_flag;
 } MovieClipProxy;
 
+typedef struct MovieClip_RuntimeGPUTexture {
+  void *next, *prev;
+  MovieClipUser user;
+  /** Not written in file 2 = TEXTARGET_COUNT. */
+  struct GPUTexture *gputexture[2];
+} MovieClip_RuntimeGPUTexture;
+
+typedef struct MovieClip_Runtime {
+  struct ListBase gputextures;
+} MovieClip_Runtime;
+
 typedef struct MovieClip {
   ID id;
   /** Animation data (must be immediately after id for utilities to use it). */
@@ -111,6 +122,8 @@ typedef struct MovieClip {
 
   /* color management */
   ColorManagedColorspaceSettings colorspace_settings;
+
+  struct MovieClip_Runtime runtime;
 } MovieClip;
 
 typedef struct MovieClipScopes {