[Bf-blender-cvs] [2b9eea17cca] master: Particles: change default name to "ParticleSystem"

[Philipp Oeser]

Commit: 2b9eea17cca4512fc47511ff3c596ce9a8f59356
Author: Philipp Oeser
Date:   Mon Mar 8 10:06:25 2021 +0100
Branches: master
https://developer.blender.org/rB2b9eea17cca4512fc47511ff3c596ce9a8f59356

Particles: change default name to "ParticleSystem"

Since {rB7a6b46aac56b}, particle systems were named "ParticleSettings"
by default, same as particle settings themselves. These are not the same
thing and their names should reflect that.

Issue came up in T86366.

Now name them "ParticleSystem" by default, name uniqueness is preserved
for both system and settings.

Maniphest Tasks: T86366

Differential Revision: https://developer.blender.org/D10641

===================================================================

M	source/blender/blenkernel/intern/particle.c

===================================================================

diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index acda59ce96c..e50b321900a 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -3925,7 +3925,7 @@ static ModifierData *object_add_or_copy_particle_system(
   }
 
   if (name == NULL) {
-    name = (psys_orig != NULL) ? psys_orig->name : DATA_("ParticleSettings");
+    name = (psys_orig != NULL) ? psys_orig->name : DATA_("ParticleSystem");
   }
 
   psys = ob->particlesystem.first;
@@ -3943,7 +3943,7 @@ static ModifierData *object_add_or_copy_particle_system(
     id_us_plus(&psys->part->id);
   }
   else {
-    psys->part = BKE_particlesettings_add(bmain, psys->name);
+    psys->part = BKE_particlesettings_add(bmain, DATA_("ParticleSettings"));
   }
   md = BKE_modifier_new(eModifierType_ParticleSystem);
   BLI_strncpy(md->name, psys->name, sizeof(md->name));