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:
authorXavier Thomas <xavier.thomas.1980@gmail.com>2010-05-10 07:42:22 +0400
committerXavier Thomas <xavier.thomas.1980@gmail.com>2010-05-10 07:42:22 +0400
commitbd4fe1b71dea85947f4d670ea749d7e07a2ed83c (patch)
tree484d9f6d007e9d5bcb07263b257bfe2da2e063ee /source/blender/editors/interface/interface_draw.c
parent413c4c91ca26d087db9c0b42937a95fa235c6a28 (diff)
Fix for histogram Luma mode not working when waveform is in RGB mode.
Also unified the scope vocabulary.
Diffstat (limited to 'source/blender/editors/interface/interface_draw.c')
-rw-r--r--source/blender/editors/interface/interface_draw.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c
index 20359b2c3a4..0dd333dc387 100644
--- a/source/blender/editors/interface/interface_draw.c
+++ b/source/blender/editors/interface/interface_draw.c
@@ -861,7 +861,7 @@ void ui_draw_but_WAVEFORM(ARegion *ar, uiBut *but, uiWidgetColors *wcol, rcti *r
glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
}
/* 3 vertical separation */
- if (scopes->wavefrm_mode!= SCOPES_WAVEFRM_LUM) {
+ if (scopes->wavefrm_mode!= SCOPES_WAVEFRM_LUMA) {
for (i=1; i<3; i++) {
fdrawline(rect.xmin+i*w3, rect.ymin, rect.xmin+i*w3, rect.ymax);
}
@@ -878,7 +878,7 @@ void ui_draw_but_WAVEFORM(ARegion *ar, uiBut *but, uiWidgetColors *wcol, rcti *r
fdrawline(rect.xmin+w3, yofs+h*240.0f/255.0f, rect.xmax+1, yofs+h*240.0f/255.0f);
}
/* 7.5 IRE black point level for NTSC */
- if (scopes->wavefrm_mode== SCOPES_WAVEFRM_LUM)
+ if (scopes->wavefrm_mode== SCOPES_WAVEFRM_LUMA)
fdrawline(rect.xmin, yofs+h*0.075f, rect.xmax+1, yofs+h*0.075f);
if (scopes->ok && scopes->waveform_1 != NULL) {
@@ -886,7 +886,7 @@ void ui_draw_but_WAVEFORM(ARegion *ar, uiBut *but, uiWidgetColors *wcol, rcti *r
/* LUMA (1 channel) */
glBlendFunc(GL_ONE,GL_ONE);
glColor3f(alpha, alpha, alpha);
- if (scopes->wavefrm_mode == SCOPES_WAVEFRM_LUM){
+ if (scopes->wavefrm_mode == SCOPES_WAVEFRM_LUMA){
glBlendFunc(GL_ONE,GL_ONE);