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:
authorBastien Montagne <bastien@blender.org>2021-11-03 19:56:25 +0300
committerBastien Montagne <bastien@blender.org>2021-11-03 19:56:25 +0300
commitd17128520d17733073b87b184d09cbd6057d28d5 (patch)
tree0411c437e49153b5ca29540b2cc21f10833e028c
parenta827864e6b1ee34af759dea61f832076c0e67c44 (diff)
Simplification: Use generic `BKE_object_materials_test` in object liblink code.
Better avoid own specific logic here, when we already have a proper 'API' function for that.
-rw-r--r--source/blender/blenkernel/intern/object.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 933e83d4f7c..dc6ef580408 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -849,6 +849,7 @@ static void object_blend_read_lib(BlendLibReader *reader, ID *id)
{
Object *ob = (Object *)id;
+ Main *bmain = BLO_read_lib_get_main(reader);
BlendFileReadReport *reports = BLO_read_lib_reports(reader);
/* XXX deprecated - old animation system <<< */
@@ -945,12 +946,7 @@ static void object_blend_read_lib(BlendLibReader *reader, ID *id)
/* When the object is local and the data is library its possible
* the material list size gets out of sync. T22663. */
if (ob->data && ob->id.lib != ((ID *)ob->data)->lib) {
- const short *totcol_data = BKE_object_material_len_p(ob);
- /* Only expand so as not to lose any object materials that might be set. */
- if (totcol_data && (*totcol_data > ob->totcol)) {
- // printf("'%s' %d -> %d\n", ob->id.name, ob->totcol, *totcol_data);
- BKE_object_material_resize(BLO_read_lib_get_main(reader), ob, *totcol_data, false);
- }
+ BKE_object_materials_test(bmain, ob, ob->data);
}
BLO_read_id_address(reader, ob->id.lib, &ob->gpd);