diff options
author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-03-02 11:56:57 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-04-06 17:47:00 +0300 |
commit | 8b2555e7987afe41de4ec0b6da3c8738f8e2f857 (patch) | |
tree | a62e7270539070fbc33a830f446e5eb36afed818 /source | |
parent | f226b808ffb59ddb9aac8e51fff794f81bb55e38 (diff) |
Alembic: added some r_ prefixes for return parameters
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/alembic/intern/abc_object.cc | 7 | ||||
-rw-r--r-- | source/blender/alembic/intern/abc_object.h | 3 | ||||
-rw-r--r-- | source/blender/alembic/intern/abc_util.cc | 4 | ||||
-rw-r--r-- | source/blender/alembic/intern/abc_util.h | 2 |
4 files changed, 9 insertions, 7 deletions
diff --git a/source/blender/alembic/intern/abc_object.cc b/source/blender/alembic/intern/abc_object.cc index e5c01fa8d87..763bc34a410 100644 --- a/source/blender/alembic/intern/abc_object.cc +++ b/source/blender/alembic/intern/abc_object.cc @@ -262,7 +262,8 @@ Alembic::AbcGeom::IXform AbcObjectReader::xform() return IXform(); } -void AbcObjectReader::read_matrix(float mat[4][4], const float time, const float scale, bool &is_constant) +void AbcObjectReader::read_matrix(float r_mat[4][4], const float time, + const float scale, bool &is_constant) { IXform ixform = xform(); if (!ixform) { @@ -288,7 +289,7 @@ 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); + convert_matrix(matrix, m_object, r_mat, scale, has_alembic_parent); if (has_alembic_parent) { /* In this case, the matrix in Alembic is in local coordinates, so @@ -297,7 +298,7 @@ void AbcObjectReader::read_matrix(float mat[4][4], const float time, const float * 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); + mul_m4_m4m4(r_mat, m_object->parent->obmat, r_mat); } is_constant = schema.isConstant(); diff --git a/source/blender/alembic/intern/abc_object.h b/source/blender/alembic/intern/abc_object.h index cf4372b2f5b..2e3c3531453 100644 --- a/source/blender/alembic/intern/abc_object.h +++ b/source/blender/alembic/intern/abc_object.h @@ -187,7 +187,8 @@ public: void incref(); void decref(); - void read_matrix(float mat[4][4], const float time, const float scale, bool &is_constant); + void read_matrix(float r_mat[4][4], const float time, + const float scale, bool &is_constant); }; Imath::M44d get_matrix(const Alembic::AbcGeom::IXformSchema &schema, const float time); diff --git a/source/blender/alembic/intern/abc_util.cc b/source/blender/alembic/intern/abc_util.cc index 45aa0510dfe..4ec949fce3c 100644 --- a/source/blender/alembic/intern/abc_util.cc +++ b/source/blender/alembic/intern/abc_util.cc @@ -254,7 +254,7 @@ void convert_matrix(const Imath::M44d &xform, Object *ob, /* Recompute transform matrix of object in new coordinate system * (from Z-Up to Y-Up). */ -void create_transform_matrix(Object *obj, float yup_mat[4][4]) +void create_transform_matrix(Object *obj, float r_yup_mat[4][4]) { float zup_mat[4][4]; @@ -273,7 +273,7 @@ void create_transform_matrix(Object *obj, float yup_mat[4][4]) } - copy_m44_axis_swap(yup_mat, zup_mat, ABC_YUP_FROM_ZUP); + copy_m44_axis_swap(r_yup_mat, zup_mat, ABC_YUP_FROM_ZUP); } bool has_property(const Alembic::Abc::ICompoundProperty &prop, const std::string &name) diff --git a/source/blender/alembic/intern/abc_util.h b/source/blender/alembic/intern/abc_util.h index 47ce15b7dfb..486d9384dee 100644 --- a/source/blender/alembic/intern/abc_util.h +++ b/source/blender/alembic/intern/abc_util.h @@ -52,7 +52,7 @@ bool object_selected(Object *ob); bool parent_selected(Object *ob); Imath::M44d convert_matrix(float mat[4][4]); -void create_transform_matrix(Object *obj, float transform_mat[4][4]); +void create_transform_matrix(Object *obj, float r_transform_mat[4][4]); void split(const std::string &s, const char delim, std::vector<std::string> &tokens); |