[Bf-blender-cvs] [7c229172a6f] master: UI_GetThemeColorShadeAlpha4fv not clamping alpha channel
Harley Acheson
noreply at git.blender.org
Mon Jun 17 19:23:16 CEST 2019
Commit: 7c229172a6f2cc90510aca0464f1dcce1fe5a2b3
Author: Harley Acheson
Date: Mon Jun 17 10:21:27 2019 -0700
Branches: master
https://developer.blender.org/rB7c229172a6f2cc90510aca0464f1dcce1fe5a2b3
UI_GetThemeColorShadeAlpha4fv not clamping alpha channel
Fixing small error in UI_GetThemeColorShadeAlpha4fv() clamping blue channel twice instead of alpha
Differential Revision: https://developer.blender.org/D5048
Reviewed by Brecht Van Lommel
===================================================================
M source/blender/editors/interface/resources.c
===================================================================
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index cbda4767722..e281c6c9e9c 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -1239,7 +1239,7 @@ void UI_GetThemeColorShadeAlpha4fv(int colorid, int coloffset, int alphaoffset,
b = coloffset + (int)cp[2];
CLAMP(b, 0, 255);
a = alphaoffset + (int)cp[3];
- CLAMP(b, 0, 255);
+ CLAMP(a, 0, 255);
col[0] = ((float)r) / 255.0f;
col[1] = ((float)g) / 255.0f;
More information about the Bf-blender-cvs
mailing list