Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2013-05-24 01:37:18 +0400
committerAntony Riakiotakis <kalast@gmail.com>2013-05-24 01:37:18 +0400
commitca3905fe77b8c5e14e1054607567a756504b719b (patch)
treef568e6f2cdac6ce6091b129ddbb94cd3071bbe39 /source/blender/editors/sculpt_paint
parent902e3ddd11335f1210a8df8fbcd0229a8d2efd62 (diff)
Follow up to previous commit. Non tiled mask wouldn't work on airbrushes
Diffstat (limited to 'source/blender/editors/sculpt_paint')
-rw-r--r--source/blender/editors/sculpt_paint/paint_image_proj.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c
index 9189202c3c7..604151b1e1e 100644
--- a/source/blender/editors/sculpt_paint/paint_image_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.c
@@ -3863,6 +3863,11 @@ static void *do_projectpaint_thread(void *ph_v)
}
else {
mask *= brush_alpha;
+ if (ps->is_maskbrush) {
+ float texmask = BKE_brush_sample_masktex(ps->scene, ps->brush, projPixel->projCoSS, thread_index, pool);
+ CLAMP(texmask, 0.0, 1.0);
+ mask *= texmask;
+ }
}
if (ps->is_texbrush) {