Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-08-03 16:27:06 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-08-03 16:27:42 +0300
commitb26eb4796124670c82b84138faf614287a2b28d8 (patch)
tree414663ace8bfa9f5f51629337de7671c4b93d09f /source/blender
parent9036fa6b2e47c1cd6f208e9a128771752766c5e8 (diff)
OpenSubdiv: Corrections to GLSL version
Was own mistake in the last minute fixes, now matcaps should work just fine.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/gpu/intern/gpu_extensions.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c
index ca9b4225faa..17d2b64d7b1 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -1533,7 +1533,7 @@ static const char *gpu_shader_version(bool use_opensubdiv)
{
#ifdef WITH_OPENSUBDIV
if (use_opensubdiv) {
- return "#version 150";
+ return "#version 130\n";
}
#else
UNUSED_VARS(use_opensubdiv);
@@ -1678,7 +1678,7 @@ void GPU_program_parameter_4f(GPUProgram *program, unsigned int location, float
GPUShader *GPU_shader_create(const char *vertexcode, const char *fragcode, const char *geocode, const char *libcode, const char *defines, int input, int output, int number)
{
-#ifdef WITH_OPENSUBDIF
+#ifdef WITH_OPENSUBDIV
/* TODO(sergey): used to add #version 150 to the geometry shader.
* Could safely be renamed to "use_geometry_code" since it's evry much
* liely any of geometry code will want to use GLSL 1.5.