diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-07 21:39:50 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-07 21:41:05 +0300 |
| commit | a261d6f2d3feb80efb51b27aa7cae56ea6c4c57d (patch) | |
| tree | 9d80597e6436f0e5f8f4eaa97cfe1eb22d8f4e8f /source/blender/blenloader | |
| parent | 8ca43a0c7b140fd40185b27e52884e5b79d79346 (diff) | |
Fix T62328, T62209: revert recent fix for texture slots updates (T60366).
This causes other issues, revert for now until a better fix is found.
Reverts commit da1323d1c95095feff98e8aa054d73fd323c363d.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index e34382dc752..de997e7002d 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -4513,7 +4513,6 @@ 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) { |