Merging r58125 through r58143 from trunk into soc-2013-depsgraph_mt
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 10 Jul 2013 09:13:45 +0000 (09:13 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 10 Jul 2013 09:13:45 +0000 (09:13 +0000)
1  2 
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/object/object_add.c
source/blender/editors/render/render_internal.c
source/blender/editors/space_view3d/drawobject.c