From 01dec326edb046d5fec272bfe62f178a2dc3e519 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 11 Mar 2019 16:48:19 +0100 Subject: Fix T62366: Grease pencil material color keying Do proper tagging for material changes, and avoid grease-pencil hack in the relations builder. The dependency graph code was forcing animation to be run for any copy-on-write change of material. However, animation is not supposed to be run on copy-on-write changes. --- source/blender/makesrna/intern/rna_material.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/makesrna') diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c index 90c46c8b03d..994efc36f00 100644 --- a/source/blender/makesrna/intern/rna_material.c +++ b/source/blender/makesrna/intern/rna_material.c @@ -91,7 +91,7 @@ static void rna_Material_update(Main *UNUSED(bmain), Scene *UNUSED(scene), Point { Material *ma = ptr->id.data; - DEG_id_tag_update(&ma->id, ID_RECALC_COPY_ON_WRITE); + DEG_id_tag_update(&ma->id, ID_RECALC_SHADING); WM_main_add_notifier(NC_MATERIAL | ND_SHADING, ma); } @@ -125,7 +125,7 @@ static void rna_Material_draw_update(Main *UNUSED(bmain), Scene *UNUSED(scene), { Material *ma = ptr->id.data; - DEG_id_tag_update(&ma->id, ID_RECALC_COPY_ON_WRITE); + DEG_id_tag_update(&ma->id, ID_RECALC_SHADING); WM_main_add_notifier(NC_MATERIAL | ND_SHADING_DRAW, ma); } -- cgit v1.2.3