Merged changes in the trunk up to revision 51126.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 6 Oct 2012 23:32:21 +0000 (23:32 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 6 Oct 2012 23:32:21 +0000 (23:32 +0000)
commit1fe70c07a008185c4e5925aff2c214c93ff396b7
tree5dd9fc4a6be56243977b2670c8acfe4eb5543d96
parentcdc1e5a716c08e809b771388c6b5075d32a20c98
parente7db06ad9db5a1a05b00fc835038d4366d637851
Merged changes in the trunk up to revision 51126.

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/windowmanager/WM_types.h
20 files changed:
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/intern/bmesh_construct.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_scene.c
source/blender/render/intern/source/convertblender.c
source/blender/windowmanager/WM_types.h
source/blender/windowmanager/intern/wm_files.c