blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Alembic export: get evaluated object when exporting shape

This commit is contained in:
Sybren A. Stüvel 2018-06-07 18:59:50 +02:00
parent 2a771cbc58
commit ba31c4d684
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/alembic/intern/abc_exporter.cc
View File

@ -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;
}

2
source/blender/alembic/intern/abc_exporter.h
View File

@ -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);