Revision: 17094 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17094 Author: blendix Date: 2008-10-17 15:34:20 +0200 (Fri, 17 Oct 2008)
Log Message: ----------- Fix for imagepaint soften tool giving a bit too dark results, due to poor float-to-char conversion. Modified Paths: -------------- trunk/blender/source/blender/src/imagepaint.c Modified: trunk/blender/source/blender/src/imagepaint.c =================================================================== --- trunk/blender/source/blender/src/imagepaint.c 2008-10-17 09:24:35 UTC (rev 17093) +++ trunk/blender/source/blender/src/imagepaint.c 2008-10-17 13:34:20 UTC (rev 17094) @@ -95,11 +95,10 @@ /* Defines and Structs */ -#define IMAPAINT_FLOAT_TO_CHAR(f) ((char)(f*255)) #define IMAPAINT_CHAR_TO_FLOAT(c) (c/255.0f) -#define IMAPAINT_FLOAT_RGB_TO_CHAR(c, f) { c[0]=IMAPAINT_FLOAT_TO_CHAR(f[0]); \ - c[1]=IMAPAINT_FLOAT_TO_CHAR(f[1]); c[2]=IMAPAINT_FLOAT_TO_CHAR(f[2]); } +#define IMAPAINT_FLOAT_RGB_TO_CHAR(c, f) { c[0]=FTOCHAR(f[0]); \ + c[1]=FTOCHAR(f[1]); c[2]=FTOCHAR(f[2]); } #define IMAPAINT_CHAR_RGB_TO_FLOAT(f, c) { f[0]=IMAPAINT_CHAR_TO_FLOAT(c[0]); \ f[1]=IMAPAINT_CHAR_TO_FLOAT(c[1]); f[2]=IMAPAINT_CHAR_TO_FLOAT(c[2]); } #define IMAPAINT_FLOAT_RGB_COPY(a, b) VECCOPY(a, b) _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs