From bab47b60cb69c500869a3339654ad7d48dddf385 Mon Sep 17 00:00:00 2001
From: Simon Lenz <Amudtogal>
Date: Wed, 12 Jan 2022 18:02:08 +0100
Subject: DNA: Add space clip editor defaults

This is my attempt of adding defaults for the space clip editor struct
(in line with https://developer.blender.org/T80164).

It adds the default allocation for `SpaceClip` and
`node_composite_movieclip.cc`. This also solves the error below (for
C++ files using the DNA_default_alloc), which was put forward by
Sergey Sharybin.

Differential Revision: https://developer.blender.org/D13367

Reviewed by: Julian Eisel
---
 source/blender/nodes/CMakeLists.txt                              | 3 +++
 source/blender/nodes/composite/CMakeLists.txt                    | 3 +++
 source/blender/nodes/composite/nodes/node_composite_movieclip.cc | 3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'source/blender/nodes')

diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index f965302be5e..957c5b78342 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -48,6 +48,9 @@ set(INC
   ../windowmanager
   ../../../intern/glew-mx
   ../../../intern/guardedalloc
+
+  # dna_type_offsets.h
+  ${CMAKE_CURRENT_BINARY_DIR}/../makesdna/intern
 )
 
 
diff --git a/source/blender/nodes/composite/CMakeLists.txt b/source/blender/nodes/composite/CMakeLists.txt
index c2d9c8a71bb..0374f913d4b 100644
--- a/source/blender/nodes/composite/CMakeLists.txt
+++ b/source/blender/nodes/composite/CMakeLists.txt
@@ -33,6 +33,9 @@ set(INC
   ../../render
   ../../windowmanager
   ../../../../intern/guardedalloc
+
+  # dna_type_offsets.h
+  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
 )
 
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_movieclip.cc b/source/blender/nodes/composite/nodes/node_composite_movieclip.cc
index 94f32ae8db4..f6f00864839 100644
--- a/source/blender/nodes/composite/nodes/node_composite_movieclip.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_movieclip.cc
@@ -23,6 +23,7 @@
 
 #include "BKE_context.h"
 #include "BKE_lib_id.h"
+#include "DNA_defaults.h"
 
 #include "RNA_access.h"
 
@@ -47,7 +48,7 @@ static void init(const bContext *C, PointerRNA *ptr)
 {
   bNode *node = (bNode *)ptr->data;
   Scene *scene = CTX_data_scene(C);
-  MovieClipUser *user = MEM_cnew<MovieClipUser>(__func__);
+  MovieClipUser *user = DNA_struct_default_alloc(MovieClipUser);
 
   node->id = (ID *)scene->clip;
   id_us_plus(node->id);
-- 
cgit v1.2.3