diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-01-03 04:23:17 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-03 04:25:37 +0300 |
| commit | ba9e10fd6a5b7052d25f34343b7b723d25a94490 (patch) | |
| tree | f9b45841dbbcc40c9c2e0b40f9d69d572589adc5 /source/blender/blenkernel/BKE_material.h | |
| parent | 11f2c65128dc9bdead56003df7c282b6e091cbd1 (diff) | |
| parent | 847b21ee08e5a30a2fe35ede4c5b3a73af404af7 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'source/blender/blenkernel/BKE_material.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_material.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_material.h b/source/blender/blenkernel/BKE_material.h index 062658139af..890272aae64 100644 --- a/source/blender/blenkernel/BKE_material.h +++ b/source/blender/blenkernel/BKE_material.h @@ -79,7 +79,8 @@ enum { BKE_MAT_ASSIGN_OBJECT }; -struct Material *give_current_material(struct Object *ob, short act); +struct Material **give_current_material_p(struct Object *ob, short act); +struct Material *give_current_material(struct Object *ob, short act); 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); |