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/editors/physics | |
parent | 3f16810150c0f6057d6e6354f5a97bc3f20a13eb (diff) | |
parent | f33000526679c543c1398a68a84b93dad521a5cb (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/physics')
-rw-r--r-- | source/blender/editors/physics/particle_object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index 4fee14dc71d..1536c15525f 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -200,7 +200,7 @@ static int new_particle_settings_exec(bContext *C, wmOperator *UNUSED(op)) if (psys->part) part= BKE_particlesettings_copy(bmain, psys->part); else - part= psys_new_settings("ParticleSettings", bmain); + part= BKE_particlesettings_add(bmain, "ParticleSettings"); ob= ptr.id.data; |