Merging r59136 through r59152 from trunk into soc-2013-depsgraph_mt
[blender.git] / source / blender / blenloader / intern / readfile.c
index 2c642403c077827891442fa5c264cccabe817ca1..f9d6c55a1329282e27e6e87a9421a82d5cf4d399 100644 (file)
@@ -4341,7 +4341,7 @@ static void lib_link_object(FileData *fd, Main *main)
                                /* 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); */
-                                       resize_object_material(ob, *totcol_data);
+                                       BKE_material_resize_object(ob, *totcol_data, false);
                                }
                        }