diff options
| author | Alexander Romanov <a.romanov@blend4web.com> | 2016-04-08 12:20:43 +0300 |
|---|---|---|
| committer | Alexander Romanov <a.romanov@blend4web.com> | 2016-04-08 12:20:43 +0300 |
| commit | a5dcda8ad34fcb16af6f65946d7175e00dae27e0 (patch) | |
| tree | 0919dea587ea6c9bb3b776fbac957ef1b5e38b03 /source/blender/gpu | |
| parent | d969192fbe6129021f0399cc35c6c2be6aa72eda (diff) | |
Fix broken by D1880 line stipple deactivation
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/intern/gpu_basic_shader.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/gpu/intern/gpu_basic_shader.c b/source/blender/gpu/intern/gpu_basic_shader.c index abaf1944302..b6fe40a13ee 100644 --- a/source/blender/gpu/intern/gpu_basic_shader.c +++ b/source/blender/gpu/intern/gpu_basic_shader.c @@ -442,11 +442,11 @@ void GPU_basic_shader_bind(int options) glDisable(GL_TEXTURE_2D); } - if (options & GPU_SHADER_LINE) { - if (options & GPU_SHADER_STIPPLE) - glEnable(GL_LINE_STIPPLE); - else if (bound_options & GPU_SHADER_STIPPLE) - glDisable(GL_LINE_STIPPLE); + if ((options & GPU_SHADER_LINE) && (options & GPU_SHADER_STIPPLE)) { + glEnable(GL_LINE_STIPPLE); + } + else if ((bound_options & GPU_SHADER_LINE) && (bound_options & GPU_SHADER_STIPPLE)) { + glDisable(GL_LINE_STIPPLE); } else { if (options & GPU_SHADER_STIPPLE) |