Merged changes in the trunk up to revision 44561.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 29 Feb 2012 21:35:49 +0000 (21:35 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 29 Feb 2012 21:35:49 +0000 (21:35 +0000)
commit35708fe15044445fead8bc7c3709edea6921cff5
tree835087aae42cd973e4a51895e60e206434c0e0fe
parenta20ca0ca32087b97c76819be88091b7caf4da85c
parentaf0a469307d5abe30d59c62c61d8bbc361bdf359
Merged changes in the trunk up to revision 44561.

Conflicts resolved:
source/blender/bmesh/bmesh.h
source/blender/bmesh/bmesh_operators.h
source/blenderplayer/bad_level_call_stubs/stubs.c
26 files changed:
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/group.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/bmesh.h
source/blender/bmesh/intern/bmesh_construct.c
source/blender/bmesh/intern/bmesh_operators.h
source/blender/bmesh/operators/bmo_utils.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/bmesh_select.c
source/blender/editors/mesh/bmesh_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_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_scene.c
source/blenderplayer/bad_level_call_stubs/stubs.c