Merged changes in the trunk up to revision 52191.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 14 Nov 2012 02:01:02 +0000 (02:01 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 14 Nov 2012 02:01:02 +0000 (02:01 +0000)
commit6cee7bb2b77bc7b577a3067c30dc56e22b4752ce
treeab504ed0ffa59eb68ed1b57f2208dd949cf40fda
parent872af481831650f2399c85df2ed059d58c5210be
parentde5d0d649da9b73de96cbee9015b838e3c0389c1
Merged changes in the trunk up to revision 52191.

Conflicts resolved:
source/blender/makesdna/DNA_scene_types.h
12 files changed:
build_files/scons/tools/Blender.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/object.c
source/blender/bmesh/bmesh_class.h
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/mesh_intern.h
source/blender/editors/mesh/mesh_ops.c
source/blender/makesdna/DNA_scene_types.h
source/blender/render/intern/source/pipeline.c