[Bf-blender-cvs] [27d799698d5] master: Fix T61065: missing shader update when adding texture slot.

Brecht Van Lommel noreply at git.blender.org
Thu Jan 31 19:33:51 CET 2019


Commit: 27d799698d5af604c87e792c519df463cd6c33ff
Author: Brecht Van Lommel
Date:   Thu Jan 31 19:31:43 2019 +0100
Branches: master
https://developer.blender.org/rB27d799698d5af604c87e792c519df463cd6c33ff

Fix T61065: missing shader update when adding texture slot.

===================================================================

M	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 5c0efa911c4..d05903738d4 100644
--- a/source/blender/editors/sculpt_paint/paint_image_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.c
@@ -6026,13 +6026,15 @@ static bool proj_paint_add_slot(bContext *C, wmOperator *op)
 			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(&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);
+		DEG_id_tag_update(&ntree->id, 0);
+		DEG_id_tag_update(&ma->id, ID_RECALC_SHADING);
+		ED_area_tag_redraw(CTX_wm_area(C));
 
-			return true;
-		}
+		BKE_paint_proj_mesh_data_check(scene, ob, NULL, NULL, NULL, NULL);
+
+		return true;
 	}
 
 	return false;



More information about the Bf-blender-cvs mailing list