Merged changes in the trunk up to revision 44612.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 3 Mar 2012 01:43:44 +0000 (01:43 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 3 Mar 2012 01:43:44 +0000 (01:43 +0000)
commit9e93fc1e8acacb99b4b7638590ca4f1491e8b587
treee42fb8ecc337a617a98e01f6c882b890ab9387e6
parent00782aae1f5f3159c7afb1cb227bd8de1bc4b9c4
parent95bba22af075148f9cbdb5a9b1ef41aeff1f560f
Merged changes in the trunk up to revision 44612.

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/bmesh.h
36 files changed:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/bmesh_class.h
source/blender/bmesh/intern/bmesh_construct.c
source/blender/bmesh/operators/bmo_utils.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/bmesh_select.c
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/mesh/mesh_ops.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_material_types.h
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesdna/DNA_meshdata_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
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/shadeoutput.c