Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2021-03-08 12:06:25 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2021-03-08 12:47:27 +0300
commit2b9eea17cca4512fc47511ff3c596ce9a8f59356 (patch)
treea33be0fd97d52b159530c7a1b27133348a595e58 /source/blender/blenkernel/intern/particle.c
parent74c50d0c773cf0e751ba92c6d0d4af668972e564 (diff)
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
Diffstat (limited to 'source/blender/blenkernel/intern/particle.c')
-rw-r--r--source/blender/blenkernel/intern/particle.c4
1 files changed, 2 insertions, 2 deletions
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));