Merging r38516 through r38561 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 21 Jul 2011 15:04:41 +0000 (15:04 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 21 Jul 2011 15:04:41 +0000 (15:04 +0000)
commit0de7e49a10964aa539274678136c45e16aee230e
tree3f23545d659402482b48a6bcd928265545a78c9f
parenta48039507f6dc71c67b99a7343a718430ead2432
parent3e9d1d7683c7d7bf2386c73048808bacd238d550
Merging r38516 through r38561 from trunk into soc-2011-tomato
build_files/scons/tools/Blender.py
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_intern.h