svn merge ^/trunk/blender -r42759:42761
authorCampbell Barton <ideasman42@gmail.com>
Tue, 20 Dec 2011 21:28:57 +0000 (21:28 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 20 Dec 2011 21:28:57 +0000 (21:28 +0000)
commitcceef0d44fbbec3ee300d7e3cc01d5eab19a36c8
tree60d77967ad545477b17938d2ac3ab5ad3798b044
parent57ed2fd1c11d6c23300175ffcbeb06f8675d55b2
parentb70174cb9350868e9dd26139a8980406b18415b8
svn merge ^/trunk/blender -r42759:42761
source/blender/editors/include/ED_mesh.h
source/blender/editors/mesh/editface.c
source/blender/editors/mesh/meshtools.c
source/blender/modifiers/intern/MOD_uvproject.c