svn merge -r39900:40000 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Tue, 13 Sep 2011 09:07:20 +0000 (09:07 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 13 Sep 2011 09:07:20 +0000 (09:07 +0000)
commit92089e3c4d89c2689dbd4452fb21cbbd9a0ecc71
treeb22c37b97efec05c592b86f03a098f56179a7f5b
parent9c4165fde0ba8c8d05b49240dab8abdf2d187861
parent520778163debe82b8cebe9ddec6ab4111ab2d6bd
svn merge -r39900:40000 https://svn.blender.org/svnroot/bf-blender/trunk/blender
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/editors/sculpt_paint/paint_image.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c