svn merge -r39493:39664 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Wed, 24 Aug 2011 02:29:45 +0000 (02:29 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 24 Aug 2011 02:29:45 +0000 (02:29 +0000)
commitfd4575b2e3e47fb331ac6c9b30fb23cfb05a53ae
treefc22ef5086c488010fbc3d5058198d1686260562
parent98f87b77f40b5617409ccc026be604fcaaff9f8e
parentf9bffb3ca0ca88a7e774b0ee0da1d384707f0495
svn merge -r39493:39664 https://svn.blender.org/svnroot/bf-blender/trunk/blender
38 files changed:
release/scripts/startup/bl_ui/space_info.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/multires.c
source/blender/blenlib/intern/math_geom.c
source/blender/blenlib/intern/scanfill.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/blenpluginapi/SConscript
source/blender/editors/armature/SConscript
source/blender/editors/armature/editarmature.c
source/blender/editors/mesh/SConscript
source/blender/editors/object/SConscript
source/blender/editors/object/object_add.c
source/blender/editors/object/object_bake.c
source/blender/editors/physics/SConscript
source/blender/editors/render/SConscript
source/blender/editors/render/render_shading.c
source/blender/editors/screen/SConscript
source/blender/editors/sculpt_paint/SConscript
source/blender/editors/space_node/SConscript
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/transform/transform.c
source/blender/editors/uvedit/uvedit_unwrap_ops.c
source/blender/makesdna/intern/SConscript
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/SConscript
source/blender/makesrna/intern/rna_scene.c
source/blender/render/SConscript
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/strand.c
source/blender/windowmanager/SConscript
source/creator/CMakeLists.txt
source/creator/creator.c