diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-29 16:59:18 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-29 17:02:53 +0300 |
| commit | 8f670dd855b1d81fcf619b3b94ba4bfaf51e896d (patch) | |
| tree | 681c0dabf0af6e17ead533d174fde08e55e9cd0f /source/blender/blenkernel/BKE_material.h | |
| parent | 9d037153f70c9bcc665fffa4971d1517044dbf29 (diff) | |
| parent | f7af08b5feecd89ea32c8905de1e61d575ff4bf1 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/BKE_material.h
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/material.c
source/blender/editors/object/object_relations.c
source/blender/editors/render/render_preview.c
source/blender/makesrna/intern/rna_object.c
Diffstat (limited to 'source/blender/blenkernel/BKE_material.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_material.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/blenkernel/BKE_material.h b/source/blender/blenkernel/BKE_material.h index 43f36618c19..c85017a2216 100644 --- a/source/blender/blenkernel/BKE_material.h +++ b/source/blender/blenkernel/BKE_material.h @@ -47,7 +47,7 @@ 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 Object *ob, struct ID *id); +void test_object_materials(struct Main *bmain, struct Object *ob, struct ID *id); void test_all_objects_materials(struct Main *bmain, struct ID *id); void BKE_material_resize_object(struct Main *bmain, struct Object *ob, const short totcol, bool do_id_user); void BKE_material_init(struct Material *ma); @@ -79,13 +79,13 @@ 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); void BKE_texpaint_slot_refresh_cache(struct Scene *scene, struct Material *ma); void BKE_texpaint_slots_refresh_object(struct Scene *scene, struct Object *ob); @@ -102,8 +102,8 @@ void ramp_blend(int type, float r_col[3], const float fac, const float col[3]); /* copy/paste */ void clear_matcopybuf(void); void free_matcopybuf(void); -void copy_matcopybuf(struct Material *ma); -void paste_matcopybuf(struct Material *ma); +void copy_matcopybuf(struct Main *bmain, struct Material *ma); +void paste_matcopybuf(struct Main *bmain, struct Material *ma); /* Evaluation. */ |