svn merge -r37700:37800 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Mon, 25 Jul 2011 14:34:36 +0000 (14:34 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 25 Jul 2011 14:34:36 +0000 (14:34 +0000)
commit2dc6b8f835b87480a9451c91e684271a55554006
treeb1f5ff4f5bebaca29702ed55373115d22da83ce9
parenta7815053eff706f8c08ca774ed3dcddc884bb504
parenta03707d408b9e37cd11124c93b1516eae9522139
svn merge -r37700:37800 https://svn.blender.org/svnroot/bf-blender/trunk/blender
26 files changed:
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/bvhutils.c
source/blender/blenkernel/intern/particle.c
source/blender/blenlib/BLI_callbacks.h
source/blender/blenlib/BLI_math_color.h
source/blender/blenlib/CMakeLists.txt
source/blender/blenlib/intern/callbacks.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/bpy_app_handlers.c
source/blender/python/intern/bpy_app_handlers.h
source/blender/render/intern/source/convertblender.c
source/blender/windowmanager/intern/wm_init_exit.c
source/creator/CMakeLists.txt
source/creator/creator.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp