Merging r41564 through r41596 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 6 Nov 2011 18:38:20 +0000 (18:38 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 6 Nov 2011 18:38:20 +0000 (18:38 +0000)
commitafe399d84f475834440dd592026bfb70c237cf8a
tree30de16546e8a92c5dc925726ae9c94ecc8633da1
parent8c461466f370be489c070d3b6c378d33451e0083
parent85540d5aa7abb487e546b5483fffeef2e6075af5
Merging r41564 through r41596 from trunk into soc-2011-tomato
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/makesdna/DNA_scene_types.h