archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix broken by D1880 line stipple deactivation

Browse Source
This commit is contained in:
Alexander Romanov
2016-04-08 12:20:43 +03:00
parent d969192fbe
commit a5dcda8ad3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/gpu/intern/gpu_basic_shader.c
View File

@@ -442,11 +442,11 @@ void GPU_basic_shader_bind(int options)
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
} }
if (options & GPU_SHADER_LINE) { if ((options & GPU_SHADER_LINE) && (options & GPU_SHADER_STIPPLE)) {
if (options & GPU_SHADER_STIPPLE) glEnable(GL_LINE_STIPPLE);
glEnable(GL_LINE_STIPPLE); }
else if (bound_options & GPU_SHADER_STIPPLE) else if ((bound_options & GPU_SHADER_LINE) && (bound_options & GPU_SHADER_STIPPLE)) {
glDisable(GL_LINE_STIPPLE); glDisable(GL_LINE_STIPPLE);
} }
else { else {
if (options & GPU_SHADER_STIPPLE) if (options & GPU_SHADER_STIPPLE)