livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ACME-1300 : Rename blend mode dodge to add_back

meow-7.2.2
Merov Linden 2014-02-05 18:56:58 -08:00
parent f217aa7c8b
commit 225fb4e782
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/llimage/llimagefilter.cpp
View File

@ -134,9 +134,9 @@ void LLImageFilter::executeFilter(LLPointer<LLImageRaw> raw_image)
{
mode = STENCIL_BLEND_MODE_ADD;
}
else if (filter_mode == "dodge")
else if (filter_mode == "add_back")
{
mode = STENCIL_BLEND_MODE_DODGE;
mode = STENCIL_BLEND_MODE_ABACK;
}
else if (filter_mode == "fade")
{
@ -273,8 +273,8 @@ void LLImageFilter::blendStencil(F32 alpha, U8* pixel, U8 red, U8 green, U8 blue
pixel[VGREEN] = llclampb(pixel[VGREEN] + alpha * green);
pixel[VBLUE] = llclampb(pixel[VBLUE] + alpha * blue);
break;
case STENCIL_BLEND_MODE_DODGE:
// Dodge/burn the incoming color onto the background image
case STENCIL_BLEND_MODE_ABACK:
// Add back background image to the incoming color
pixel[VRED] = llclampb(inv_alpha * pixel[VRED] + red);
pixel[VGREEN] = llclampb(inv_alpha * pixel[VGREEN] + green);
pixel[VBLUE] = llclampb(inv_alpha * pixel[VBLUE] + blue);

2
indra/llimage/llimagefilter.h
View File

@ -38,7 +38,7 @@ typedef enum e_stencil_blend_mode
{
STENCIL_BLEND_MODE_BLEND = 0,
STENCIL_BLEND_MODE_ADD = 1,
STENCIL_BLEND_MODE_DODGE = 2,
STENCIL_BLEND_MODE_ABACK = 2,
STENCIL_BLEND_MODE_FADE = 3
} EStencilBlendMode;