[Bf-blender-cvs] [316b953] GPU_data_request: reset shading to SMOOTH or FLAT
Mike Erwin
noreply at git.blender.org
Thu Apr 23 06:39:21 CEST 2015
Commit: 316b953e347de45e898c55bae4f30c558b3f136f
Author: Mike Erwin
Date: Thu Apr 23 00:38:26 2015 -0400
Branches: GPU_data_request
https://developer.blender.org/rB316b953e347de45e898c55bae4f30c558b3f136f
reset shading to SMOOTH or FLAT
missed this as part of GPUx interpolation commit
===================================================================
M source/blender/gpu/intern/gpux_state.c
===================================================================
diff --git a/source/blender/gpu/intern/gpux_state.c b/source/blender/gpu/intern/gpux_state.c
index f7cb689..88b2585 100644
--- a/source/blender/gpu/intern/gpux_state.c
+++ b/source/blender/gpu/intern/gpux_state.c
@@ -224,6 +224,11 @@ void GPUx_force_state_update()
else
glDisable(GL_LIGHTING);
+ if (current.common.interpolate)
+ glShadeModel(GL_SMOOTH);
+ else
+ glShadeModel(GL_FLAT);
+
/* point state */
if (current.point.smooth)
glEnable(GL_POINT_SMOOTH);
More information about the Bf-blender-cvs
mailing list