svn merge -r38157:38474 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Mon, 18 Jul 2011 14:49:05 +0000 (14:49 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 18 Jul 2011 14:49:05 +0000 (14:49 +0000)
commit52d12852e7a0451de51d56ecd6bc5cd8b97800c3
tree5c32f66a37cbb5b0d31c65bbcd2ede3a94236d65
parentb8fc3030b531702b6d1ac8af442e593e4f3ce9fa
parent35ce13562db2eb2dedef76ffdf77b83e48fb684a
svn merge -r38157:38474 https://svn.blender.org/svnroot/bf-blender/trunk/blender
CMakeLists.txt
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/editors/interface/interface_templates.c
source/blender/makesrna/intern/rna_object.c