diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-06-13 15:59:28 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-06-13 15:59:28 +0400 |
commit | cda5770160e11c2d3c7ab7d20e24a7a8f3b28f1f (patch) | |
tree | 5ba33f204de8e68c8d81a5a27b9762f3fb684991 /source/blender/collada | |
parent | eb136fcbec33288411838dae8105fa17dc8ffecd (diff) |
code cleanup: also fix crash in GPU_state_print(). and confine to debug mode builds.
Diffstat (limited to 'source/blender/collada')
-rw-r--r-- | source/blender/collada/TransformWriter.cpp | 2 | ||||
-rw-r--r-- | source/blender/collada/collada_utils.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/collada/TransformWriter.cpp b/source/blender/collada/TransformWriter.cpp index efefca86d3e..d4db42da35b 100644 --- a/source/blender/collada/TransformWriter.cpp +++ b/source/blender/collada/TransformWriter.cpp @@ -103,7 +103,7 @@ void TransformWriter::add_node_transform_ob(COLLADASW::Node& node, Object *ob, B if (ob->parent) { // If parentinv is identity don't add it. bool add_parinv = false; - + for (int i = 0; i < 16; ++i) { float f = (i % 4 == i / 4) ? 1.0f : 0.0f; add_parinv |= (ob->parentinv[i % 4][i / 4] != f); diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index 7e9ecb95f7a..41f48a757c0 100644 --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@ -311,7 +311,7 @@ std::string bc_replace_string(std::string data, const std::string& pattern, const std::string& replacement) { size_t pos = 0; - while((pos = data.find(pattern, pos)) != std::string::npos) { + while ((pos = data.find(pattern, pos)) != std::string::npos) { data.replace(pos, pattern.length(), replacement); pos += replacement.length(); } |