From a261d6f2d3feb80efb51b27aa7cae56ea6c4c57d Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 7 Mar 2019 19:39:50 +0100 Subject: Fix T62328, T62209: revert recent fix for texture slots updates (T60366). This causes other issues, revert for now until a better fix is found. Reverts commit da1323d1c95095feff98e8aa054d73fd323c363d. --- source/blender/editors/sculpt_paint/paint_image_proj.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/editors/sculpt_paint/paint_image_proj.c') diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 7e767a6161f..e26d9b1ef9d 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -5991,7 +5991,7 @@ bool BKE_paint_proj_mesh_data_check(Scene *scene, Object *ob, bool *uvs, bool *m hasmat = true; if (!ma->texpaintslot) { /* refresh here just in case */ - BKE_texpaint_slot_refresh_cache(ma); + BKE_texpaint_slot_refresh_cache(scene, ma); /* if still no slots, we have to add */ if (ma->texpaintslot) { @@ -6251,13 +6251,13 @@ static bool proj_paint_add_slot(bContext *C, wmOperator *op) nodePositionPropagate(out_node); if (ima) { - BKE_texpaint_slot_refresh_cache(ma); + BKE_texpaint_slot_refresh_cache(scene, ma); BKE_image_signal(bmain, ima, NULL, IMA_SIGNAL_USER_NEW_IMAGE); WM_event_add_notifier(C, NC_IMAGE | NA_ADDED, ima); } DEG_id_tag_update(&ntree->id, 0); - DEG_id_tag_update(&ma->id, ID_RECALC_SHADING | ID_RECALC_COPY_ON_WRITE); + DEG_id_tag_update(&ma->id, ID_RECALC_SHADING); ED_area_tag_redraw(CTX_wm_area(C)); BKE_paint_proj_mesh_data_check(scene, ob, NULL, NULL, NULL, NULL); -- cgit v1.2.3