svn merge ^/trunk/blender -r49143:49145
authorCampbell Barton <ideasman42@gmail.com>
Mon, 23 Jul 2012 16:43:48 +0000 (16:43 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 23 Jul 2012 16:43:48 +0000 (16:43 +0000)
1  2 
source/blender/editors/space_view3d/view3d_draw.c