[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37058] branches/soc-2011-onion/source/ blender/editors/sculpt_paint/paint_image.c: warning fixes/ cleanup for last commit
Ryakiotakis Antonis
kalast at gmail.com
Tue May 31 22:31:17 CEST 2011
Revision: 37058
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37058
Author: psy-fi
Date: 2011-05-31 20:31:17 +0000 (Tue, 31 May 2011)
Log Message:
-----------
warning fixes/cleanup for last commit
Modified Paths:
--------------
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_image.c
Modified: branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_image.c 2011-05-31 20:29:44 UTC (rev 37057)
+++ branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_image.c 2011-05-31 20:31:17 UTC (rev 37058)
@@ -3656,14 +3656,11 @@
static void do_projectpaint_smear_f(ProjPaintState *ps, ProjPixel *projPixel, float alpha, float mask, MemArena *smearArena, LinkNode **smearPixels_f, float co[2])
{
- unsigned char rgba_ub[4];
- unsigned char rgba_smear[4];
float rgba[4];
if (project_paint_PickColor(ps, co, rgba, NULL, 1)==0)
return;
- //IMAPAINT_FLOAT_RGBA_TO_CHAR(rgba_smear, projPixel->pixel.f_pt);
/* (ProjPixelClone *)projPixel)->clonepx.uint = IMB_blend_color(*((unsigned int *)rgba_smear), *((unsigned int *)rgba_ub), (int)(alpha*mask*255), ps->blend); */
blend_color_mix_float(((ProjPixelClone *)projPixel)->clonepx.f, projPixel->pixel.f_pt, rgba, alpha*mask);
BLI_linklist_prepend_arena(smearPixels_f, (void *)projPixel, smearArena);
More information about the Bf-blender-cvs
mailing list