Commit: 55de3f5841a04d4491e0cbc5cd223b3c80952e1b
Author: Julian Eisel
Date: Tue Sep 20 00:15:34 2016 +0200
Branches: soc-2016-layer_manager
https://developer.blender.org/rB55de3f5841a04d4491e0cbc5cd223b3c80952e1b
Merge branch 'master' into soc-2016-layer_manager
===================================================================
===================================================================
diff --cc source/blender/alembic/intern/abc_exporter.cc
index e4eaad2,a31122b..04f0dc4
--- a/source/blender/alembic/intern/abc_exporter.cc
+++ b/source/blender/alembic/intern/abc_exporter.cc
@@@ -441,10 -373,11 +371,10 @@@ void AbcExporter::createTransformWriter
if (export_object(&m_settings, ob) && object_is_shape(ob)) {
std::string name = get_id_name(ob);
- m_xforms[name] = new AbcTransformWriter(ob,
m_archive.getTop(), 0, m_trans_sampling_index, m_settings);
+ m_xforms[name] = new AbcTransformWriter(ob,
m_writer->archive().getTop(), 0, m_trans_sampling_index, m_settings);
}
-
- base = base->next;
}
+ BKE_BASES_ITER_END;
}
void AbcExporter::exploreTransform(EvaluationContext *eval_ctx, Object *ob,
Object *parent, Object *dupliObParent)
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
