diff options
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_utils.c')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_utils.c b/source/blender/editors/sculpt_paint/paint_utils.c index 4b5ac51a525..3f26f590b70 100644 --- a/source/blender/editors/sculpt_paint/paint_utils.c +++ b/source/blender/editors/sculpt_paint/paint_utils.c @@ -281,7 +281,7 @@ static void imapaint_pick_uv( float p[2], w[3], absw, minabsw; float matrix[4][4], proj[4][4]; int view[4]; - const eImagePaintMode mode = scene->toolsettings->imapaint.mode; + const ePaintCanvasSource mode = scene->toolsettings->imapaint.mode; const MLoopTri *lt = BKE_mesh_runtime_looptri_ensure(me_eval); const int tottri = me_eval->runtime.looptris.len; @@ -317,7 +317,7 @@ static void imapaint_pick_uv( copy_v3_v3(tri_co[j], mvert[mloop[lt->tri[j]].v].co); } - if (mode == IMAGEPAINT_MODE_MATERIAL) { + if (mode == PAINT_CANVAS_SOURCE_MATERIAL) { const Material *ma; const TexPaintSlot *slot; @@ -431,7 +431,7 @@ void paint_sample_color( Material *ma = BKE_object_material_get(ob_eval, mp->mat_nr + 1); /* Force refresh since paint slots are not updated when changing interpolation. */ - BKE_texpaint_slot_refresh_cache(scene, ma); + BKE_texpaint_slot_refresh_cache(scene, ma, ob); if (ma && ma->texpaintslot) { image = ma->texpaintslot[ma->paint_active_slot].ima; |