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)
commitfb3f7d95664dd71a545061ddf8d75726ff423c10
tree49fa13b4c511d05070ad7f359f2b646ba33dbb09
parent9bc92b21468f1d0fee77e7aac34145f3f0345dfc
parent22676a434efdb99e38535b2f4a2623ea670ebf4d
svn merge -r39792:39829 https://svn.blender.org/svnroot/bf-blender/trunk/blender
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