Follow up to previous commit. Non tiled mask wouldn't work on airbrushes
authorAntony Riakiotakis <kalast@gmail.com>
Thu, 23 May 2013 21:37:18 +0000 (21:37 +0000)
committerAntony Riakiotakis <kalast@gmail.com>
Thu, 23 May 2013 21:37:18 +0000 (21:37 +0000)
source/blender/editors/sculpt_paint/paint_image_proj.c

index 9189202c3c74e8cddbf6375a707abd8db09b3a43..604151b1e1eea297dc5464e861cf6ca2c30b29c0 100644 (file)
@@ -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) {