diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-06-26 10:09:59 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-06-26 10:09:59 +0400 |
commit | 1b76c638ad4a438028c3b76a67f22b7c0fec1ea6 (patch) | |
tree | 3221921e12b44386f09bdcbcf2622275a8703f5f /source/blender/editors/interface | |
parent | a4d9c8f579a4ba2b66f2f5b8b7bbd6be9c1d4cda (diff) |
Code cleanup: remove MAT3/4_UNITY defines, just call unit_m3/4
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r-- | source/blender/editors/interface/interface_draw.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c index 47334d6f77c..cc9f8ff00a9 100644 --- a/source/blender/editors/interface/interface_draw.c +++ b/source/blender/editors/interface/interface_draw.c @@ -587,7 +587,7 @@ void ui_draw_but_WAVEFORM(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wcol), int i, c; float w, w3, h, alpha, yofs; GLint scissor[4]; - float colors[3][3] = MAT3_UNITY; + float colors[3][3]; float colorsycc[3][3] = {{1, 0, 1}, {1, 1, 0}, {0, 1, 1}}; float colors_alpha[3][3], colorsycc_alpha[3][3]; /* colors pre multiplied by alpha for speed up */ float min, max; @@ -609,6 +609,8 @@ void ui_draw_but_WAVEFORM(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wcol), /* log scale for alpha */ alpha = scopes->wavefrm_alpha * scopes->wavefrm_alpha; + unit_m3(colors); + for (c = 0; c < 3; c++) { for (i = 0; i < 3; i++) { colors_alpha[c][i] = colors[c][i] * alpha; |