Commit: e7010a05beba64af032707b1818af707f398cc8d
Author: Bastien Montagne
Date: Sun May 27 18:52:28 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBe7010a05beba64af032707b1818af707f398cc8d
Merge branch 'master' into blender2.8
Conflicts:
source/blender/makesrna/intern/rna_object_api.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_scene_api.c
===================================================================
===================================================================
diff --cc source/blender/makesrna/intern/rna_ID.c
index 952d27fa18d,a0d2a76a82d..1ea452bf389
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@@ -500,11 -458,11 +500,11 @@@ static Material *rna_IDMaterials_pop_id
return ma;
}
- static void rna_IDMaterials_clear_id(ID *id, int remove_material_slot)
+ static void rna_IDMaterials_clear_id(ID *id, Main *bmain, int
remove_material_slot)
{
- BKE_material_clear_id(G.main, id, remove_material_slot);
+ BKE_material_clear_id(bmain, id, remove_material_slot);
- DAG_id_tag_update(id, OB_RECALC_DATA);
+ DEG_id_tag_update(id, OB_RECALC_DATA);
WM_main_add_notifier(NC_OBJECT | ND_DRAW, id);
WM_main_add_notifier(NC_OBJECT | ND_OB_SHADING, id);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
