diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2020-05-15 15:29:27 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2020-05-18 16:27:29 +0300 |
| commit | 6ede93bab3ba2dd1a68204eb55697bc1739a32bc (patch) | |
| tree | 59ec3ad41deb757ee28442b13e4ae27be969e5af /source/blender/draw | |
| parent | 18dd289e1a52c497f70d2638572834978a0c69e2 (diff) | |
Cleanup: Put GPU_state_init inside gpu_state.c
Also put glDisable(GL_DITHER) in it since we don't even use it (but is
enabled by default).
Also leave GL_MULTISAMPLE on by default since it has no impact on non-MSAA
framebuffers.
Diffstat (limited to 'source/blender/draw')
| -rw-r--r-- | source/blender/draw/engines/select/select_engine.c | 3 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_manager.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/draw/engines/select/select_engine.c b/source/blender/draw/engines/select/select_engine.c index 08ec0038755..bb7c947a0b9 100644 --- a/source/blender/draw/engines/select/select_engine.c +++ b/source/blender/draw/engines/select/select_engine.c @@ -307,9 +307,6 @@ static void select_draw_scene(void *vedata) return; } - /* dithering and AA break color coding, so disable */ - glDisable(GL_DITHER); - DRW_view_set_active(stl->g_data->view_faces); if (!DRW_pass_is_empty(psl->depth_only_pass)) { diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 639c62e5e44..970578c7438 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -63,11 +63,11 @@ #include "ED_space_api.h" #include "ED_view3d.h" -#include "GPU_draw.h" #include "GPU_extensions.h" #include "GPU_framebuffer.h" #include "GPU_immediate.h" #include "GPU_matrix.h" +#include "GPU_state.h" #include "GPU_uniformbuffer.h" #include "GPU_viewport.h" |