[Bf-blender-cvs] [fc0842593f0] master: USD: Export hair/particle system with name of system (and not its settings)

[Sybren A. Stüvel]

Commit: fc0842593f0c5892bdb6b0cc95df2aeb3e449f5b
Author: Sybren A. Stüvel
Date:   Fri May 8 17:27:18 2020 +0200
Branches: master
https://developer.blender.org/rBfc0842593f0c5892bdb6b0cc95df2aeb3e449f5b

USD: Export hair/particle system with name of system (and not its settings)

Particle systems have two names: the name of the particle system itself,
and the name of the particle system settings. The USD exporter used to
use the latter name, and now switched to the former. This is to be in
line with the Alembic exporter, as well as to give users more freedom in
the naming (the particle system can have a unique name but still share
settings from other particle systems).

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

M	source/blender/io/usd/intern/abstract_hierarchy_iterator.cc

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

diff --git a/source/blender/io/usd/intern/abstract_hierarchy_iterator.cc b/source/blender/io/usd/intern/abstract_hierarchy_iterator.cc
index 4911cb65e11..9d163222863 100644
--- a/source/blender/io/usd/intern/abstract_hierarchy_iterator.cc
+++ b/source/blender/io/usd/intern/abstract_hierarchy_iterator.cc
@@ -576,7 +576,7 @@ void AbstractHierarchyIterator::make_writers_particle_systems(
 
     HierarchyContext hair_context = *transform_context;
     hair_context.export_path = path_concatenate(transform_context->export_path,
-                                                get_id_name(&psys->part->id));
+                                                make_valid_name(psys->name));
     hair_context.particle_system = psys;
 
     AbstractHierarchyWriter *writer = nullptr;