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/makesrna/intern/rna_main_api.c | |
| parent | 3f16810150c0f6057d6e6354f5a97bc3f20a13eb (diff) | |
| parent | f33000526679c543c1398a68a84b93dad521a5cb (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_main_api.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_main_api.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index f15006fa0ed..57292b7adc3 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/source/blender/makesrna/intern/rna_main_api.c @@ -454,7 +454,7 @@ static World *rna_Main_worlds_new(Main *bmain, const char *name) char safe_name[MAX_ID_NAME - 2]; rna_idname_validate(name, safe_name); - World *world = add_world(bmain, safe_name); + World *world = BKE_world_add(bmain, safe_name); id_us_min(&world->id); return world; } @@ -529,7 +529,7 @@ static bAction *rna_Main_actions_new(Main *bmain, const char *name) char safe_name[MAX_ID_NAME - 2]; rna_idname_validate(name, safe_name); - bAction *act = add_empty_action(bmain, safe_name); + bAction *act = BKE_action_add(bmain, safe_name); id_fake_user_clear(&act->id); return act; } @@ -539,7 +539,7 @@ static ParticleSettings *rna_Main_particles_new(Main *bmain, const char *name) char safe_name[MAX_ID_NAME - 2]; rna_idname_validate(name, safe_name); - ParticleSettings *part = psys_new_settings(safe_name, bmain); + ParticleSettings *part = BKE_particlesettings_add(bmain, safe_name); id_us_min(&part->id); return part; } |