Rework/split test_object_materials().

Now test_object_materials only handles one object. New test_all_objects_materials
checks the whole bmain->object list for cases where it is actually needed.

Should avoid some useless looping over all objects!

diff --git a/source/blender/blenkernel/BKE_material.h b/source/blender/blenkernel/BKE_material.h
index 852564c8d90ffb899678c2296008899fc59c691c..d79214f3076381e76936b4edf5e8f83660e95d7c 100644 (file)
--- a/source/blender/blenkernel/BKE_material.h
+++ b/source/blender/blenkernel/BKE_material.h
@@ -47,7 +47,8 @@ struct Scene;
 void init_def_material(void);
 void BKE_material_free(struct Material *ma);
 void BKE_material_free_ex(struct Material *ma, bool do_id_user);
-void test_object_materials(struct Main *bmain, struct ID *id);
+void test_object_materials(struct Object *ob, struct ID *id);
+void test_all_objects_materials(struct Main *bmain, struct ID *id);
 void BKE_material_resize_object(struct Object *ob, const short totcol, bool do_id_user);
 void BKE_material_init(struct Material *ma);
 void BKE_material_remap_object(struct Object *ob, const unsigned int *remap);

diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index 7231620550ec6e9ac8b614092e76ccf61ea316a1..5e1dc66d8596387479a0cbe83a65a893731b9799 100644 (file)
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -611,7 +611,7 @@ void BKE_material_append_id(ID *id, Material *ma)
                (*matar)[(*totcol)++] = ma;
 
                id_us_plus((ID *)ma);
-               test_object_materials(G.main, id);
+               test_all_objects_materials(G.main, id);
        }
 }
 
@@ -637,7 +637,7 @@ Material *BKE_material_pop_id(ID *id, int index_i, bool update_data)
 
                                (*totcol)--;
                                *matar = MEM_reallocN(*matar, sizeof(void *) * (*totcol));
-                               test_object_materials(G.main, id);
+                               test_all_objects_materials(G.main, id);
                        }
 
                        if (update_data) {
@@ -776,7 +776,19 @@ void BKE_material_resize_object(Object *ob, const short totcol, bool do_id_user)
        if (ob->actcol > ob->totcol) ob->actcol = ob->totcol;
 }
 
-void test_object_materials(Main *bmain, ID *id)
+void test_object_materials(Object *ob, ID *id)
+{
+       /* make the ob mat-array same size as 'ob->data' mat-array */
+       const short *totcol;
+
+       if (id == NULL || (totcol = give_totcolp_id(id)) == NULL) {
+               return;
+       }
+
+       BKE_material_resize_object(ob, *totcol, false);
+}
+
+void test_all_objects_materials(Main *bmain, ID *id)
 {
        /* make the ob mat-array same size as 'ob->data' mat-array */
        Object *ob;
@@ -787,7 +799,7 @@ void test_object_materials(Main *bmain, ID *id)
        }
 
        BKE_main_lock(bmain);
-       for (ob = bmain->object.first; ob; ob = ob->id.next) {
+       for (bmain = bmain->object.first; ob; ob = ob->id.next) {
                if (ob->data == id) {
                        BKE_material_resize_object(ob, *totcol, false);
                }
@@ -839,7 +851,7 @@ void assign_material_id(ID *id, Material *ma, short act)
        if (ma)
                id_us_plus(&ma->id);
 
-       test_object_materials(G.main, id);
+       test_all_objects_materials(G.main, id);
 }
 
 void assign_material(Object *ob, Material *ma, short act, int assign_type)
@@ -924,7 +936,7 @@ void assign_material(Object *ob, Material *ma, short act, int assign_type)
 
        if (ma)
                id_us_plus(&ma->id);
-       test_object_materials(G.main, ob->data);
+       test_object_materials(ob, ob->data);
 }
 
 

diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index 129f89c2b8e968f10aed3bf86b9dcfd392a7bc66..6eaa8863172b6c07b6f88be4bcf0cf1fd375b43d 100644 (file)
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -1010,7 +1010,7 @@ void BKE_mesh_assign_object(Object *ob, Mesh *me)
                id_us_plus((ID *)me);
        }
        
-       test_object_materials(G.main, (ID *)me);
+       test_object_materials(ob, (ID *)me);
 
        test_object_modifiers(ob);
 }
@@ -2518,8 +2518,8 @@ Mesh *BKE_mesh_new_from_object(
                BKE_mesh_tessface_ensure(tmpmesh);
        }
 
-       /* make sure materials get updated in objects */
-       test_object_materials(bmain, &tmpmesh->id);
+       /* make sure materials get updated in object */
+       test_object_materials(tmpobj ? tmpobj : ob, &tmpmesh->id);
 
        return tmpmesh;
 }

diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c
index 123f701d4053de76c074ce2fcee4a3457e1ea972..05145f7bf291b9f9c4face7fecb798c2e345edf0 100644 (file)
--- a/source/blender/editors/mesh/meshtools.c
+++ b/source/blender/editors/mesh/meshtools.c
@@ -540,7 +540,7 @@ int join_mesh_exec(bContext *C, wmOperator *op)
        if (matmap) MEM_freeN(matmap);
        
        /* other mesh users */
-       test_object_materials(bmain, (ID *)me);
+       test_all_objects_materials(bmain, (ID *)me);
        
        /* free temp copy of destination shapekeys (if applicable) */
        if (nkey) {

diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index 9a6fe5ae48b257bc2790e7ca9935a48b4ffca5ea..af1c840b902278a455186aba75b89eb053ab5bc0 100644 (file)
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -1564,7 +1564,7 @@ static int make_links_data_exec(bContext *C, wmOperator *op)
                                                ob_dst->data = obdata_id;
 
                                                /* if amount of material indices changed: */
-                                               test_object_materials(bmain, ob_dst->data);
+                                               test_object_materials(ob_dst, ob_dst->data);
 
                                                DAG_id_tag_update(&ob_dst->id, OB_RECALC_DATA);
                                                break;

diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
index 5c361de8d8d969a00754aaa6323d1a1a9694ad1a..f63cf7711209157a5e1131c211bf8a8aa65f987c 100644 (file)
--- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
@@ -907,7 +907,7 @@ void BlenderStrokeRenderer::GenerateStrokeMesh(StrokeGroup *group, bool hasTex)
                material_index++;
        } // loop over strokes
 
-       test_object_materials(freestyle_bmain, (ID *)mesh);
+       test_object_materials(object_mesh, (ID *)mesh);
 
 #if 0 // XXX
        BLI_assert(mesh->totvert == vertex_index);

diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c
index 334ba060645ec0347d5693af5d3575f2bf6350df..0083207efd008bebaaef454513b2c1e896bddf1c 100644 (file)
--- a/source/blender/makesrna/intern/rna_main_api.c
+++ b/source/blender/makesrna/intern/rna_main_api.c
@@ -227,7 +227,7 @@ static Object *rna_Main_objects_new(Main *bmain, ReportList *reports, const char
        id_us_min(&ob->id);
 
        ob->data = data;
-       test_object_materials(bmain, ob->data);
+       test_object_materials(ob, ob->data);
 
        return ob;
 }

diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 5dc4bbd83dd4860ed59f7f79edf99ef81ebd75e6..f15625259a91ed742d880977d6703713a484ebca 100644 (file)
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -398,7 +398,7 @@ static void rna_Object_data_set(PointerRNA *ptr, PointerRNA value)
                id_us_plus(id);
 
                ob->data = id;
-               test_object_materials(G.main, id);
+               test_object_materials(ob, id);
 
                if (GS(id->name) == ID_CU)
                        BKE_curve_type_test(ob);