diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-01-03 04:15:03 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-03 04:20:08 +0300 |
| commit | 847b21ee08e5a30a2fe35ede4c5b3a73af404af7 (patch) | |
| tree | 9fb9ecf0ca14d0d25485ad090012efae81158a27 /source/blender/blenkernel/BKE_material.h | |
| parent | f7e9642da9c9a56a435c2a7f1e506245700a72b0 (diff) | |
Fix T60014: material link pref ignored
The PreferencesEdit.material_link only worked for adding slots,
adding an initial new material didn't respect the preference.
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 e2f5fb23465..b5d2323c59a 100644 --- a/source/blender/blenkernel/BKE_material.h +++ b/source/blender/blenkernel/BKE_material.h @@ -78,7 +78,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); |