diff options
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 6db32ef120f..e55e96e31d9 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5339,7 +5339,7 @@ static void lib_link_object(FileData *fd, Main *main) /* When the object is local and the data is library its possible * the material list size gets out of sync. [#22663] */ if (ob->data && ob->id.lib != ((ID *)ob->data)->lib) { - const short *totcol_data = give_totcolp(ob); + const short *totcol_data = BKE_object_material_num(ob); /* Only expand so as not to loose 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); */ @@ -9205,7 +9205,7 @@ static void placeholders_ensure_valid(Main *bmain) for (Object *ob = bmain->objects.first; ob != NULL; ob = ob->id.next) { ID *obdata = ob->data; if (obdata != NULL && obdata->tag & LIB_TAG_MISSING) { - test_object_materials(bmain, ob, obdata); + BKE_object_materials_test(bmain, ob, obdata); } } } |