kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix T40744: MIP Map is generating strange noise in texture, Blender Internal

Browse Source
This commit is contained in:
Sergey Sharybin 2014-08-11 17:37:56 +06:00
parent e438c450b4
commit 1ca8684911
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/imbuf/intern/scaling.c
View File

@ -33,6 +33,7 @@
#include "BLI_utildefines.h" #include "BLI_utildefines.h"
#include "BLI_math_base.h"
#include "BLI_math_color.h" #include "BLI_math_color.h"
#include "BLI_math_interp.h" #include "BLI_math_interp.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
@ -309,18 +310,18 @@ MINLINE void straight_uchar_to_premul_ushort(unsigned short result[4], const uns
MINLINE void premul_ushort_to_straight_uchar(unsigned char *result, const unsigned short color[4]) MINLINE void premul_ushort_to_straight_uchar(unsigned char *result, const unsigned short color[4])
{ {
if (color[3] <= 255) { if (color[3] <= 255) {
result[0] = color[0] / 255; result[0] = USHORTTOUCHAR(color[0]);
result[1] = color[1] / 255; result[1] = USHORTTOUCHAR(color[1]);
result[2] = color[2] / 255; result[2] = USHORTTOUCHAR(color[2]);
result[3] = color[3] / 255; result[3] = USHORTTOUCHAR(color[3]);
} }
else { else {
unsigned short alpha = color[3] / 255; unsigned short alpha = color[3] / 255;
result[0] = color[0] / alpha; result[0] = USHORTTOUCHAR(color[0] / alpha * 255);
result[1] = color[1] / alpha; result[1] = USHORTTOUCHAR(color[1] / alpha * 255);
result[2] = color[2] / alpha; result[2] = USHORTTOUCHAR(color[2] / alpha * 255);
result[3] = alpha; result[3] = USHORTTOUCHAR(color[3]);
} }
} }