Merging r59083 through r59103 from trunk into soc-2013-depsgraph_mt
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 13 Aug 2013 07:37:13 +0000 (07:37 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 13 Aug 2013 07:37:13 +0000 (07:37 +0000)
commit64bc5da4bad55eaa0297bbd45395b0807c7735cd
treea3b675e8b9732490aad39e27637f8c8c11bb180d
parent6366a8c61132eb034975606ebbc9a7ffcd0b353f
parent5b64b661273a1a015030e02f96e5b18f8a3d73db
Merging r59083 through r59103 from trunk into soc-2013-depsgraph_mt
source/blender/blenkernel/intern/armature.c
source/blender/blenkernel/intern/object.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/render/intern/source/convertblender.c