diff options
author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-03-01 16:27:25 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-04-06 17:47:00 +0300 |
commit | f226b808ffb59ddb9aac8e51fff794f81bb55e38 (patch) | |
tree | 6590fec5efb6bd94a11c8810bbe68359ce223610 | |
parent | 3735065d22f035e3db914cdef656760cfbea13f8 (diff) |
Alembic: code style
-rw-r--r-- | source/blender/alembic/intern/abc_object.cc | 2 | ||||
-rw-r--r-- | source/blender/alembic/intern/abc_util.cc | 16 |
2 files changed, 8 insertions, 10 deletions
diff --git a/source/blender/alembic/intern/abc_object.cc b/source/blender/alembic/intern/abc_object.cc index 62042d25501..e5c01fa8d87 100644 --- a/source/blender/alembic/intern/abc_object.cc +++ b/source/blender/alembic/intern/abc_object.cc @@ -236,7 +236,6 @@ void AbcObjectReader::setupObjectTransform(const float time) } } - Alembic::AbcGeom::IXform AbcObjectReader::xform() { /* Check that we have an empty object (locator, bone head/tail...). */ @@ -263,7 +262,6 @@ Alembic::AbcGeom::IXform AbcObjectReader::xform() return IXform(); } - void AbcObjectReader::read_matrix(float mat[4][4], const float time, const float scale, bool &is_constant) { IXform ixform = xform(); diff --git a/source/blender/alembic/intern/abc_util.cc b/source/blender/alembic/intern/abc_util.cc index 2274a50ad7d..45aa0510dfe 100644 --- a/source/blender/alembic/intern/abc_util.cc +++ b/source/blender/alembic/intern/abc_util.cc @@ -206,14 +206,14 @@ void copy_m44_axis_swap(float dst_mat[4][4], float src_mat[4][4], AbcAxisSwapMod /* Apply translation */ switch(mode) { - case ABC_ZUP_FROM_YUP: - copy_zup_from_yup(dst_mat[3], src_trans); - break; - case ABC_YUP_FROM_ZUP: - copy_yup_from_zup(dst_mat[3], src_trans); - break; - default: - BLI_assert(false); + case ABC_ZUP_FROM_YUP: + copy_zup_from_yup(dst_mat[3], src_trans); + break; + case ABC_YUP_FROM_ZUP: + copy_yup_from_zup(dst_mat[3], src_trans); + break; + default: + BLI_assert(false); } /* Apply scale matrix. Swaps y and z, but does not |