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>2019-02-28 16:09:19 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-02-28 21:17:16 +0300
commitda1323d1c95095feff98e8aa054d73fd323c363d (patch)
tree021ec89b4a50696ba8b6ae02df82f278354812cf /source/blender/blenloader
parentacd462347196fef9450115f28ac2594cb12b0226 (diff)
Fix T60366: texture paint slots not updating when editing material.
Now always refresh when the material changes. Depsgraph tag moved out of the refresh function since that gets called on depsgraph update, which should not trigger a second depsgraph update.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/readfile.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 250c4aacfc6..7145e67a4f2 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4513,6 +4513,7 @@ static void direct_link_material(FileData *fd, Material *ma)
direct_link_animdata(fd, ma->adt);
ma->texpaintslot = NULL;
+ ma->tot_slots = 0;
ma->nodetree = newdataadr(fd, ma->nodetree);
if (ma->nodetree) {