Merged changes in the trunk up to revision 44288.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 21 Feb 2012 02:19:54 +0000 (02:19 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 21 Feb 2012 02:19:54 +0000 (02:19 +0000)
Conflicts resolved:
source/blender/blenkernel/intern/cdderivedmesh.c

18 files changed:
1  2 
source/blender/blenkernel/intern/object.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/operators/bmo_utils.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_nla/nla_buttons.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_orientations.c
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_scene.c
source/blenderplayer/bad_level_call_stubs/stubs.c

Simple merge