diff options
author | Joerg Mueller <nexyon@gmail.com> | 2010-08-05 12:23:26 +0400 |
---|---|---|
committer | Joerg Mueller <nexyon@gmail.com> | 2010-08-05 12:23:26 +0400 |
commit | 06d2dc86a171d93d870db0858d30966ff8ad3e3b (patch) | |
tree | e416fb3afb185faa2435b5775bbcbfde34dc7590 /source/blender/makesdna/intern/makesdna.c | |
parent | 239477dcf7933dc3ce42dd461a5e2fd580e92b37 (diff) | |
parent | a0cece42c646df39c858223b0361b7dfe0d44dd8 (diff) |
svn merge -r 30954:31059 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/makesdna/intern/makesdna.c')
-rw-r--r-- | source/blender/makesdna/intern/makesdna.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index 15ac26273af..4133afffeed 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -78,7 +78,6 @@ char *includefiles[] = { "DNA_image_types.h", "DNA_texture_types.h", "DNA_lamp_types.h", - "DNA_wave_types.h", "DNA_material_types.h", "DNA_vfont_types.h", // if you add files here, please add them at the end @@ -1128,7 +1127,6 @@ int main(int argc, char ** argv) #include "DNA_image_types.h" #include "DNA_texture_types.h" #include "DNA_lamp_types.h" -#include "DNA_wave_types.h" #include "DNA_material_types.h" #include "DNA_vfont_types.h" #include "DNA_meta_types.h" |