Commit: 22a14f8d5cee17b703d97997f295a33f759c700a Author: Antonio Vazquez Date: Tue May 29 17:38:28 2018 +0200 Branches: greasepencil-object https://developer.blender.org/rB22a14f8d5cee17b703d97997f295a33f759c700a
Merge branch 'blender2.8' into greasepencil-object =================================================================== =================================================================== diff --cc source/blender/blenkernel/BKE_material.h index c938d5eeb53,c85017a2216..1ca8928c61d --- a/source/blender/blenkernel/BKE_material.h +++ b/source/blender/blenkernel/BKE_material.h @@@ -81,16 -79,14 +81,16 @@@ enum }; struct Material *give_current_material(struct Object *ob, short act); - void assign_material_id(struct ID *id, struct Material *ma, short act); - void assign_material(struct Object *ob, struct Material *ma, short act, int assign_type); - void assign_matarar(struct Object *ob, struct Material ***matar, short totcol); + void assign_material_id(struct Main *bmain, struct ID *id, struct Material *ma, short act); + void assign_material(struct Main *bmain, struct Object *ob, struct Material *ma, short act, int assign_type); + void assign_matarar(struct Main *bmain, struct Object *ob, struct Material ***matar, short totcol); short BKE_object_material_slot_find_index(struct Object *ob, struct Material *ma); - bool BKE_object_material_slot_add(struct Object *ob); - bool BKE_object_material_slot_remove(struct Object *ob); + bool BKE_object_material_slot_add(struct Main *bmain, struct Object *ob); + bool BKE_object_material_slot_remove(struct Main *bmain, struct Object *ob); +struct MaterialGPencilStyle *BKE_material_gpencil_settings_get(struct Object *ob, short act); + void BKE_texpaint_slot_refresh_cache(struct Scene *scene, struct Material *ma); void BKE_texpaint_slots_refresh_object(struct Scene *scene, struct Object *ob); _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
