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/lamp.c | |
parent | 3f16810150c0f6057d6e6354f5a97bc3f20a13eb (diff) | |
parent | f33000526679c543c1398a68a84b93dad521a5cb (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/lamp.c')
-rw-r--r-- | source/blender/blenkernel/intern/lamp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/lamp.c b/source/blender/blenkernel/intern/lamp.c index d8b9b14d755..931fc09d235 100644 --- a/source/blender/blenkernel/intern/lamp.c +++ b/source/blender/blenkernel/intern/lamp.c @@ -165,7 +165,7 @@ Lamp *BKE_lamp_copy(Main *bmain, const Lamp *la) return la_copy; } -Lamp *localize_lamp(Lamp *la) +Lamp *BKE_lamp_localize(Lamp *la) { /* TODO replace with something like * Lamp *la_copy; @@ -181,7 +181,7 @@ Lamp *localize_lamp(Lamp *la) for (a = 0; a < MAX_MTEX; a++) { if (lan->mtex[a]) { - lan->mtex[a] = MEM_mallocN(sizeof(MTex), "localize_lamp"); + lan->mtex[a] = MEM_mallocN(sizeof(MTex), __func__); memcpy(lan->mtex[a], la->mtex[a], sizeof(MTex)); } } |