svn merge ^/trunk/blender -r43381:43392
authorCampbell Barton <ideasman42@gmail.com>
Sun, 15 Jan 2012 10:33:41 +0000 (10:33 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 15 Jan 2012 10:33:41 +0000 (10:33 +0000)
commitcaca9cc8f610d2967fc38bf2528a517987bffaef
tree5f56598246aae59d1ed9751f84d5fd1cb38887fe
parent917714acf72340bbea363c81773887c6c532c7d8
parent094554b6b45f30fc2d9f3672c3adfd2bdfa4eeb0
svn merge ^/trunk/blender -r43381:43392
release/scripts/startup/bl_ui/space_view3d.py
source/blender/editors/mesh/mesh_ops.c
source/blender/editors/object/object_ops.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/makesrna/intern/rna_scene.c