Merging r39634 through r39716 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 26 Aug 2011 20:12:54 +0000 (20:12 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 26 Aug 2011 20:12:54 +0000 (20:12 +0000)
commit7b692533ae3b17a2c6372d00b268a25db8d575e8
tree539c5f7284514564cb21e198ac98c6b610939e60
parent59d2fe3d7877dfb6a8262c301044ef1a4bf0a1c0
parenta9dea3afe9ca590e3d2d6788066d52dab3fd872c
Merging r39634 through r39716 from trunk into soc-2011-tomato
17 files changed:
CMakeLists.txt
build_files/scons/config/darwin-config.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/interface_draw.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/makesdna/DNA_space_types.h
source/blender/makesdna/DNA_view3d_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/windowmanager/intern/wm_operators.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp