Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-06-03 17:17:37 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-06-03 17:18:35 +0300
commite3f2034e7b925bc7e31e65051842cf26d70a20bc (patch)
tree7e9c85a3dbafb121bae9acdc586085c1a73bcff0 /source/blender
parent482f4ca100c901f551b4f27c0eb0990d7e4ce668 (diff)
Cleanup: Cleanup: style, use braces for collada
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/collada/BCMath.cpp15
-rw-r--r--source/blender/collada/collada_utils.h3
2 files changed, 12 insertions, 6 deletions
diff --git a/source/blender/collada/BCMath.cpp b/source/blender/collada/BCMath.cpp
index 31f8bd1c2bc..c82ecbb7441 100644
--- a/source/blender/collada/BCMath.cpp
+++ b/source/blender/collada/BCMath.cpp
@@ -151,19 +151,22 @@ void BCMatrix::transpose(Matrix &mat)
void BCMatrix::sanitize(Matrix &mat, int precision)
{
- for (int i = 0; i < 4; i++)
+ for (int i = 0; i < 4; i++) {
for (int j = 0; j < 4; j++) {
double val = (double)mat[i][j];
val = double_round(val, precision);
mat[i][j] = (float)val;
}
+ }
}
void BCMatrix::sanitize(DMatrix &mat, int precision)
{
- for (int i = 0; i < 4; i++)
- for (int j = 0; j < 4; j++)
+ for (int i = 0; i < 4; i++) {
+ for (int j = 0; j < 4; j++) {
mat[i][j] = double_round(mat[i][j], precision);
+ }
+ }
}
void BCMatrix::unit()
@@ -177,13 +180,14 @@ void BCMatrix::unit()
* precision = -1 indicates to not limit the precision. */
void BCMatrix::get_matrix(DMatrix &mat, const bool transposed, const int precision) const
{
- for (int i = 0; i < 4; i++)
+ for (int i = 0; i < 4; i++) {
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);
mat[i][j] = val;
}
+ }
}
void BCMatrix::get_matrix(Matrix &mat,
@@ -191,13 +195,14 @@ void BCMatrix::get_matrix(Matrix &mat,
const int precision,
const bool inverted) const
{
- for (int i = 0; i < 4; i++)
+ for (int i = 0; i < 4; i++) {
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);
mat[i][j] = val;
}
+ }
if (inverted) {
invert_m4(mat);
diff --git a/source/blender/collada/collada_utils.h b/source/blender/collada/collada_utils.h
index dca8f414e5a..e142d4c77db 100644
--- a/source/blender/collada/collada_utils.h
+++ b/source/blender/collada/collada_utils.h
@@ -188,8 +188,9 @@ inline bool bc_startswith(std::string const &value, std::string const &starting)
inline bool bc_endswith(const std::string &value, const std::string &ending)
{
- if (ending.size() > value.size())
+ if (ending.size() > value.size()) {
return false;
+ }
return value.compare(value.size() - ending.size(), ending.size(), ending) == 0;
}