[Bf-blender-cvs] [a5dcda8] master: Fix broken by D1880 line stipple deactivation

[Alexander Romanov]

Commit: a5dcda8ad34fcb16af6f65946d7175e00dae27e0
Author: Alexander Romanov
Date:   Fri Apr 8 12:20:43 2016 +0300
Branches: master
https://developer.blender.org/rBa5dcda8ad34fcb16af6f65946d7175e00dae27e0

Fix broken by D1880 line stipple deactivation

===================================================================

M	source/blender/gpu/intern/gpu_basic_shader.c

===================================================================

diff --git a/source/blender/gpu/intern/gpu_basic_shader.c b/source/blender/gpu/intern/gpu_basic_shader.c
index abaf194..b6fe40a 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)