diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-08-06 11:04:13 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-08-06 11:07:44 +0300 |
| commit | be1a684755905fd022be5ceecf9a7b2687475793 (patch) | |
| tree | 5bcc3a62904a75e67980ea0e73dedd3a713c5e89 /source/blender/blenkernel/BKE_material.h | |
| parent | fa4172c28cfee1cd8c4b91481b6377eae48fdf93 (diff) | |
Fix T45695: Assigning material reverts MaterialSlot.link
Setting the material was resetting the link bit, this is OK from the UI,
confusing for scripts.
Diffstat (limited to 'source/blender/blenkernel/BKE_material.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_material.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_material.h b/source/blender/blenkernel/BKE_material.h index 0cfa1aeecb5..bbac607a3fd 100644 --- a/source/blender/blenkernel/BKE_material.h +++ b/source/blender/blenkernel/BKE_material.h @@ -69,6 +69,8 @@ struct Material ***give_matarar_id(struct ID *id); /* same but for ID's */ short *give_totcolp_id(struct ID *id); enum { + /* use existing link option */ + BKE_MAT_ASSIGN_EXISTING, BKE_MAT_ASSIGN_USERPREF, BKE_MAT_ASSIGN_OBDATA, BKE_MAT_ASSIGN_OBJECT |