Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Sun, 27 May 2018 16:52:28 +0000 (18:52 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Sun, 27 May 2018 16:52:28 +0000 (18:52 +0200)
Conflicts:
source/blender/makesrna/intern/rna_object_api.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_scene_api.c

1  2 
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_scene_api.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);
  }