svn merge -r39951:39986 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Wed, 7 Sep 2011 00:46:11 +0000 (00:46 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 7 Sep 2011 00:46:11 +0000 (00:46 +0000)
commita167ee12629487a40b8a4822224b06fce18f51a4
tree6559d851261f9d369eb353c4bbff9b0fc534bcc9
parent74c3fa5920486f52312bc5831215637dc932f070
parent9161d3ce4bdd7c838751462b47eb045ea33a686e
svn merge -r39951:39986 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/blenkernel/intern/blender.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/python/mathutils/mathutils_geometry.c