From 596b6e207eae2e7ea0c95f671a98b432b8f2e8be Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 1 Dec 2013 14:30:22 +1100 Subject: Code Cleanup: make cpack into a function. --- source/blender/editors/include/BIF_gl.h | 2 +- source/blender/editors/screen/glutil.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/source/blender/editors/include/BIF_gl.h b/source/blender/editors/include/BIF_gl.h index cdf9b71972d..a3d3d8f05a2 100644 --- a/source/blender/editors/include/BIF_gl.h +++ b/source/blender/editors/include/BIF_gl.h @@ -53,7 +53,7 @@ * color, while not being endian-sensitive. On little-endians, this * is the same as doing a 'naive' indexing, on big-endian, it is not! * */ -#define cpack(x) glColor3ub( ((x) & 0xFF), (((x) >> 8) & 0xFF), (((x) >> 16) & 0xFF) ) +void cpack(unsigned int x); #define glMultMatrixf(x) glMultMatrixf( (float *)(x)) #define glLoadMatrixf(x) glLoadMatrixf( (float *)(x)) diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c index 5c9778d0793..f02cb4aa1a4 100644 --- a/source/blender/editors/screen/glutil.c +++ b/source/blender/editors/screen/glutil.c @@ -1157,3 +1157,10 @@ void glaDrawImBuf_glsl_ctx(const bContext *C, ImBuf *ibuf, float x, float y, int glaDrawImBuf_glsl(ibuf, x, y, zoomfilter, view_settings, display_settings); } + +void cpack(unsigned int x) +{ + glColor3ub( ( (x) & 0xFF), + (((x) >> 8) & 0xFF), + (((x) >> 16) & 0xFF) ); +} -- cgit v1.2.3