Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Alembic: do not presume to predict the parent name

Browse Source 
AbcExporter::createTransformWriter() tries to predict the parent Xform
name, but if it cannot be found has multiple ways of creating it, possibly
under a different name than originally searched for.
This commit is contained in:
Sybren A. Stüvel
2017-04-06 15:35:57 +02:00
parent 56cfd3d5a7
commit 5f23f5b516
2 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -410,7 +410,7 @@ void AbcExporter::exploreTransform(EvaluationContext *eval_ctx, Object *ob, Obje
free_object_duplilist(lb); free_object_duplilist(lb);
} }
void AbcExporter::createTransformWriter(Object *ob, Object *parent, Object *dupliObParent) AbcTransformWriter * AbcExporter::createTransformWriter(Object *ob, Object *parent, Object *dupliObParent)
{ {
const std::string name = get_object_dag_path_name(ob, dupliObParent); const std::string name = get_object_dag_path_name(ob, dupliObParent);
@@ -419,43 +419,47 @@ void AbcExporter::createTransformWriter(Object *ob, Object *parent, Object *dupl
BLI_assert(ob != dupliObParent); BLI_assert(ob != dupliObParent);
/* check if we have already created a transform writer for this object */ /* check if we have already created a transform writer for this object */
if (getXForm(name) != NULL) { AbcTransformWriter *my_writer = getXForm(name);
ABC_LOG(m_settings.logger) << "xform " << name << " already exists!\n"; if (my_writer != NULL){
return; return my_writer;
} }
AbcTransformWriter *parent_xform = NULL; AbcTransformWriter *parent_writer = NULL;
Alembic::Abc::OObject alembic_parent;
if (parent) { if (parent) {
const std::string parentname = get_object_dag_path_name(parent, dupliObParent); /* Since there are so many different ways to find parents (as evident
parent_xform = getXForm(parentname); * in the number of conditions below), we can't really look up the
* parent by name. We'll just call createTransformWriter(), which will
if (!parent_xform) { * return the parent's AbcTransformWriter pointer. */
if (parent->parent) { if (parent->parent) {
createTransformWriter(parent, parent->parent, dupliObParent); parent_writer = createTransformWriter(parent, parent->parent, dupliObParent);
} }
else if (parent == dupliObParent) { else if (parent == dupliObParent) {
if (dupliObParent->parent == NULL) { if (dupliObParent->parent == NULL) {
createTransformWriter(parent, NULL, NULL); parent_writer = createTransformWriter(parent, NULL, NULL);
} }
else { else {
createTransformWriter(parent, dupliObParent->parent, dupliObParent->parent); parent_writer = createTransformWriter(parent, dupliObParent->parent, dupliObParent->parent);
} }
} }
else { else {
createTransformWriter(parent, dupliObParent, dupliObParent); parent_writer = createTransformWriter(parent, dupliObParent, dupliObParent);
} }
parent_xform = getXForm(parentname); BLI_assert(parent_writer);
} alembic_parent = parent_writer->alembicXform();
}
if (parent_xform) {
m_xforms[name] = new AbcTransformWriter(ob, parent_xform->alembicXform(), parent_xform, m_trans_sampling_index, m_settings);
} }
else { else {
m_xforms[name] = new AbcTransformWriter(ob, m_writer->archive().getTop(), NULL, m_trans_sampling_index, m_settings); /* Parentless objects still have the "top object" as parent
* in Alembic. */
alembic_parent = m_writer->archive().getTop();
} }
my_writer = new AbcTransformWriter(ob, alembic_parent, parent_writer,
m_trans_sampling_index, m_settings);
m_xforms[name] = my_writer;
return my_writer;
} }
void AbcExporter::createShapeWriters(EvaluationContext *eval_ctx) void AbcExporter::createShapeWriters(EvaluationContext *eval_ctx)

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

@@ -107,7 +107,7 @@ private:
void createTransformWritersHierarchy(EvaluationContext *eval_ctx); void createTransformWritersHierarchy(EvaluationContext *eval_ctx);
void createTransformWritersFlat(); void createTransformWritersFlat();
void createTransformWriter(Object *ob, Object *parent, Object *dupliObParent); AbcTransformWriter * createTransformWriter(Object *ob, Object *parent, Object *dupliObParent);
void exploreTransform(EvaluationContext *eval_ctx, Object *ob, Object *parent, Object *dupliObParent = NULL); void exploreTransform(EvaluationContext *eval_ctx, Object *ob, Object *parent, Object *dupliObParent = NULL);
void exploreObject(EvaluationContext *eval_ctx, Object *ob, Object *dupliObParent); void exploreObject(EvaluationContext *eval_ctx, Object *ob, Object *dupliObParent);
void createShapeWriters(EvaluationContext *eval_ctx); void createShapeWriters(EvaluationContext *eval_ctx);