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:
authorMike Erwin <significant.bit@gmail.com>2017-04-16 19:25:42 +0300
committerMike Erwin <significant.bit@gmail.com>2017-04-16 19:25:42 +0300
commit7041b99b5a90509f215db83feeca900d123932b2 (patch)
tree85f0c6d07ae4b4e738d985c7481a2351caad71e8 /source/blender/editors/space_clip/clip_draw.c
parentbf441fcfacc1648cb5aff87dafd1e5f0098e3d2b (diff)
use immUniformColor instead of immUniform("color"
The specialized color functions are better in every way: - faster lookup (don't have to match "color" string) - flexible inputs (RGB with separate alpha) - automatic alpha = 1.0 if not specified Sort of related to T49043
Diffstat (limited to 'source/blender/editors/space_clip/clip_draw.c')
-rw-r--r--source/blender/editors/space_clip/clip_draw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c
index dfedfa5bc12..ed0cf861e39 100644
--- a/source/blender/editors/space_clip/clip_draw.c
+++ b/source/blender/editors/space_clip/clip_draw.c
@@ -1105,7 +1105,7 @@ static void draw_plane_marker_image(Scene *scene,
unsigned int texCoord = VertexFormat_add_attrib(imm_format, "texCoord", COMP_F32, 2, KEEP_FLOAT);
immBindBuiltinProgram(GPU_SHADER_2D_IMAGE_COLOR);
- immUniform4f("color", 1.0f, 1.0f, 1.0f, plane_track->image_opacity);
+ immUniformColor4f(1.0f, 1.0f, 1.0f, plane_track->image_opacity);
immUniform1i("image", GL_TEXTURE0);
immBegin(PRIM_TRIANGLE_FAN, 4);