Merged changes in the trunk up to revision 52340.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 19 Nov 2012 00:41:11 +0000 (00:41 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 19 Nov 2012 00:41:11 +0000 (00:41 +0000)
commitb7cd9ec3ada529bf1d57cf08cc96851ceb67a47d
tree4ec25ec70b30c3e4a18b384e1938e3aec957d264
parent6cee7bb2b77bc7b577a3067c30dc56e22b4752ce
parenteb1fccd8a54c33a057fa3692eb3dfa1012f4fdfc
Merged changes in the trunk up to revision 52340.

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
15 files changed:
build_files/scons/tools/Blender.py
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/bmesh_class.h
source/blender/bmesh/intern/bmesh_construct.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_space.c
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt
source/creator/creator.c