Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-03-11 18:48:19 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-03-11 18:49:52 +0300
commit01dec326edb046d5fec272bfe62f178a2dc3e519 (patch)
treeebeaa52d593a634a2b9792b6e92d17ae3dd4edc0 /source/blender/makesrna
parent4879d8001c00fde6b7a82b98004668e0860e344d (diff)
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.
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r--source/blender/makesrna/intern/rna_material.c4
1 files changed, 2 insertions, 2 deletions
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);
}