svn merge ^/trunk/blender -r40381:40382
authorCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 06:35:49 +0000 (06:35 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 06:35:49 +0000 (06:35 +0000)
commit91587ed30217905213f72a473122fc95d483ad70
tree0f0fb0825c60098d6c4aa48b45384c7f0b5fe6f7
parentebd152598059454849dc0fa643dc6d9a9a39db02
parent13dfd8299758a5248613624e99a1643f35e2ff4e
svn merge ^/trunk/blender -r40381:40382
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/meshtools.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/render/intern/source/convertblender.c