Objects: add Volume object type, and prototypes for Hair and PointCloud

Only the volume object is exposed in the user interface. It is based on OpenVDB
internally. Drawing and rendering code will follow in another commit.
https://wiki.blender.org/wiki/Source/Objects/Volume
https://wiki.blender.org/wiki/Reference/Release_Notes/2.83/Volumes

Hair and PointCloud object types are hidden behind a WITH_NEW_OBJECT_TYPES
build option. These are unfinished, and included only to make it easier to
cooperate on development in the future and avoid tricky merges.
https://wiki.blender.org/wiki/Source/Objects/New_Object_Types

Ref T73201, T68981

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

3 files changed, 33 insertions, 0 deletions

diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt
index 799ec931d57..f8f765c6ece 100644
--- a/source/blender/makesdna/intern/CMakeLists.txt
+++ b/source/blender/makesdna/intern/CMakeLists.txt
@@ -135,6 +135,7 @@ set(SRC
   ../DNA_curve_defaults.h
   ../DNA_defaults.h
   ../DNA_image_defaults.h
+  ../DNA_hair_defaults.h
   ../DNA_lattice_defaults.h
   ../DNA_light_defaults.h
   ../DNA_lightprobe_defaults.h
@@ -143,11 +144,13 @@ set(SRC
   ../DNA_mesh_defaults.h
   ../DNA_meta_defaults.h
   ../DNA_object_defaults.h
+  ../DNA_pointcloud_defaults.h
   ../DNA_scene_defaults.h
   ../DNA_speaker_defaults.h
   ../DNA_texture_defaults.h
   ../DNA_vec_defaults.h
   ../DNA_view3d_defaults.h
+  ../DNA_volume_defaults.h
   ../DNA_world_defaults.h
 )
 
diff --git a/source/blender/makesdna/intern/dna_defaults.c b/source/blender/makesdna/intern/dna_defaults.c
index 260f1cd20f6..a8be435b902 100644
--- a/source/blender/makesdna/intern/dna_defaults.c
+++ b/source/blender/makesdna/intern/dna_defaults.c
@@ -59,6 +59,7 @@
 #include "DNA_camera_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_image_types.h"
+#include "DNA_hair_types.h"
 #include "DNA_key_types.h"
 #include "DNA_lattice_types.h"
 #include "DNA_light_types.h"
@@ -68,10 +69,12 @@
 #include "DNA_mesh_types.h"
 #include "DNA_meta_types.h"
 #include "DNA_object_types.h"
+#include "DNA_pointcloud_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_space_types.h"
 #include "DNA_speaker_types.h"
 #include "DNA_texture_types.h"
+#include "DNA_volume_types.h"
 #include "DNA_world_types.h"
 
 #include "DNA_brush_defaults.h"
@@ -79,6 +82,7 @@
 #include "DNA_camera_defaults.h"
 #include "DNA_curve_defaults.h"
 #include "DNA_image_defaults.h"
+#include "DNA_hair_defaults.h"
 #include "DNA_lattice_defaults.h"
 #include "DNA_light_defaults.h"
 #include "DNA_lightprobe_defaults.h"
@@ -87,9 +91,11 @@
 #include "DNA_mesh_defaults.h"
 #include "DNA_meta_defaults.h"
 #include "DNA_object_defaults.h"
+#include "DNA_pointcloud_defaults.h"
 #include "DNA_scene_defaults.h"
 #include "DNA_speaker_defaults.h"
 #include "DNA_texture_defaults.h"
+#include "DNA_volume_defaults.h"
 #include "DNA_world_defaults.h"
 
 #define SDNA_DEFAULT_DECL_STRUCT(struct_name) \
@@ -110,6 +116,9 @@ SDNA_DEFAULT_DECL_STRUCT(Curve);
 /* DNA_image_defaults.h */
 SDNA_DEFAULT_DECL_STRUCT(Image);
 
+/* DNA_hair_defaults.h */
+SDNA_DEFAULT_DECL_STRUCT(Hair);
+
 /* DNA_lattice_defaults.h */
 SDNA_DEFAULT_DECL_STRUCT(Lattice);
 
@@ -134,6 +143,9 @@ SDNA_DEFAULT_DECL_STRUCT(MetaBall);
 /* DNA_object_defaults.h */
 SDNA_DEFAULT_DECL_STRUCT(Object);
 
+/* DNA_pointcloud_defaults.h */
+SDNA_DEFAULT_DECL_STRUCT(PointCloud);
+
 /* DNA_scene_defaults.h */
 SDNA_DEFAULT_DECL_STRUCT(Scene);
 SDNA_DEFAULT_DECL_STRUCT(ToolSettings);
@@ -147,6 +159,9 @@ SDNA_DEFAULT_DECL_STRUCT(Tex);
 /* DNA_view3d_defaults.h */
 SDNA_DEFAULT_DECL_STRUCT(View3D);
 
+/* DNA_volume_defaults.h */
+SDNA_DEFAULT_DECL_STRUCT(Volume);
+
 /* DNA_world_defaults.h */
 SDNA_DEFAULT_DECL_STRUCT(World);
 
@@ -194,6 +209,9 @@ const void *DNA_default_table[SDNA_TYPE_MAX] = {
     /* DNA_image_defaults.h */
     SDNA_DEFAULT_DECL(Image),
 
+    /* DNA_hair_defaults.h */
+    SDNA_DEFAULT_DECL(Hair),
+
     /* DNA_lattice_defaults.h */
     SDNA_DEFAULT_DECL(Lattice),
 
@@ -218,6 +236,9 @@ const void *DNA_default_table[SDNA_TYPE_MAX] = {
     /* DNA_object_defaults.h */
     SDNA_DEFAULT_DECL(Object),
 
+    /* DNA_pointcloud_defaults.h */
+    SDNA_DEFAULT_DECL(PointCloud),
+
     /* DNA_scene_defaults.h */
     SDNA_DEFAULT_DECL(Scene),
     SDNA_DEFAULT_DECL_EX(RenderData, Scene.r),
@@ -259,6 +280,9 @@ const void *DNA_default_table[SDNA_TYPE_MAX] = {
     SDNA_DEFAULT_DECL_EX(View3DShading, View3D.shading),
     SDNA_DEFAULT_DECL_EX(View3DCursor, Scene.cursor),
 
+    /* DNA_volume_defaults.h */
+    SDNA_DEFAULT_DECL(Volume),
+
     /* DNA_world_defaults.h */
     SDNA_DEFAULT_DECL(World),
 };
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index a33f13be09a..3d82df79e4c 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -133,6 +133,9 @@ static const char *includefiles[] = {
     "DNA_lightprobe_types.h",
     "DNA_curveprofile_types.h",
     "DNA_xr_types.h",
+    "DNA_hair_types.h",
+    "DNA_pointcloud_types.h",
+    "DNA_volume_types.h",
 
     /* see comment above before editing! */
 
@@ -1600,6 +1603,9 @@ int main(int argc, char **argv)
 #include "DNA_lightprobe_types.h"
 #include "DNA_curveprofile_types.h"
 #include "DNA_xr_types.h"
+#include "DNA_hair_types.h"
+#include "DNA_pointcloud_types.h"
+#include "DNA_volume_types.h"
 
 /* end of list */