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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-11-02 18:02:46 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-11-02 18:54:07 +0300
commit3e5483ffe10567731e3e84bb6f9ccc6ba1cdbce8 (patch)
tree1d29ec0ae82cd66ecf6a0badc8f06c411a04d188 /source/blender/makesrna/intern/rna_material.c
parent500ebf7348bbc9307537fa51b1600f18be83d134 (diff)
Fix T57316: material preview icons not updating.
The editors update callback was getting the COW datablock, it should be the original where the preview icons are stored.
Diffstat (limited to 'source/blender/makesrna/intern/rna_material.c')
-rw-r--r--source/blender/makesrna/intern/rna_material.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index 42ec5871109..2d38a99af63 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -114,27 +114,8 @@ static void rna_Material_update_previews(Main *UNUSED(bmain), Scene *UNUSED(scen
static void rna_MaterialGpencil_update(Main *bmain, Scene *scene, PointerRNA *ptr)
{
Material *ma = ptr->id.data;
- PreviewImage *preview = ma->preview;
rna_Material_update(bmain, scene, ptr);
-
- /* update previews (icon and thumbnail) */
- if (preview != NULL) {
- bool changed = false;
- if ((preview->flag[ICON_SIZE_ICON] & PRV_CHANGED) == 0) {
- preview->flag[ICON_SIZE_ICON] |= PRV_CHANGED;
- changed = true;
- }
-
- if ((preview->flag[ICON_SIZE_PREVIEW] & PRV_CHANGED) == 0) {
- preview->flag[ICON_SIZE_PREVIEW] |= PRV_CHANGED;
- changed = true;
- }
-
- if (changed) {
- WM_main_add_notifier(NC_MATERIAL | ND_SHADING_PREVIEW, ma);
- }
- }
WM_main_add_notifier(NC_GPENCIL | ND_DATA, ma);
}
@@ -143,7 +124,6 @@ static void rna_MaterialGpencil_nopreview_update(Main *bmain, Scene *scene, Poin
Material *ma = ptr->id.data;
rna_Material_update(bmain, scene, ptr);
-
WM_main_add_notifier(NC_GPENCIL | ND_DATA, ma);
}