diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-01-13 21:10:18 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-01-13 21:11:20 +0300 |
commit | b09563ca8c42f46233bd104e30812e4fc7322ba3 (patch) | |
tree | 49d304ba915aac88b69ab367f98eb71af36f2662 /source/blender/editors/include/BIF_gl.h | |
parent | ef80914c99fb94a4bc7e02a1f808eb0162577fec (diff) |
Cleanup: fixes for building with recent clang
Diffstat (limited to 'source/blender/editors/include/BIF_gl.h')
-rw-r--r-- | source/blender/editors/include/BIF_gl.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/editors/include/BIF_gl.h b/source/blender/editors/include/BIF_gl.h index 2acba04368c..b06af01bab6 100644 --- a/source/blender/editors/include/BIF_gl.h +++ b/source/blender/editors/include/BIF_gl.h @@ -56,14 +56,20 @@ void cpack(unsigned int x); # define glMultMatrixf(x) \ glMultMatrixf(_Generic((x), \ float *: (float *)(x), \ + float [16]: (float *)(x), \ float (*)[4]: (float *)(x), \ + float [4][4]: (float *)(x), \ const float *: (float *)(x), \ - const float (*)[4]: (float *)(x)) \ + const float [16]: (float *)(x), \ + const float (*)[4]: (float *)(x), \ + const float [4][4]: (float *)(x)) \ ) # define glLoadMatrixf(x) \ glLoadMatrixf(_Generic((x), \ float *: (float *)(x), \ - float (*)[4]: (float *)(x)) \ + float [16]: (float *)(x), \ + float (*)[4]: (float *)(x), \ + float [4][4]: (float *)(x)) \ ) #else # define glMultMatrixf(x) glMultMatrixf((float *)(x)) |