diff options
| author | Phil Gosch <phil@saphirestudio.at> | 2017-09-29 23:52:29 +0300 |
|---|---|---|
| committer | Phil Gosch <phil@saphirestudio.at> | 2017-09-29 23:52:29 +0300 |
| commit | 2b1ec9c18fadf6b5cd71a7d4122776f5d4b8ac33 (patch) | |
| tree | 01b477f0ea027ab5908f332f6102db6a1d381b76 /source/blender/blenkernel/BKE_material.h | |
| parent | 5cdd4388ffaad5ade916dba3c18e2bc679e19747 (diff) | |
| parent | e3546a5097b1b30a3c694ce0f6b98c2f7e70510c (diff) | |
Merge remote-tracking branch 'origin/master' into soc-2016-uv_toolssoc-2016-uv_tools
Diffstat (limited to 'source/blender/blenkernel/BKE_material.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_material.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_material.h b/source/blender/blenkernel/BKE_material.h index 7da962dd6d6..c6ebda2c399 100644 --- a/source/blender/blenkernel/BKE_material.h +++ b/source/blender/blenkernel/BKE_material.h @@ -54,6 +54,7 @@ void BKE_material_init(struct Material *ma); void BKE_material_remap_object(struct Object *ob, const unsigned int *remap); void BKE_material_remap_object_calc(struct Object *ob_dst, struct Object *ob_src, short *remap_src_to_dst); struct Material *BKE_material_add(struct Main *bmain, const char *name); +void BKE_material_copy_data(struct Main *bmain, struct Material *ma_dst, const struct Material *ma_src, const int flag); struct Material *BKE_material_copy(struct Main *bmain, const struct Material *ma); struct Material *localize_material(struct Material *ma); struct Material *give_node_material(struct Material *ma); /* returns node material or self */ |