Merged changes in the trunk up to revision 44419.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 25 Feb 2012 01:26:45 +0000 (01:26 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 25 Feb 2012 01:26:45 +0000 (01:26 +0000)
commit9ca7f6659f5f316392901fc9607a0dc4e2e373b4
tree1cf3771a0a4e756baee494da0818d4dd08cc9ce9
parent9f243d531cb2629625d02e4290549b9e6ba76933
parent2d8227f20400767bcf0fbb0877a055534d8a99ff
Merged changes in the trunk up to revision 44419.

Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_view3d/drawobject.c
source/creator/CMakeLists.txt
19 files changed:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/bmesh.h
source/blender/bmesh/operators/bmo_utils.c
source/blender/editors/mesh/bmesh_select.c
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/SConscript
source/creator/CMakeLists.txt