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:
authorDalai Felinto <dfelinto@gmail.com>2016-09-28 21:48:51 +0300
committerDalai Felinto <dfelinto@gmail.com>2016-09-28 21:48:51 +0300
commit4c7ff8fb1e3c59439cdd8181b10f6b6dfc478033 (patch)
treebab137dbbf8027d63328312f9ea3ba1853ddeab3 /source/blender/gpu/gawain/immediate.c
parent83d5a919e26affaa4e81258e629fe048215f6a04 (diff)
Fix animation transition in region overlay not working since 4a1feaa5
We still have stills with the User Preference window, though.
Diffstat (limited to 'source/blender/gpu/gawain/immediate.c')
-rw-r--r--source/blender/gpu/gawain/immediate.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/source/blender/gpu/gawain/immediate.c b/source/blender/gpu/gawain/immediate.c
index 9c3904f21cb..7edc4e2caaf 100644
--- a/source/blender/gpu/gawain/immediate.c
+++ b/source/blender/gpu/gawain/immediate.c
@@ -622,6 +622,17 @@ void immVertex3fv(unsigned attrib_id, const float data[3])
immEndVertex();
}
+void immUniform1f(const char* name, float x)
+{
+ int loc = glGetUniformLocation(imm.bound_program, name);
+
+#if TRUST_NO_ONE
+ assert(loc != -1);
+#endif
+
+ glUniform1f(loc, x);
+}
+
void immUniform4f(const char* name, float x, float y, float z, float w)
{
int loc = glGetUniformLocation(imm.bound_program, name);