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/intern/material.c | |
| parent | 3f16810150c0f6057d6e6354f5a97bc3f20a13eb (diff) | |
| parent | f33000526679c543c1398a68a84b93dad521a5cb (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/material.c')
| -rw-r--r-- | source/blender/blenkernel/intern/material.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index df8a2268100..7235aa0aaf6 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -272,7 +272,7 @@ Material *BKE_material_copy(Main *bmain, const Material *ma) } /* XXX (see above) material copy without adding to main dbase */ -Material *localize_material(Material *ma) +Material *BKE_material_localize(Material *ma) { /* TODO replace with something like * Material *ma_copy; |