[Bf-blender-cvs] [4be5fae] blender-v2.78-release: Fix T49249: Alembic export with multiple hair systems crash blender

[Kévin Dietrich]

Commit: 4be5fae30cb13c22db7519a7748e29fdd0ae1bc2
Author: Kévin Dietrich
Date:   Mon Sep 5 03:32:36 2016 +0200
Branches: blender-v2.78-release
https://developer.blender.org/rB4be5fae30cb13c22db7519a7748e29fdd0ae1bc2

Fix T49249: Alembic export with multiple hair systems crash blender

Crash was due to a name collision in Alembic objects caused by the fact
that names derive from the one of the Blender object. An object having
multiple particles system would thus give its name to various
subobjects.

Now use the name of the particles system for the Alembic object.

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

M	source/blender/alembic/intern/abc_hair.cc
M	source/blender/alembic/intern/abc_points.cc

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

diff --git a/source/blender/alembic/intern/abc_hair.cc b/source/blender/alembic/intern/abc_hair.cc
index 45bf9b7..14bcf67 100644
--- a/source/blender/alembic/intern/abc_hair.cc
+++ b/source/blender/alembic/intern/abc_hair.cc
@@ -59,7 +59,7 @@ AbcHairWriter::AbcHairWriter(Scene *scene,
 {
 	m_psys = psys;
 
-	OCurves curves(parent->alembicXform(), m_name, m_time_sampling);
+	OCurves curves(parent->alembicXform(), psys->name, m_time_sampling);
 	m_schema = curves.getSchema();
 }
 
diff --git a/source/blender/alembic/intern/abc_points.cc b/source/blender/alembic/intern/abc_points.cc
index 322bb90..0301454 100644
--- a/source/blender/alembic/intern/abc_points.cc
+++ b/source/blender/alembic/intern/abc_points.cc
@@ -67,7 +67,7 @@ AbcPointsWriter::AbcPointsWriter(Scene *scene,
 {
 	m_psys = psys;
 
-	OPoints points(parent->alembicXform(), m_name, m_time_sampling);
+	OPoints points(parent->alembicXform(), psys->name, m_time_sampling);
 	m_schema = points.getSchema();
 }