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>2018-12-04 14:30:24 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-12-04 14:31:32 +0300
commit3d013f7b10b6837ab29eccf9a203477e13d278a2 (patch)
tree6971432c1bb96e2ab540d7dd8337e2580e39ce9c /source/blender/blenkernel/intern/material.c
parente6141d7b3be8520e030de7b9e57264a76aeb588d (diff)
Fix for assert failure in material preview
All localized datablocks are not supposed to have animation data associated with them. There was an easy way to reproduce assert failure: toggle animation decorator for Viewport Display -> Color.
Diffstat (limited to 'source/blender/blenkernel/intern/material.c')
-rw-r--r--source/blender/blenkernel/intern/material.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index 6741ebf39d2..d45b19bc0bf 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -235,7 +235,7 @@ Material *BKE_material_localize(Material *ma)
*
* NOTE: Only possible once nested node trees are fully converted to that too. */
- Material *man = BKE_libblock_copy_nolib(&ma->id, false);
+ Material *man = BKE_libblock_copy_for_localize(&ma->id);
man->texpaintslot = NULL;
man->preview = NULL;