diff options
author | Gaia Clary <gaia.clary@machinimatrix.org> | 2012-08-12 21:12:07 +0400 |
---|---|---|
committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2012-08-12 21:12:07 +0400 |
commit | 3ebbfe2c406955ed765a697825cde0c891e83a24 (patch) | |
tree | f4e06ea01bca2221722f93a0c413b7d90712a028 /source/blender/blenkernel/BKE_material.h | |
parent | b2fdb3f50e0eb4aa1725c33c54afc0901d829c59 (diff) |
new parameter in assign_material() to specify where material shall be assigned: object, obdata, by userpref(default) (as discussed with ideasman_42)
Diffstat (limited to 'source/blender/blenkernel/BKE_material.h')
-rw-r--r-- | source/blender/blenkernel/BKE_material.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_material.h b/source/blender/blenkernel/BKE_material.h index 2407330a237..030af85ba84 100644 --- a/source/blender/blenkernel/BKE_material.h +++ b/source/blender/blenkernel/BKE_material.h @@ -67,10 +67,16 @@ short *give_totcolp(struct Object *ob); struct Material ***give_matarar_id(struct ID *id); /* same but for ID's */ short *give_totcolp_id(struct ID *id); +enum { + BKE_MAT_ASSIGN_USERPREF, + BKE_MAT_ASSIGN_OBDATA, + BKE_MAT_ASSIGN_OBJECT +}; + 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); +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); |