diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-11-13 06:24:41 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-13 06:25:36 +0300 |
commit | 184ab749c38a6e90744022a030bec6a6ee584a0a (patch) | |
tree | c7ed0a96e402dbbd7225447ec3249dce4c1a322b /source/blender/editors/sculpt_paint/paint_image_proj.c | |
parent | 97062a1b9b2c89a9372b5870418684551b111bab (diff) | |
parent | fe566a30f3c7ae835c1f2750fb773073b8e40622 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_image_proj.c')
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_image_proj.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 6ed502ec016..6ef4a230a57 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -4730,7 +4730,7 @@ static void *do_projectpaint_thread(void *ph_v) } /* note, for clone and smear, we only use the alpha, could be a special function */ - BKE_brush_sample_tex_3D(ps->scene, brush, samplecos, texrgba, thread_index, pool); + BKE_brush_sample_tex_3d(ps->scene, brush, samplecos, texrgba, thread_index, pool); copy_v3_v3(texrgb, texrgba); mask *= texrgba[3]; |