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)
1  2 
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