svn merge ^/trunk/blender -r43338:43345
authorCampbell Barton <ideasman42@gmail.com>
Fri, 13 Jan 2012 08:28:51 +0000 (08:28 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 13 Jan 2012 08:28:51 +0000 (08:28 +0000)
commit3bb9c4adf985aff5e8e213807f3db0d7cd7556e7
tree72c0633bfd67928347c78b7615397051fd8b7beb
parent705f23064e8ba3e96690d163c98687fc79d4a179
parent80c7190373888683e3d1346eaaf52f1a92a45294
svn merge ^/trunk/blender -r43338:43345
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/makesrna/intern/rna_scene.c