diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-11-24 04:59:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-11-24 04:59:10 +0400 |
| commit | 7c004d289275f51b789529d964a24aea208914fc (patch) | |
| tree | 6909f9b5e0b1a16ca7cb0eae00679f6194f4d2b3 /source/blender/editors/space_view3d | |
| parent | 89f45669304f83f0cc75babdec94e60f2a2c0dfd (diff) | |
remove USER_DISABLE_AA/use_antialiasing, this wasn't available from the UI but would be confusing if someone had it set from an old file.
Diffstat (limited to 'source/blender/editors/space_view3d')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 70c612d156b..f4547a2ae3b 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -2996,9 +2996,10 @@ static void view3d_main_area_draw_objects(const bContext *C, ARegion *ar, const v3d->zbuf = FALSE; /* enables anti-aliasing for 3D view drawing */ - if (U.ogl_multisamples) - if (!(U.gameflags & USER_DISABLE_AA)) - glEnable(GL_MULTISAMPLE_ARB); + if (U.ogl_multisamples != USER_MULTISAMPLE_NONE) { + // if (!(U.gameflags & USER_DISABLE_AA)) + glEnable(GL_MULTISAMPLE_ARB); + } /* needs to be done always, gridview is adjusted in drawgrid() now */ @@ -3113,9 +3114,10 @@ static void view3d_main_area_draw_objects(const bContext *C, ARegion *ar, const BIF_draw_manipulator(C); /* Disable back anti-aliasing */ - if (U.ogl_multisamples) - if (!(U.gameflags & USER_DISABLE_AA)) - glDisable(GL_MULTISAMPLE_ARB); + if (U.ogl_multisamples != USER_MULTISAMPLE_NONE) { + // if (!(U.gameflags & USER_DISABLE_AA)) + glDisable(GL_MULTISAMPLE_ARB); + } if (v3d->zbuf) { |