Commit: 28105d64479a22c00051439d62c0a89c0ea9692d
Author: Sybren A. Stüvel
Date: Tue Feb 14 17:32:55 2017 +0100
Branches: temp-sybren-alembic
https://developer.blender.org/rB28105d64479a22c00051439d62c0a89c0ea9692d
Alembic: Removed AbcTransformWriter::m_parent
It was set, but never read anywhere.
===================================================================
M source/blender/alembic/intern/abc_exporter.cc
M source/blender/alembic/intern/abc_transform.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 90a9946938..77141a9119 100644
--- a/source/blender/alembic/intern/abc_exporter.cc
+++ b/source/blender/alembic/intern/abc_exporter.cc
@@ -451,7 +451,6 @@ void AbcExporter::createTransformWriter(Object *ob, Object
*parent, Object *dupl
if (parent_xform) {
m_xforms[name] = new AbcTransformWriter(ob,
parent_xform->alembicXform(), parent_xform, m_trans_sampling_index, m_settings);
- m_xforms[name]->setParent(parent);
}
else {
m_xforms[name] = new AbcTransformWriter(ob,
m_writer->archive().getTop(), NULL, m_trans_sampling_index, m_settings);
diff --git a/source/blender/alembic/intern/abc_transform.cc
b/source/blender/alembic/intern/abc_transform.cc
index 2c6ef09326..99bf7de93f 100644
--- a/source/blender/alembic/intern/abc_transform.cc
+++ b/source/blender/alembic/intern/abc_transform.cc
@@ -64,7 +64,6 @@ AbcTransformWriter::AbcTransformWriter(Object *ob,
: AbcObjectWriter(NULL, ob, time_sampling, settings, parent)
{
m_is_animated = hasAnimation(m_object);
- m_parent = NULL;
if (!m_is_animated) {
time_sampling = 0;
diff --git a/source/blender/alembic/intern/abc_transform.h
b/source/blender/alembic/intern/abc_transform.h
index 6a3aae216f..b55fa12dad 100644
--- a/source/blender/alembic/intern/abc_transform.h
+++ b/source/blender/alembic/intern/abc_transform.h
@@ -37,7 +37,6 @@ class AbcTransformWriter : public AbcObjectWriter {
Alembic::Abc::M44d m_matrix;
bool m_is_animated;
- Object *m_parent;
bool m_visible;
public:
@@ -49,7 +48,6 @@ public:
Alembic::AbcGeom::OXform &alembicXform() { return m_xform;}
virtual Imath::Box3d bounds();
- void setParent(Object *p) { m_parent = p; }
private:
virtual void do_write();
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
