svn merge ^/trunk/blender -r42550:42564
authorCampbell Barton <ideasman42@gmail.com>
Sun, 11 Dec 2011 01:06:43 +0000 (01:06 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 11 Dec 2011 01:06:43 +0000 (01:06 +0000)
commit5f6ff0f41298bd1e35479dd7bf42d948aa61d44f
tree72a24204fcb6f3df13ba606be1b6e8798bb0ac7e
parent6bc55f2e4ac2c30044fad6ee8c47bb723f452179
parent9b762a51b1e3419771afa1e14247573ec0c23432
svn merge ^/trunk/blender -r42550:42564
source/blender/blenkernel/BKE_blender.h
source/blender/blenloader/intern/readfile.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/makesdna/DNA_meshdata_types.h
source/blender/makesrna/intern/rna_object.c