svn merge -r40179:40195 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Wed, 14 Sep 2011 01:32:59 +0000 (01:32 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 14 Sep 2011 01:32:59 +0000 (01:32 +0000)
commitac51152ec507cb141a598d2edd7fe32840999a94
treeb2d77be7895b2d370d677321ac8f7cb664ea94d5
parent272bdce84d476154a85c4ac02b751f49033fffc9
parentdd2a2ec6993060f3dbf62c64c4ff56bcca02c54f
svn merge -r40179:40195 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/blenkernel/BKE_paint.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/editors/space_view3d/drawobject.c