diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-09-01 04:35:30 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-01 04:35:30 +0400 |
commit | 9bc92b21468f1d0fee77e7aac34145f3f0345dfc (patch) | |
tree | 797b4129bde154892f6c0c2ecdc9320688d26a7b /source/blender/makesdna/intern | |
parent | 4593e2e4108f19475d0b988ae141f04e6a4abfc0 (diff) | |
parent | 9424b1ceff992f420fe6315acabfb7138cd0026e (diff) |
svn merge -r39781:39792 https://svn.blender.org/svnroot/bf-blender/trunk/blender, merge pepper, manually merged source/blender/editors/transform/transform_generics.c
Diffstat (limited to 'source/blender/makesdna/intern')
-rw-r--r-- | source/blender/makesdna/intern/makesdna.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index 3e5e7bbdc0e..694b403c7c5 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -132,6 +132,7 @@ const char *includefiles[] = { "DNA_anim_types.h", "DNA_boid_types.h", "DNA_smoke_types.h", + "DNA_speaker_types.h", // empty string to indicate end of includefiles "" @@ -1196,4 +1197,5 @@ int main(int argc, char ** argv) #include "DNA_anim_types.h" #include "DNA_boid_types.h" #include "DNA_smoke_types.h" +#include "DNA_speaker_types.h" /* end of list */ |