[Bf-blender-cvs] [8651d020511] greasepencil-object: Remove old opengl code
Antonio Vazquez
noreply at git.blender.org
Wed May 17 13:56:45 CEST 2017
Commit: 8651d020511a3acccc90f370f8a31223e754123e
Author: Antonio Vazquez
Date: Wed May 17 13:56:28 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB8651d020511a3acccc90f370f8a31223e754123e
Remove old opengl code
===================================================================
M source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl
===================================================================
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl
index eeea3bd916e..44a3a4da5b0 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl
@@ -25,16 +25,10 @@ uniform int t_clamp;
#define CHESS 3
#define TEXTURE 4
-#if __VERSION__ == 120
- varying vec4 finalColor;
- varying vec2 texCoord_interp;
- #define fragColor gl_FragColor
-#else
- in vec4 finalColor;
- in vec2 texCoord_interp;
- out vec4 fragColor;
- #define texture2D texture
-#endif
+in vec4 finalColor;
+in vec2 texCoord_interp;
+out vec4 fragColor;
+#define texture2D texture
void set_color(in vec4 color, in vec4 color2, in vec4 tcolor, in float mixv, in float factor,
in int tmix, in int flip, out vec4 ocolor)
More information about the Bf-blender-cvs
mailing list