Merge branch 'master' into blender2.8
[blender.git] / source / blender / makesdna / intern / makesdna.c
index a5f474b93bfbbcbf814dc28716709ac00380e2c1..c1f8341ddc698b1556e573e354fed96bb3079f05 100644 (file)
@@ -100,10 +100,6 @@ static const char *includefiles[] = {
        "DNA_sequence_types.h",
        "DNA_effect_types.h",
        "DNA_outliner_types.h",
-       "DNA_property_types.h",
-       "DNA_sensor_types.h",
-       "DNA_controller_types.h",
-       "DNA_actuator_types.h",
        "DNA_sound_types.h",
        "DNA_group_types.h",
        "DNA_armature_types.h",
@@ -130,6 +126,10 @@ static const char *includefiles[] = {
        "DNA_freestyle_types.h",
        "DNA_linestyle_types.h",
        "DNA_cachefile_types.h",
+       "DNA_layer_types.h",
+       "DNA_workspace_types.h",
+       "DNA_lightprobe_types.h",
+
        /* see comment above before editing! */
 
        /* empty string to indicate end of includefiles */
@@ -504,6 +504,17 @@ static int preprocess_include(char *maindata, int len)
                        a -= 13;
                        cp += 13;
                }
+               else if (strncmp("DNA_PRIVATE_WORKSPACE", cp, 21) == 0) {
+                       /* Check for DNA_PRIVATE_WORKSPACE_READ_WRITE */
+                       if (strncmp("_READ_WRITE", cp + 21, 11) == 0) {
+                               a -= 31;
+                               cp += 31;
+                       }
+                       else {
+                               a -= 20;
+                               cp += 20;
+                       }
+               }
                else {
                        md[0] = cp[0];
                        md++;
@@ -1313,10 +1324,6 @@ int main(int argc, char **argv)
 #include "DNA_sequence_types.h"
 #include "DNA_effect_types.h"
 #include "DNA_outliner_types.h"
-#include "DNA_property_types.h"
-#include "DNA_sensor_types.h"
-#include "DNA_controller_types.h"
-#include "DNA_actuator_types.h"
 #include "DNA_sound_types.h"
 #include "DNA_group_types.h"
 #include "DNA_armature_types.h"
@@ -1343,4 +1350,8 @@ int main(int argc, char **argv)
 #include "DNA_freestyle_types.h"
 #include "DNA_linestyle_types.h"
 #include "DNA_cachefile_types.h"
+#include "DNA_layer_types.h"
+#include "DNA_workspace_types.h"
+#include "DNA_lightprobe_types.h"
+
 /* end of list */