[Bf-blender-cvs] [89edddb] master: Fix T45691 crash on material view

[Antony Riakiotakis]

Commit: 89edddb26c813478de9f7df9efd52b2e2ca8f6e7
Author: Antony Riakiotakis
Date:   Thu Aug 6 01:09:07 2015 +0200
Branches: master
https://developer.blender.org/rB89edddb26c813478de9f7df9efd52b2e2ca8f6e7

Fix T45691 crash on material view

Call glProgramUniform1i only when OpenSubdiv is requested and only when
the GPU supports it.

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

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

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

diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c
index 17d2b64..c6bee77 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -1850,7 +1850,7 @@ GPUShader *GPU_shader_create(const char *vertexcode, const char *fragcode, const
 
 #ifdef WITH_OPENSUBDIV
 	/* TODO(sergey): Find a better place for this. */
-	{
+	if (use_opensubdiv && GLEW_VERSION_4_1) {
 		glProgramUniform1i(shader->object,
 		                   glGetUniformLocation(shader->object, "FVarDataBuffer"),
 		                   31);  /* GL_TEXTURE31 */