[Bf-blender-cvs] [5da02ab] master: GPU: only call glShadeModel when needed

Campbell Barton noreply at git.blender.org
Thu Jun 9 22:10:03 CEST 2016


Commit: 5da02ab9e249487081afe3ee459f1e8d15a7f674
Author: Campbell Barton
Date:   Fri Jun 10 06:11:14 2016 +1000
Branches: master
https://developer.blender.org/rB5da02ab9e249487081afe3ee459f1e8d15a7f674

GPU: only call glShadeModel when needed

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

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 1e60944..4ac1c48 100644
--- a/source/blender/gpu/intern/gpu_basic_shader.c
+++ b/source/blender/gpu/intern/gpu_basic_shader.c
@@ -512,7 +512,7 @@ void GPU_basic_shader_bind(int options)
 		if (options & GPU_SHADER_FLAT_NORMAL) {
 			glShadeModel(GL_FLAT);
 		}
-		else {
+		else if (bound_options & GPU_SHADER_FLAT_NORMAL) {
 			glShadeModel(GL_SMOOTH);
 		}
 	}




More information about the Bf-blender-cvs mailing list