griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.4-release'

Browse Source
This commit is contained in:
Falk David
2025-03-10 16:14:37 +01:00
parent b0dfc90368 1f780a5caa
commit 3bbf7aed91
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/makesrna/intern/rna_modifier.cc
View File

@@ -2100,10 +2100,15 @@ static void rna_GreasePencilModifier_material_set(PointerRNA *ptr,
Material **ma_target)
{
Object *ob = reinterpret_cast<Object *>(ptr->owner_id);
Material *ma_old = *ma_target;
Material *ma = reinterpret_cast<Material *>(value.data);
if (ma == nullptr || BKE_object_material_index_get(ob, ma) != -1) {
id_lib_extern(reinterpret_cast<ID *>(ob));
id_us_min(&ma_old->id);
id_us_plus_no_lib(&ma->id);
if (!ID_IS_LINKED(&ob->id)) {
id_lib_extern(&ma->id);
}
*ma_target = ma;
}
else {