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:
authorClément Foucault <foucault.clem@gmail.com>2018-08-22 19:44:24 +0300
committerClément Foucault <foucault.clem@gmail.com>2018-08-22 20:49:32 +0300
commit890623f8865a87a9c1a1c78561acfea2a5e43eb1 (patch)
treef6a144ac3eeb74fe4cc1aed114472e1576f45a36 /source/blender/gpu
parent477b4559ece0d12ec0bab88d317b9fe2e1832417 (diff)
Object Mode: Add back spot cone display
Diffstat (limited to 'source/blender/gpu')
-rw-r--r--source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_color_vert.glsl3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_color_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_color_vert.glsl
index 10a2ba61a2c..1c49d9dec3e 100644
--- a/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_color_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_color_vert.glsl
@@ -1,5 +1,6 @@
uniform mat4 ViewProjectionMatrix;
+uniform float alpha;
/* ---- Instanciated Attribs ---- */
in vec3 pos;
@@ -18,5 +19,5 @@ flat out vec4 finalColor;
void main()
{
gl_Position = ViewProjectionMatrix * InstanceModelMatrix * vec4(pos * size, 1.0);
- finalColor = vec4(color, 1.0);
+ finalColor = vec4(color, alpha);
}