Merged changes in the trunk up to revision 42692.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 17 Dec 2011 21:24:39 +0000 (21:24 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 17 Dec 2011 21:24:39 +0000 (21:24 +0000)
commit4a92ee2831ae2ae8bf96b116cb47ddcff1c36add
tree9b383957944fa9133fe0e6b3509fc49faaf2d72c
parent40f215bbc998a43b991cbdf2fde6e836dc9fabf8
parent74a112305932eff7c68c23c6df265e72de7195f8
Merged changes in the trunk up to revision 42692.
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh_tools.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_meshdata_types.h
source/blender/render/intern/source/convertblender.c