diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-01-11 02:14:34 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-11 02:19:00 +0300 |
commit | 6112cde3f90e4e0f2ba5fc37150efcd239b97250 (patch) | |
tree | c933cac2e4c385a6ec6a5045cd479d25f2a8c998 /source/blender/blenkernel/BKE_material.h | |
parent | 3f16810150c0f6057d6e6354f5a97bc3f20a13eb (diff) | |
parent | f33000526679c543c1398a68a84b93dad521a5cb (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/BKE_material.h')
-rw-r--r-- | source/blender/blenkernel/BKE_material.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_material.h b/source/blender/blenkernel/BKE_material.h index cb4ee9c2543..f4c98fc0aea 100644 --- a/source/blender/blenkernel/BKE_material.h +++ b/source/blender/blenkernel/BKE_material.h @@ -56,7 +56,7 @@ void BKE_material_remap_object_calc(struct Object *ob_dst, struct Object *ob_sr 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 *BKE_material_localize(struct Material *ma); struct Material *give_node_material(struct Material *ma); /* returns node material or self */ void BKE_material_make_local(struct Main *bmain, struct Material *ma, const bool lib_local); |