svn merge -r39792:39829 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Thu, 1 Sep 2011 00:56:21 +0000 (00:56 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 1 Sep 2011 00:56:21 +0000 (00:56 +0000)
1  2 
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/collision.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenlib/BLI_callbacks.h
source/blender/blenloader/intern/readfile.c
source/blender/editors/object/object_add.c
source/blender/editors/space_view3d/drawobject.c
source/blender/python/intern/bpy_app_handlers.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp

index 62f269d775e7f35b987d8fdd18024d1d265d1605,e1ea6e419d3d0df2c5e39b7550ee57c0b7cd97bc..8bb783abb807dda26d79f80f087f603967853bed
@@@ -68,8 -69,8 +68,9 @@@
  #include "BLI_listbase.h"
  #include "BLI_threads.h"
  #include "BLI_storage.h" /* For _LARGEFILE64_SOURCE;  zlib needs this on some systems */
+ #include "BLI_string.h"
  #include "BLI_utildefines.h"
 +#include "BLI_edgehash.h"
  
  #include "BKE_main.h"
  #include "BKE_animsys.h"