[Bf-blender-cvs] [1ea410c] master: OpenSubdiv: Fix opensubdiv option obscuring the interface

[Sergey Sharybin]

Commit: 1ea410c559b30ab76ff512dbb04ed110b293725a
Author: Sergey Sharybin
Date:   Mon Jul 25 18:30:48 2016 +0200
Branches: master
https://developer.blender.org/rB1ea410c559b30ab76ff512dbb04ed110b293725a

OpenSubdiv: Fix opensubdiv option obscuring the interface

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

M	source/blender/blenkernel/intern/subsurf_ccg.c

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

diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index 04bcd36..e876bf4 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -2699,6 +2699,7 @@ static void ccgDM_drawFacesSolid(DerivedMesh *dm, float (*partial_redraw_planes)
 				                      num_draw_patches);
 			}
 		}
+		glShadeModel(GL_SMOOTH);
 		return;
 	}
 #endif
@@ -2805,6 +2806,7 @@ static void ccgDM_drawMappedFacesGLSL(DerivedMesh *dm,
 				                      num_draw_patches);
 			}
 		}
+		glShadeModel(GL_SMOOTH);
 		return;
 	}
 #endif
@@ -3214,6 +3216,7 @@ static void ccgDM_drawMappedFacesMat(DerivedMesh *dm,
 		glShadeModel(draw_smooth ? GL_SMOOTH : GL_FLAT);
 		setMaterial(userData, new_matnr, &gattribs);
 		ccgSubSurf_drawGLMesh(ss, true, -1, -1);
+		glShadeModel(GL_SMOOTH);
 		return;
 	}
 #endif
@@ -3479,6 +3482,7 @@ static void ccgDM_drawFacesTex_common(DerivedMesh *dm,
 				num_draw_patches += num_patches;
 			}
 		}
+		glShadeModel(GL_SMOOTH);
 		return;
 	}
 #endif
@@ -3678,6 +3682,7 @@ static void ccgDM_drawMappedFaces(DerivedMesh *dm,
 			glShadeModel(draw_smooth ? GL_SMOOTH : GL_FLAT);
 			ccgSubSurf_drawGLMesh(ss, true, -1, -1);
 		}
+		glShadeModel(GL_SMOOTH);
 		return;
 	}
 #endif