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:
Diffstat (limited to 'source/blender/blenkernel/intern/material.c')
-rw-r--r--source/blender/blenkernel/intern/material.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index 5583702aab3..17811893c03 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -246,8 +246,9 @@ Material *BKE_material_copy(Main *bmain, Material *ma)
man->preview = BKE_previewimg_copy(ma->preview);
BLI_listbase_clear(&man->gpumaterial);
-
+
if (ID_IS_LINKED_DATABLOCK(ma)) {
+ BKE_id_expand_local(&man->id);
BKE_id_lib_local_paths(bmain, ma->id.lib, &man->id);
}
@@ -302,7 +303,7 @@ void BKE_material_make_local(Main *bmain, Material *ma)
if (is_local) {
if (!is_lib) {
id_clear_lib_data(bmain, &ma->id);
- BKE_id_expand_local(&ma->id, false);
+ BKE_id_expand_local(&ma->id);
}
else {
Material *ma_new = BKE_material_copy(bmain, ma);