blender
/
blender
131
398
Fork 577
Code Issues 6.2k Pull Requests 738 Projects 19 Wiki Activity

Alembic: code style

This commit is contained in:
Sybren A. Stüvel 2017-03-01 14:27:25 +01:00
parent 3735065d22
commit f226b808ff
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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();

16
source/blender/alembic/intern/abc_util.cc
View File

@ -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