Merged changes in the trunk up to revision 45820.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 21 Apr 2012 00:33:36 +0000 (00:33 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 21 Apr 2012 00:33:36 +0000 (00:33 +0000)
commitcdbfd1db3800cf4f0ea691f09bf05e78a82c80f9
treeb1f22c4ea61ff96ee51c4882047f5a8e3f08c0f1
parent4a19ccfa5fb5cae359269ecaac389f6aace9f959
parent15eb3452ecd96e4d79d438e8c954918639dc283d
Merged changes in the trunk up to revision 45820.

Conflicts resolved:
source/creator/creator.c
29 files changed:
doc/python_api/sphinx_doc_gen.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/intern/bmesh_construct.c
source/blender/bmesh/operators/bmo_utils.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/mesh/mesh_ops.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_orientations.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/render/SConscript
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/shadeoutput.c
source/blender/windowmanager/WM_types.h
source/blender/windowmanager/intern/wm_files.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/creator.c