svn merge ^/trunk/blender -r40368:40370
authorCampbell Barton <ideasman42@gmail.com>
Thu, 22 Sep 2011 16:17:27 +0000 (16:17 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 22 Sep 2011 16:17:27 +0000 (16:17 +0000)
1  2 
source/blender/editors/sculpt_paint/paint_utils.c
source/blender/editors/sculpt_paint/paint_vertex.c