svn merge ^/trunk/blender -r40311:40338
authorCampbell Barton <ideasman42@gmail.com>
Mon, 19 Sep 2011 05:58:52 +0000 (05:58 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 19 Sep 2011 05:58:52 +0000 (05:58 +0000)
commit20463cb842ac8a519a434a82c715b89370f14080
tree7e326f42c3a4d232de341da36e338f022dbaefe0
parente197b993d389d38b1ee6cbbdabe3ef2846f4aab6
parent049838fe0ce1b2e737c7d2c539cb8a945d52b902
svn merge ^/trunk/blender -r40311:40338
source/blender/editors/sculpt_paint/paint_utils.c