svn merge ^/trunk/blender -r42757:42759
authorCampbell Barton <ideasman42@gmail.com>
Tue, 20 Dec 2011 10:59:56 +0000 (10:59 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 20 Dec 2011 10:59:56 +0000 (10:59 +0000)
commit57ed2fd1c11d6c23300175ffcbeb06f8675d55b2
tree90adfeb5d3d1767ead3284dda4ebe61a8b38df81
parent84b58df85a08813a5f216d702c3e48b564840bd8
parent2f9925f9137ada4a88f8a619e6a95221b6690dfb
svn merge ^/trunk/blender -r42757:42759
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/drawobject.c