Commit: ba31c4d684c1bff0955df55b0b0566f15872aed5
Author: Sybren A. Stüvel
Date: Thu Jun 7 18:59:50 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBba31c4d684c1bff0955df55b0b0566f15872aed5
Alembic export: get evaluated object when exporting shape
===================================================================
M source/blender/alembic/intern/abc_exporter.cc
M source/blender/alembic/intern/abc_exporter.h
===================================================================
diff --git a/source/blender/alembic/intern/abc_exporter.cc
b/source/blender/alembic/intern/abc_exporter.cc
index cdb176ae02e..c766720d6cd 100644
--- a/source/blender/alembic/intern/abc_exporter.cc
+++ b/source/blender/alembic/intern/abc_exporter.cc
@@ -505,9 +505,9 @@ void AbcExporter::exploreObject(Base *ob_base, Object
*dupliObParent)
return;
}
- createShapeWriter(ob_base, dupliObParent);
-
- Object *ob = ob_base->object;
+ Object *ob = DEG_get_evaluated_object(m_settings.depsgraph,
ob_base->object);
+ createShapeWriter(ob, dupliObParent);
+
ListBase *lb = object_duplilist(m_settings.depsgraph, m_settings.scene,
ob);
if (lb) {
@@ -554,10 +554,8 @@ void AbcExporter::createParticleSystemsWriters(Object *ob,
AbcTransformWriter *x
}
}
-void AbcExporter::createShapeWriter(Base *ob_base, Object *dupliObParent)
+void AbcExporter::createShapeWriter(Object *ob, Object *dupliObParent)
{
- Object *ob = ob_base->object;
-
if (!object_type_is_exportable(m_settings.scene, ob)) {
return;
}
diff --git a/source/blender/alembic/intern/abc_exporter.h
b/source/blender/alembic/intern/abc_exporter.h
index a4d13b8e0d4..a92e426292c 100644
--- a/source/blender/alembic/intern/abc_exporter.h
+++ b/source/blender/alembic/intern/abc_exporter.h
@@ -120,7 +120,7 @@ private:
void exploreTransform(Base *ob_base, Object *parent, Object
*dupliObParent);
void exploreObject(Base *ob_base, Object *dupliObParent);
void createShapeWriters();
- void createShapeWriter(Base *ob_base, Object *dupliObParent);
+ void createShapeWriter(Object *ob, Object *dupliObParent);
void createParticleSystemsWriters(Object *ob, AbcTransformWriter
*xform);
AbcTransformWriter *getXForm(const std::string &name);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
