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)
1  2 
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