Merged changes in the trunk up to revision 52690.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 1 Dec 2012 02:47:59 +0000 (02:47 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 1 Dec 2012 02:47:59 +0000 (02:47 +0000)
commited0e2fbd9f4edd55e11df694b34e233cb38cb953
tree70a0d0fc080339b87cbeb73ebab6d4eda91ca5ba
parent129a29873e552d769339c2b7d3b99a0afbbf2ae0
parent75cce01a614e686530e26dbd186a88d75dc4e7b5
Merged changes in the trunk up to revision 52690.

Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenlib/intern/bpath.c
19 files changed:
build_files/scons/tools/Blender.py
doc/python_api/sphinx_doc_gen.py
release/datafiles/startup.blend
source/blender/blenkernel/SConscript
source/blender/blenlib/intern/bpath.c
source/blender/bmesh/bmesh_class.h
source/blender/bmesh/intern/bmesh_construct.c
source/blender/bmesh/intern/bmesh_operators.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_buttons/space_buttons.c
source/blender/editors/transform/transform.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/render/intern/source/convertblender.c
source/blender/windowmanager/WM_types.h
source/creator/CMakeLists.txt
source/creator/creator.c