Merge branch 'blender2.7'
[blender.git] / source / blender / makesdna / intern / makesdna.c
index cf39fb6..a2c2118 100644 (file)
@@ -100,12 +100,8 @@ 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_collection_types.h",
        "DNA_armature_types.h",
        "DNA_action_types.h",
        "DNA_constraint_types.h",
@@ -117,6 +113,8 @@ static const char *includefiles[] = {
        "DNA_particle_types.h",
        "DNA_cloth_types.h",
        "DNA_gpencil_types.h",
+       "DNA_gpencil_modifier_types.h",
+       "DNA_shader_fx_types.h",
        "DNA_windowmanager_types.h",
        "DNA_anim_types.h",
        "DNA_boid_types.h",
@@ -130,6 +128,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 +506,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++;
@@ -1315,12 +1328,8 @@ 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_collection_types.h"
 #include "DNA_armature_types.h"
 #include "DNA_action_types.h"
 #include "DNA_constraint_types.h"
@@ -1332,6 +1341,8 @@ int main(int argc, char **argv)
 #include "DNA_particle_types.h"
 #include "DNA_cloth_types.h"
 #include "DNA_gpencil_types.h"
+#include "DNA_gpencil_modifier_types.h"
+#include "DNA_shader_fx_types.h"
 #include "DNA_windowmanager_types.h"
 #include "DNA_anim_types.h"
 #include "DNA_boid_types.h"
@@ -1345,4 +1356,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 */