diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-06-14 23:39:33 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-06-14 23:39:33 +0300 |
| commit | 7439919ac0c4b0146cfed0ddbb8b945fe3675bcb (patch) | |
| tree | 39730e1c17f939bd12e465ce597e2f24bbd91d34 /source/blender/blenkernel/BKE_material.h | |
| parent | dbca1afefa700f25198761624cdb9f1fd21095d2 (diff) | |
| parent | eeb9e5316a615f0e5052b28eee4966c4e2ed1152 (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 0a5d37631d1..85c649bbd3d 100644 --- a/source/blender/blenkernel/BKE_material.h +++ b/source/blender/blenkernel/BKE_material.h @@ -54,7 +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); -struct Material *BKE_material_copy(struct Main *bmain, struct Material *ma); +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 */ void BKE_material_make_local(struct Main *bmain, struct Material *ma, const bool lib_local); |