svn merge ^/trunk/blender -r42416:42422
authorCampbell Barton <ideasman42@gmail.com>
Sun, 4 Dec 2011 20:05:50 +0000 (20:05 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 4 Dec 2011 20:05:50 +0000 (20:05 +0000)
commit3267a619f1e1a5b5508e38cbc665da79f450b2e3
treee5c5abcb88e77a056a66d1d34e494f9136417f1a
parent22a1ad61f93a4b060500e5295c58b128f24a2daf
parentbf77a177d406c378a74bf4572717159994d1faaf
svn merge ^/trunk/blender -r42416:42422
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/intern/mesh.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_modifier.c
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesdna/DNA_meshdata_types.h