Merge with trunk r38225
authorMiika Hamalainen <blender@miikah.org>
Fri, 8 Jul 2011 11:16:13 +0000 (11:16 +0000)
committerMiika Hamalainen <blender@miikah.org>
Fri, 8 Jul 2011 11:16:13 +0000 (11:16 +0000)
1  2 
source/blender/blenkernel/intern/pointcache.c
source/blender/blenlib/intern/math_geom.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_outliner/outliner.c
source/blenderplayer/bad_level_call_stubs/stubs.c

index c4308798fa70362225b85a10b4c90a774d1c5b5f,25dbb68a25872a1d38aaf789ceec5aead19ffa86..9b1d4e1a627292445702f2d21fe385002ec4689a
@@@ -33,7 -33,7 +33,8 @@@
  
  #include "MEM_guardedalloc.h"
  
 +#include "DNA_dynamicpaint_types.h"
+ #include "DNA_key_types.h"
  #include "DNA_scene_types.h"
  #include "DNA_userdef_types.h"