diff options
author | Campbell Barton <ideasman42@gmail.com> | 2016-07-20 22:56:12 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2016-07-20 23:02:34 +0300 |
commit | e0f16bdcc2892036aadb56ced343045822070aaa (patch) | |
tree | 4a76f29b4b8666cb4a9e13cbbabd332c7af0a88a /source/blender/blenkernel/BKE_material.h | |
parent | dd020caa04cfa009a6ff0b6e9b78ff32bdf514ef (diff) |
Cleanup: use BKE naming convention for object materials
Also remove unused 'material_from' function (which isn't very useful).
Diffstat (limited to 'source/blender/blenkernel/BKE_material.h')
-rw-r--r-- | source/blender/blenkernel/BKE_material.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_material.h b/source/blender/blenkernel/BKE_material.h index bbe104cd6ee..ddead79633f 100644 --- a/source/blender/blenkernel/BKE_material.h +++ b/source/blender/blenkernel/BKE_material.h @@ -78,15 +78,13 @@ enum { }; struct Material *give_current_material(struct Object *ob, short act); -struct ID *material_from(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); -short find_material_index(struct Object *ob, struct Material *ma); - -bool object_add_material_slot(struct Object *ob); -bool object_remove_material_slot(struct Object *ob); +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); void BKE_texpaint_slot_refresh_cache(struct Scene *scene, struct Material *ma); void BKE_texpaint_slots_refresh_object(struct Scene *scene, struct Object *ob); |