Revision: 23327
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23327
Author: broken
Date: 2009-09-18 05:47:17 +0200 (Fri, 18 Sep 2009)
Log Message:
-----------
* fix for previous commit, didn't take brush strength into account
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/brush.c
Modified: trunk/blender/source/blender/blenkernel/intern/brush.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/brush.c 2009-09-18
03:41:37 UTC (rev 23326)
+++ trunk/blender/source/blender/blenkernel/intern/brush.c 2009-09-18
03:47:17 UTC (rev 23327)
@@ -441,7 +441,7 @@
dist = sqrt(xy[0]*xy[0] + xy[1]*xy[1]);
VECCOPY(dstf, brush->rgb);
- dstf[3]= brush_curve_strength(brush,
dist, maxsize);
+ dstf[3]=
brush->alpha*brush_curve_strength(brush, dist, maxsize);
}
else if (texfall == 1) {
brush_sample_tex(brush, xy, dstf);
@@ -454,7 +454,7 @@
dstf[0] = rgba[0]*brush->rgb[0];
dstf[1] = rgba[1]*brush->rgb[1];
dstf[2] = rgba[2]*brush->rgb[2];
- dstf[3] =
rgba[3]*brush_curve_strength(brush, dist, maxsize);
+ dstf[3] =
rgba[3]*brush->alpha*brush_curve_strength(brush, dist, maxsize);
}
}
}
@@ -477,7 +477,7 @@
dst[0]= crgb[0];
dst[1]= crgb[1];
dst[2]= crgb[2];
- dst[3]=
FTOCHAR(brush_curve_strength(brush, dist, maxsize));
+ dst[3]=
FTOCHAR(brush->alpha*brush_curve_strength(brush, dist, maxsize));
}
else if (texfall == 1) {
brush_sample_tex(brush, xy, rgba);
@@ -493,7 +493,7 @@
dst[0] = FTOCHAR(rgba[0]*brush->rgb[0]);
dst[1] = FTOCHAR(rgba[1]*brush->rgb[1]);
dst[2] = FTOCHAR(rgba[2]*brush->rgb[2]);
- dst[3] =
FTOCHAR(rgba[3]*brush_curve_strength(brush, dist, maxsize));
+ dst[3] =
FTOCHAR(rgba[3]*brush->alpha*brush_curve_strength(brush, dist, maxsize));
}
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
