Merged changes in the trunk up to revision 54110.
[blender.git] / source / blender / makesdna / intern / makesdna.c
index 31ff0ffa8feee8df807c4508399d55956ccaf71b..dd65ce53b9203580240640910aeae7d3b285b7e2 100644 (file)
@@ -134,6 +134,10 @@ static const char *includefiles[] = {
        "DNA_dynamicpaint_types.h",
        "DNA_mask_types.h",
        "DNA_rigidbody_types.h",
+/* #ifdef WITH_FREESTYLE */
+       "DNA_freestyle_types.h",
+       "DNA_linestyle_types.h",
+/* #endif */
 
        /* empty string to indicate end of includefiles */
        ""
@@ -1264,4 +1268,8 @@ int main(int argc, char **argv)
 #include "DNA_dynamicpaint_types.h"
 #include "DNA_mask_types.h"
 #include "DNA_rigidbody_types.h"
+/* #ifdef WITH_FREESTYLE */
+#include "DNA_freestyle_types.h"
+#include "DNA_linestyle_types.h"
+/* #endif */
 /* end of list */