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/blenloader/intern/versioning_legacy.c | |
| parent | 3f16810150c0f6057d6e6354f5a97bc3f20a13eb (diff) | |
| parent | f33000526679c543c1398a68a84b93dad521a5cb (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenloader/intern/versioning_legacy.c')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_legacy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c index 39ece4fd143..6cb39a35b9d 100644 --- a/source/blender/blenloader/intern/versioning_legacy.c +++ b/source/blender/blenloader/intern/versioning_legacy.c @@ -2949,7 +2949,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *main) psys = MEM_callocN(sizeof(ParticleSystem), "particle_system"); psys->pointcache = BKE_ptcache_add(&psys->ptcaches); - part = psys->part = psys_new_settings("ParticleSettings", main); + part = psys->part = BKE_particlesettings_add(main, "ParticleSettings"); /* needed for proper libdata lookup */ blo_do_versions_oldnewmap_insert(fd->libmap, psys->part, psys->part, 0); |