diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2022-07-26 00:43:48 +0300 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2022-07-26 00:43:48 +0300 |
commit | f081e76037432cb926be45e980eac201d337032c (patch) | |
tree | dd1225521c12ea21c0b0c3d51ec1ae3f8730755f /source/blender/io/alembic/intern/abc_reader_object.cc | |
parent | fa2084ae58a77b1201289b6bedac427f73c762d1 (diff) | |
parent | 462f99bf38648a08226b1fba423315aec2bc577b (diff) |
Merge branch 'master' into geometry-nodes-iterative-cachegeometry-nodes-rigid-body-integration
Diffstat (limited to 'source/blender/io/alembic/intern/abc_reader_object.cc')
-rw-r--r-- | source/blender/io/alembic/intern/abc_reader_object.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/io/alembic/intern/abc_reader_object.cc b/source/blender/io/alembic/intern/abc_reader_object.cc index a698eeca8f1..db056c0eef6 100644 --- a/source/blender/io/alembic/intern/abc_reader_object.cc +++ b/source/blender/io/alembic/intern/abc_reader_object.cc @@ -218,12 +218,12 @@ Alembic::AbcGeom::IXform AbcObjectReader::xform() void AbcObjectReader::read_matrix(float r_mat[4][4] /* local matrix */, const chrono_t time, const float scale, - bool &is_constant) + bool &r_is_constant) { IXform ixform = xform(); if (!ixform) { unit_m4(r_mat); - is_constant = true; + r_is_constant = true; return; } @@ -254,7 +254,7 @@ void AbcObjectReader::read_matrix(float r_mat[4][4] /* local matrix */, mul_m4_m4m4(r_mat, scale_mat, r_mat); } - is_constant = schema.isConstant(); + r_is_constant = schema.isConstant(); } void AbcObjectReader::addCacheModifier() |