diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-29 16:49:21 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-29 16:49:21 +0300 |
commit | f7af08b5feecd89ea32c8905de1e61d575ff4bf1 (patch) | |
tree | b23f8e58157285ce3c6287f664f66bfcba85a69d /source/blender/makesrna/intern/rna_object.c | |
parent | c72a204001ae32ab082af66b373ce19b64e28e2d (diff) |
Cleanup: Get rid of G.main in BKE_material.
Note that in some cases, this only moves the G.main case to somne other
places - in particular, RNA getters/setters are becoming annoying here...
Diffstat (limited to 'source/blender/makesrna/intern/rna_object.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 49d8bd796d9..b1fcfcb9aa6 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -393,7 +393,7 @@ static void rna_Object_data_set(PointerRNA *ptr, PointerRNA value) } } else if (ob->type == OB_MESH) { - BKE_mesh_assign_object(ob, (Mesh *)id); + BKE_mesh_assign_object(G.main, ob, (Mesh *)id); } else { if (ob->data) { @@ -405,7 +405,7 @@ static void rna_Object_data_set(PointerRNA *ptr, PointerRNA value) id_us_plus(id); ob->data = id; - test_object_materials(ob, id); + test_object_materials(G.main, ob, id); if (GS(id->name) == ID_CU) BKE_curve_type_test(ob); @@ -713,7 +713,7 @@ static void rna_Object_active_material_set(PointerRNA *ptr, PointerRNA value) Object *ob = (Object *)ptr->id.data; DAG_id_tag_update(value.data, 0); - assign_material(ob, value.data, ob->actcol, BKE_MAT_ASSIGN_EXISTING); + assign_material(G.main, ob, value.data, ob->actcol, BKE_MAT_ASSIGN_EXISTING); } static int rna_Object_active_material_editable(PointerRNA *ptr, const char **UNUSED(r_info)) @@ -885,7 +885,7 @@ static void rna_MaterialSlot_material_set(PointerRNA *ptr, PointerRNA value) Object *ob = (Object *)ptr->id.data; int index = (Material **)ptr->data - ob->mat; - assign_material(ob, value.data, index + 1, BKE_MAT_ASSIGN_EXISTING); + assign_material(G.main, ob, value.data, index + 1, BKE_MAT_ASSIGN_EXISTING); } static int rna_MaterialSlot_link_get(PointerRNA *ptr) |