Merging r59182 through r59257 from trunk into soc-2013-depsgraph_mt
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 19 Aug 2013 07:43:26 +0000 (07:43 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 19 Aug 2013 07:43:26 +0000 (07:43 +0000)
1  2 
source/blender/blenkernel/BKE_armature.h
source/blender/blenkernel/intern/object_deform.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/makesdna/DNA_scene_types.h

Simple merge