[Bf-blender-cvs] [36bbdf1] blender2.8: OpenGL: fix new shader for Mac

Mike Erwin noreply at git.blender.org
Fri Sep 23 18:16:51 CEST 2016


Commit: 36bbdf142c524ee3f428efd203279e1b6cff3475
Author: Mike Erwin
Date:   Fri Sep 23 18:16:45 2016 +0200
Branches: blender2.8
https://developer.blender.org/rB36bbdf142c524ee3f428efd203279e1b6cff3475

OpenGL: fix new shader for Mac

Follow-up to rB4a1feaa5558ed60388fd3be41db74fbc54f2ab08

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

M	source/blender/gpu/shaders/gpu_shader_2D_texture_vert.glsl

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

diff --git a/source/blender/gpu/shaders/gpu_shader_2D_texture_vert.glsl b/source/blender/gpu/shaders/gpu_shader_2D_texture_vert.glsl
index 8c0d761..d4d36de 100644
--- a/source/blender/gpu/shaders/gpu_shader_2D_texture_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_2D_texture_vert.glsl
@@ -1,11 +1,13 @@
 #if __VERSION__ == 120
+  attribute vec2 texcoord;
+  attribute vec3 position;
   varying vec2 texture_coord;
 #else
+  in vec2 texcoord;
+  in vec3 position;
   out vec2 texture_coord;
 #endif
 
-in vec2 texcoord;
-in vec3 position;
 
 void main()
 {




More information about the Bf-blender-cvs mailing list