svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17405:HEAD
authorCampbell Barton <ideasman42@gmail.com>
Thu, 13 Nov 2008 13:34:43 +0000 (13:34 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 13 Nov 2008 13:34:43 +0000 (13:34 +0000)
commitbb6d39687abca029deb286d3e277ff7d3ca9232f
treeeb643d3eb9dc4faefbcab5371d2530b1b88a6dc1
parent1f3e4771b1404de0ca8a78582c1b9c827c912b80
parentc838ee9592582397b12955131737bd2c9739b712
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17405:HEAD
source/blender/src/imagepaint.c