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)
commit5cafd08ba2275d8cfb2b2a17c227d00185327522
tree177c2de0809459eb8171ffedbb0e97a48fdf874e
parentad4738e77f53e99edc8fbba0472b3437aa318e90
parent72309f65b812d4292281397218d1533b626bf8b5
svn merge ^/trunk/blender -r49143:49145
source/blender/editors/space_view3d/view3d_draw.c