Merged changes in the trunk up to revision 50607.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 15 Sep 2012 00:15:24 +0000 (00:15 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 15 Sep 2012 00:15:24 +0000 (00:15 +0000)
commit41729976753523ee08a0afaf6a26b6caf3dee1d6
treeba264fba22084f44eb50b952f375715f501acff9
parenta5f8298ea5d13d7707bc0cbf0722013276bab9d6
parenta425790065fedb2ae49f1b79770945d8528790d9
Merged changes in the trunk up to revision 50607.

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
38 files changed:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/object.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/mesh/mesh_intern.h
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesdna/DNA_meshdata_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/include/render_types.h
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/render_result.c
source/blender/windowmanager/WM_types.h
source/blender/windowmanager/intern/wm_files.c
source/creator/CMakeLists.txt
source/creator/creator.c