[Bf-blender-cvs] [de035a9587] temp-sybren-alembic: FIXUP cleaned up if-parent structure in AbcExporter::createTransformWriter

[Sybren A. Stüvel]

Commit: de035a9587572ca7b6c0a4182ae4bfc16642b6c1
Author: Sybren A. Stüvel
Date:   Wed Mar 1 14:27:15 2017 +0100
Branches: temp-sybren-alembic
https://developer.blender.org/rBde035a9587572ca7b6c0a4182ae4bfc16642b6c1

FIXUP cleaned up if-parent structure in AbcExporter::createTransformWriter

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

M	source/blender/alembic/intern/abc_exporter.cc

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

diff --git a/source/blender/alembic/intern/abc_exporter.cc b/source/blender/alembic/intern/abc_exporter.cc
index d6e681bc88..4eb505d1ef 100644
--- a/source/blender/alembic/intern/abc_exporter.cc
+++ b/source/blender/alembic/intern/abc_exporter.cc
@@ -426,6 +426,7 @@ AbcTransformWriter * AbcExporter::createTransformWriter(Object *ob, Object *pare
 	}
 
 	AbcTransformWriter *parent_writer = NULL;
+	Alembic::Abc::OObject alembic_parent;
 
 	if (parent) {
 		/* Since there are so many different ways to find parents (as evident
@@ -448,15 +449,16 @@ AbcTransformWriter * AbcExporter::createTransformWriter(Object *ob, Object *pare
 		}
 
 		BLI_assert(parent_writer);
-	}
-
-	if (parent_writer) {
-		my_writer = new AbcTransformWriter(ob, parent_writer->alembicXform(), parent_writer, m_trans_sampling_index, m_settings);
+		alembic_parent = parent_writer->alembicXform();
 	}
 	else {
-		my_writer = new AbcTransformWriter(ob, m_writer->archive().getTop(), NULL, m_trans_sampling_index, m_settings);
+		/* Parentless objects still have the "top object" as parent
+		 * in Alembic. */
+		alembic_parent = m_writer->archive().getTop();
 	}
 
+	my_writer = new AbcTransformWriter(ob, alembic_parent, parent_writer,
+	                                   m_trans_sampling_index, m_settings);
 	m_xforms[name] = my_writer;
 	return my_writer;
 }