fix problem with recent commit [#26717] X-Ray conflict (X-Ray Grease Pencil and Objec...
authorCampbell Barton <ideasman42@gmail.com>
Fri, 1 Apr 2011 14:14:37 +0000 (14:14 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 1 Apr 2011 14:14:37 +0000 (14:14 +0000)
commitb94a5e7f02a07e13d3ad559ddef464086a447ae8
tree6ecb8b789e40abd3b21ea1d56d0743574c4058d2
parenta4193184bf52b338df2d25fdf7fefed2be55bbb1
fix problem with recent commit [#26717] X-Ray conflict (X-Ray Grease Pencil and Object X-Ray)
source/blender/editors/space_view3d/view3d_draw.c