blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

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
This commit is contained in:
Philipp Oeser 2021-03-08 10:06:25 +01:00
parent 74c50d0c77
commit 2b9eea17cc
Notes: blender-bot 2023-02-14 06:45:14 +01:00 
Referenced by issue #86366, Vertex group for new particle system with same settings resets.
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/particle.c
View File

@ -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));