diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-19 09:21:15 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-19 09:21:15 +0300 |
| commit | c850320b35863edc35f0b0acd1c75ed48bb71542 (patch) | |
| tree | c3de2f92410308c0ece880a901864727b5731fc3 /source/blender/blenkernel/BKE_world.h | |
| parent | 4d3d002b653c5b28320ada6b9d7f1e8c80bf944c (diff) | |
| parent | 7a24e0d175827824d139f7627de2a5af34d687fb (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/BKE_world.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_world.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_world.h b/source/blender/blenkernel/BKE_world.h index b69c14535c6..b45d7a7e6ec 100644 --- a/source/blender/blenkernel/BKE_world.h +++ b/source/blender/blenkernel/BKE_world.h @@ -38,7 +38,7 @@ struct World; void BKE_world_free(struct World *sc); void BKE_world_init(struct World *wrld); -struct World *BKE_world_add(struct Main *bmian, const char *name); +struct World *BKE_world_add(struct Main *bmain, const char *name); void BKE_world_copy_data(struct Main *bmain, struct World *wrld_dst, const struct World *wrld_src, const int flag); struct World *BKE_world_copy(struct Main *bmain, const struct World *wrld); struct World *BKE_world_localize(struct World *wrld); |