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)
commitd7e5f348c88d0219d3e7b737b23b41c4ab65dded
tree366f6c0f4ef4e1a9222ea66c3b89a767f77851a0
parent7126a4699e3b85f47cd2cc84bdb6a511e9a17f69
parent439f0ef7ddcfad1fa2f4dba5db89433a2a350bd0
svn merge ^/trunk/blender -r40368:40370
source/blender/editors/sculpt_paint/paint_utils.c
source/blender/editors/sculpt_paint/paint_vertex.c