Merged changes in the trunk up to revision 42116.
[blender.git] / source / blender / makesdna / intern / makesdna.c
index 22df8e8d1c72920f01331527bec08c909407cf6d..6d96f423afb372f6911dcab747cb975d789ba960 100644 (file)
@@ -64,7 +64,7 @@
 
 /* Included the path relative from /source/blender/ here, so we can move     */
 /* headers around with more freedom.                                         */
-const char *includefiles[] = {
+static const char *includefiles[] = {
 
        // if you add files here, please add them at the end
        // of makesdna.c (this file) as well
@@ -131,7 +131,11 @@ const char *includefiles[] = {
        "DNA_boid_types.h",
        "DNA_smoke_types.h",
        "DNA_speaker_types.h",
+       "DNA_movieclip_types.h",
+       "DNA_tracking_types.h",
        "DNA_dynamicpaint_types.h",
+       "DNA_freestyle_types.h",
+       "DNA_linestyle_types.h",
 
        // empty string to indicate end of includefiles
        ""
@@ -146,9 +150,9 @@ static char **types, *typedata;             /* at address types[a] is string a */
 static short *typelens;                                /* at typelens[a] is de length of type a */
 static short *alphalens;                       /* contains sizes as they are calculated on the DEC Alpha (64 bits), infact any 64bit system */
 static short **structs, *structdata;/* at sp= structs[a] is the first address of a struct definition
-                                                                      sp[0] is type number
-                                                                  sp[1] is amount of elements
-                                                                  sp[2] sp[3] is typenr,  namenr (etc) */
+                                       sp[0] is type number
+                                       sp[1] is amount of elements
+                                       sp[2] sp[3] is typenr,  namenr (etc) */
 /**
  * Variable to control debug output of makesdna.
  * debugSDNA:
@@ -222,7 +226,7 @@ void printStructLenghts(void);
 
 /* ************************* MAKEN DNA ********************** */
 
-int add_type(const char *str, int len)
+static int add_type(const char *str, int len)
 {
        int nr;
        char *cp;
@@ -397,7 +401,7 @@ static int add_name(const char *str)
        return nr_names-1;
 }
 
-short *add_struct(int namecode)
+static short *add_struct(int namecode)
 {
        int len;
        short *sp;
@@ -520,7 +524,7 @@ static void *read_file_data(char *filename, int *len_r)
        return data;
 }
 
-int convert_include(char *filename)
+static int convert_include(char *filename)
 {
        /* read include file, skip structs with a '#' before it.
           store all data in temporal arrays.
@@ -657,7 +661,7 @@ int convert_include(char *filename)
        return 0;
 }
 
-int arraysize(char *astr, int len)
+static int arraysize(char *astr, int len)
 {
        int a, mul=1;
        char str[100], *cp=NULL;
@@ -1197,5 +1201,9 @@ int main(int argc, char ** argv)
 #include "DNA_boid_types.h"
 #include "DNA_smoke_types.h"
 #include "DNA_speaker_types.h"
+#include "DNA_movieclip_types.h"
+#include "DNA_tracking_types.h"
 #include "DNA_dynamicpaint_types.h"
+#include "DNA_freestyle_types.h"
+#include "DNA_linestyle_types.h"
 /* end of list */