blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Alembic import: fixed bug where local matrix from Alembic was used as object matrix 

Also renamed AbcObjectReader::readObjectMatrix to
setupObjectTransform, as it does more than just reading the object
matrix; it also sets up an object constraint if the Alembic Xform is
animated.
This commit is contained in:
Sybren A. Stüvel 2017-02-23 16:00:06 +01:00
parent 818ee188e7
commit d1696622b7
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/alembic/intern/abc_object.cc
View File

@ -214,7 +214,7 @@ Imath::M44d get_matrix(const IXformSchema &schema, const float time)
return s0.getMatrix();
}
void AbcObjectReader::readObjectMatrix(const float time)
void AbcObjectReader::setupObjectTransform(const float time)
{
bool is_constant = false;
@ -292,6 +292,16 @@ void AbcObjectReader::read_matrix(float mat[4][4], const float time, const float
const Imath::M44d matrix = get_matrix(schema, time);
convert_matrix(matrix, m_object, mat, scale, has_alembic_parent);
if (has_alembic_parent) {
/* In this case, the matrix in Alembic is in local coordinates, so
* convert to world matrix. To prevent us from reading and accumulating
* all parent matrices in the Alembic file, we assume that the Blender
* parent object is already updated for the current timekey, and use its
* world matrix. */
BLI_assert(m_object->parent);
mul_m4_m4m4(mat, m_object->parent->obmat, mat);
}
is_constant = schema.isConstant();
}

3
source/blender/alembic/intern/abc_object.h
View File

@ -183,7 +183,8 @@ public:
return dm;
}
void readObjectMatrix(const float time);
/** Reads the object matrix and sets up an object transform if animated. */
void setupObjectTransform(const float time);
void addCacheModifier();

7
source/blender/alembic/intern/alembic_capi.cc
View File

@ -639,7 +639,6 @@ static void import_startjob(void *user_data, short *stop, short *do_update, floa
if (reader->valid()) {
reader->readObjectData(data->bmain, 0.0f);
reader->readObjectMatrix(0.0f);
min_time = std::min(min_time, reader->minTime());
max_time = std::max(max_time, reader->maxTime());
@ -712,6 +711,12 @@ static void import_startjob(void *user_data, short *stop, short *do_update, floa
return;
}
}
/* Setup transformations and constraints. */
for (iter = data->readers.begin(); iter != data->readers.end(); ++iter) {
AbcObjectReader *reader = *iter;
reader->setupObjectTransform(0.0f);
}
}
static void import_endjob(void *user_data)