svn merge ^/trunk/blender -r42439:42466
authorCampbell Barton <ideasman42@gmail.com>
Tue, 6 Dec 2011 18:50:45 +0000 (18:50 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 6 Dec 2011 18:50:45 +0000 (18:50 +0000)
commit35e80c5544d1a0e9a33169182a0a268d726928ca
treef50d2ecd270f6999c70dc68b90a7f60253c82e6e
parent26db98293f9eacf4dcd4dcf6b0b7f82690ec9387
parentb8cc575ee312ced934498663f85b7b6b7428cc14
svn merge ^/trunk/blender -r42439:42466
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/space_view3d/drawobject.c