diff options
Diffstat (limited to 'source/blender/io')
| -rw-r--r-- | source/blender/io/collada/ArmatureImporter.cpp | 2 | ||||
| -rw-r--r-- | source/blender/io/collada/BCMath.cpp | 4 | ||||
| -rw-r--r-- | source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/io/collada/ArmatureImporter.cpp b/source/blender/io/collada/ArmatureImporter.cpp index f056488fe93..c7db2356d20 100644 --- a/source/blender/io/collada/ArmatureImporter.cpp +++ b/source/blender/io/collada/ArmatureImporter.cpp @@ -1022,7 +1022,7 @@ bool ArmatureImporter::get_joint_bind_mat(float m[4][4], COLLADAFW::Node *joint) bool found = false; for (it = skin_by_data_uid.begin(); it != skin_by_data_uid.end(); it++) { SkinInfo &skin = it->second; - if ((found = skin.get_joint_inv_bind_matrix(m, joint))) { + if (found = skin.get_joint_inv_bind_matrix(m, joint)) { invert_m4(m); break; } diff --git a/source/blender/io/collada/BCMath.cpp b/source/blender/io/collada/BCMath.cpp index d48e46ca115..924cee7f3b2 100644 --- a/source/blender/io/collada/BCMath.cpp +++ b/source/blender/io/collada/BCMath.cpp @@ -169,7 +169,7 @@ void BCMatrix::get_matrix(DMatrix &mat, const bool transposed, const int precisi for (int j = 0; j < 4; j++) { float val = (transposed) ? matrix[j][i] : matrix[i][j]; if (precision >= 0) { - val = floor((val * pow(10, precision) + 0.5)) / pow(10, precision); + val = floor(val * pow(10, precision) + 0.5) / pow(10, precision); } mat[i][j] = val; } @@ -185,7 +185,7 @@ void BCMatrix::get_matrix(Matrix &mat, for (int j = 0; j < 4; j++) { float val = (transposed) ? matrix[j][i] : matrix[i][j]; if (precision >= 0) { - val = floor((val * pow(10, precision) + 0.5)) / pow(10, precision); + val = floor(val * pow(10, precision) + 0.5) / pow(10, precision); } mat[i][j] = val; } diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc index 27b71319f39..91b59059545 100644 --- a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc +++ b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc @@ -369,7 +369,7 @@ float3 OBJMesh::calc_poly_normal(const int poly_index) const static float round_float_to_n_digits(const float f, int round_digits) { float scale = powf(10.0, round_digits); - return ceilf((scale * f - 0.49999999f)) / scale; + return ceilf(scale * f - 0.49999999f) / scale; } static float3 round_float3_to_n_digits(const float3 &v, int round_digits) |