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

Fix T48961: Material slots become easily desynced over linked duplicates.

Browse Source 
Own mistake in recent changes (split to test_object_materials()/test_all_objects_materials()).
This commit is contained in:
Bastien Montagne
2016-07-28 09:23:46 +02:00
parent d60acd0e94
commit d66a27de2e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/intern/material.c
View File

@@ -742,17 +742,18 @@ void assign_material(Object *ob, Material *ma, short act, int assign_type)
if (mao)
id_us_min(&mao->id);
ob->mat[act - 1] = ma;
test_object_materials(ob, ob->data);
}
else { /* in data */
mao = (*matarar)[act - 1];
if (mao)
id_us_min(&mao->id);
(*matarar)[act - 1] = ma;
test_all_objects_materials(G.main, ob->data); /* Data may be used by several objects... */
}
if (ma)
id_us_plus(&ma->id);
test_object_materials(ob, ob->data);
}