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/world.c | |
| parent | 3f16810150c0f6057d6e6354f5a97bc3f20a13eb (diff) | |
| parent | f33000526679c543c1398a68a84b93dad521a5cb (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/world.c')
| -rw-r--r-- | source/blender/blenkernel/intern/world.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/world.c b/source/blender/blenkernel/intern/world.c index 4abd2a01d40..5da8dc563e2 100644 --- a/source/blender/blenkernel/intern/world.c +++ b/source/blender/blenkernel/intern/world.c @@ -108,7 +108,7 @@ void BKE_world_init(World *wrld) wrld->mistdist = 25.0f; } -World *add_world(Main *bmain, const char *name) +World *BKE_world_add(Main *bmain, const char *name) { World *wrld; @@ -158,7 +158,7 @@ World *BKE_world_copy(Main *bmain, const World *wrld) return wrld_copy; } -World *localize_world(World *wrld) +World *BKE_world_localize(World *wrld) { /* TODO replace with something like * World *wrld_copy; @@ -174,7 +174,7 @@ World *localize_world(World *wrld) for (a = 0; a < MAX_MTEX; a++) { if (wrld->mtex[a]) { - wrldn->mtex[a] = MEM_mallocN(sizeof(MTex), "localize_world"); + wrldn->mtex[a] = MEM_mallocN(sizeof(MTex), __func__); memcpy(wrldn->mtex[a], wrld->mtex[a], sizeof(MTex)); } } |