[Bf-blender-cvs] [090623c] master: Revert "Add missing trailing '}' in GLSL files"
Antony Riakiotakis
noreply at git.blender.org
Thu Feb 12 19:39:51 CET 2015
Commit: 090623c6b67a4c5af531fa9df175b89a46b4c32d
Author: Antony Riakiotakis
Date: Thu Feb 12 19:39:10 2015 +0100
Branches: master
https://developer.blender.org/rB090623c6b67a4c5af531fa9df175b89a46b4c32d
Revert "Add missing trailing '}' in GLSL files"
This reverts commit ebd4a6e0dd3bdd511f3857dc9192df848f388200.
Trailing '}' is added in C, also we add some extra code as needed.
===================================================================
M source/blender/gpu/shaders/gpu_shader_vertex.glsl
M source/blender/gpu/shaders/gpu_shader_vertex_world.glsl
===================================================================
diff --git a/source/blender/gpu/shaders/gpu_shader_vertex.glsl b/source/blender/gpu/shaders/gpu_shader_vertex.glsl
index 90414ea..b5d8dcc 100644
--- a/source/blender/gpu/shaders/gpu_shader_vertex.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_vertex.glsl
@@ -23,4 +23,4 @@ void main()
// graphic cards, while on ATI it can cause a software fallback.
gl_ClipVertex = co;
#endif
-}
+
diff --git a/source/blender/gpu/shaders/gpu_shader_vertex_world.glsl b/source/blender/gpu/shaders/gpu_shader_vertex_world.glsl
index ecc4efb..9dbcaeb 100644
--- a/source/blender/gpu/shaders/gpu_shader_vertex_world.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_vertex_world.glsl
@@ -10,4 +10,4 @@ void main()
varposition = gl_Vertex.xyz;
varnormal = normalize(-varposition);
-}
+
More information about the Bf-blender-cvs
mailing list