[Bf-blender-cvs] [ae071305404] blender2.8: Gawain: add immUniformColor3ubvAlpha
Mike Erwin
noreply at git.blender.org
Sun Apr 16 19:45:23 CEST 2017
Commit: ae071305404e61f696f3da46b00bf93aa6a4a5a5
Author: Mike Erwin
Date: Sun Apr 16 13:33:21 2017 -0400
Branches: blender2.8
https://developer.blender.org/rBae071305404e61f696f3da46b00bf93aa6a4a5a5
Gawain: add immUniformColor3ubvAlpha
Convenience function for specifying colors with separate RGB and alpha. Alpha ranges from 0 to 255.
===================================================================
M intern/gawain/gawain/immediate.h
M intern/gawain/src/immediate.c
===================================================================
diff --git a/intern/gawain/gawain/immediate.h b/intern/gawain/gawain/immediate.h
index b08be688cf4..99f10a5ff68 100644
--- a/intern/gawain/gawain/immediate.h
+++ b/intern/gawain/gawain/immediate.h
@@ -103,6 +103,7 @@ void immUniformColor3fvAlpha(const float rgb[3], float a);
void immUniformColor3ub(unsigned char r, unsigned char g, unsigned char b);
void immUniformColor4ub(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
void immUniformColor3ubv(const unsigned char rgb[3]);
+void immUniformColor3ubvAlpha(const unsigned char rgb[3], unsigned char a);
void immUniformColor4ubv(const unsigned char rgba[4]);
diff --git a/intern/gawain/src/immediate.c b/intern/gawain/src/immediate.c
index 6c237a27067..0a137973711 100644
--- a/intern/gawain/src/immediate.c
+++ b/intern/gawain/src/immediate.c
@@ -859,6 +859,11 @@ void immUniformColor3ubv(const unsigned char rgb[3])
immUniformColor3ub(rgb[0], rgb[1], rgb[2]);
}
+void immUniformColor3ubvAlpha(const unsigned char rgb[3], unsigned char alpha)
+ {
+ immUniformColor4ub(rgb[0], rgb[1], rgb[2], alpha);
+ }
+
void immUniformColor4ubv(const unsigned char rgba[4])
{
immUniformColor4ub(rgba[0], rgba[1], rgba[2], rgba[3]);
More information about the Bf-blender-cvs
mailing list