diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-04-03 19:12:39 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-03 19:12:39 +0300 |
commit | e52beb373323122f6d706e887a8ee3e2c58beb2e (patch) | |
tree | 0e409009d8aa4df733fe50dee504ae361040a171 /source/blender/blenkernel/intern/particle.c | |
parent | c713e9c4724f2f75e28eb421021ed0428e919aab (diff) | |
parent | ab695c32974fde8720c04dff47d240b7fa0f8151 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/particle.c')
-rw-r--r-- | source/blender/blenkernel/intern/particle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 94f37c3e02c..5a30b3dacf8 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -3180,7 +3180,7 @@ ModifierData *object_add_particle_system(Scene *scene, Object *ob, const char *n psys->part = BKE_particlesettings_add(NULL, DATA_("ParticleSettings")); - if (BLI_listbase_count_ex(&ob->particlesystem, 2) > 1) + if (BLI_listbase_count_at_most(&ob->particlesystem, 2) > 1) BLI_snprintf(psys->name, sizeof(psys->name), DATA_("ParticleSystem %i"), BLI_listbase_count(&ob->particlesystem)); else BLI_strncpy(psys->name, DATA_("ParticleSystem"), sizeof(psys->name)); |