[Bf-blender-cvs] [f7d5672] alembic_basic_io: Small cleanup.

Kévin Dietrich noreply at git.blender.org
Fri Apr 29 18:44:43 CEST 2016


Commit: f7d5672f52a2ea0792ec845cfa7123f1c8972826
Author: Kévin Dietrich
Date:   Fri Apr 29 17:49:18 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rBf7d5672f52a2ea0792ec845cfa7123f1c8972826

Small cleanup.

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

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

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

diff --git a/source/blender/alembic/intern/abc_exporter.cc b/source/blender/alembic/intern/abc_exporter.cc
index 5fe5153..0ebae33 100644
--- a/source/blender/alembic/intern/abc_exporter.cc
+++ b/source/blender/alembic/intern/abc_exporter.cc
@@ -346,7 +346,7 @@ void AbcExporter::createTransformWriter(Object *ob, Object *parent, Object *dupl
 		m_xforms[name]->setParent(parent);
 	}
 	else {
-		m_xforms[name] = new AbcTransformWriter(ob, m_archive.getTop(), 0, m_trans_sampling_index, m_options);
+		m_xforms[name] = new AbcTransformWriter(ob, m_archive.getTop(), NULL, m_trans_sampling_index, m_options);
 	}
 }
 
@@ -491,9 +491,12 @@ void AbcExporter::createShapeWriter(Object *ob, Object *dupliObParent)
 
 AbcTransformWriter *AbcExporter::getXForm(const std::string &name)
 {
-	std::map<std::string,AbcTransformWriter*>::iterator it = m_xforms.find(name);
-	if (it == m_xforms.end())
+	std::map<std::string, AbcTransformWriter *>::iterator it = m_xforms.find(name);
+
+	if (it == m_xforms.end()) {
 		return NULL;
+	}
+
 	return it->second;
 }
 
diff --git a/source/blender/alembic/intern/abc_transform.h b/source/blender/alembic/intern/abc_transform.h
index 1846feb..1f29e21 100644
--- a/source/blender/alembic/intern/abc_transform.h
+++ b/source/blender/alembic/intern/abc_transform.h
@@ -31,7 +31,6 @@ class AbcTransformWriter : public AbcObjectWriter {
 	Alembic::AbcGeom::OXform m_xform;
     Alembic::AbcGeom::OXformSchema m_schema;
     Alembic::AbcGeom::XformSample m_sample;
-	Alembic::Abc::OBoolProperty m_rot90xprop;
 	Alembic::AbcGeom::OVisibilityProperty m_visibility;
 	Alembic::Abc::M44d m_matrix;




More information about the Bf-blender-cvs mailing list