From 847b21ee08e5a30a2fe35ede4c5b3a73af404af7 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 3 Jan 2019 12:15:03 +1100 Subject: 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. --- source/blender/blenkernel/BKE_material.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/blenkernel/BKE_material.h') 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); -- cgit v1.2.3