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_vertex.c | |
| parent | 97062a1b9b2c89a9372b5870418684551b111bab (diff) | |
| parent | fe566a30f3c7ae835c1f2750fb773073b8e40622 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_vertex.c')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_vertex.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index bf20146f195..42c5aea152a 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -348,7 +348,7 @@ static void tex_color_alpha( const Brush *brush = BKE_paint_brush(&vp->paint); BLI_assert(brush->mtex.tex != NULL); if (brush->mtex.brush_map_mode == MTEX_MAP_MODE_3D) { - BKE_brush_sample_tex_3D(vc->scene, brush, co, r_rgba, 0, NULL); + BKE_brush_sample_tex_3d(vc->scene, brush, co, r_rgba, 0, NULL); } else { float co_ss[2]; /* screenspace */ @@ -358,7 +358,7 @@ static void tex_color_alpha( V3D_PROJ_TEST_CLIP_BB | V3D_PROJ_TEST_CLIP_NEAR) == V3D_PROJ_RET_OK) { const float co_ss_3d[3] = {co_ss[0], co_ss[1], 0.0f}; /* we need a 3rd empty value */ - BKE_brush_sample_tex_3D(vc->scene, brush, co_ss_3d, r_rgba, 0, NULL); + BKE_brush_sample_tex_3d(vc->scene, brush, co_ss_3d, r_rgba, 0, NULL); } else { zero_v4(r_rgba); |