diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2016-05-29 02:38:14 +0300 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2016-05-29 02:38:14 +0300 |
| commit | cd4d80fac6d38beab5a4620a46849fd2531810bd (patch) | |
| tree | b6d2cb338cebc9ede58ee3042ca3486d3609b555 /source/blender/collada | |
| parent | af185e1154a441aba79f7c20cba6040933280f49 (diff) | |
added missing include
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/collada_utils.cpp | 2 | ||||
| -rw-r--r-- | source/blender/collada/collada_utils.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index 13775635556..f0984fbc127 100644 --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@ -517,7 +517,7 @@ void BoneExtended::set_bone_layers(std::string layerString, std::vector<std::str if (isInteger(layer)) { pos = atoi(layer.c_str()); - if (pos >= 0 || pos < 32) { + if (pos >= 0 && pos < 32) { this->bone_layers = bc_set_layer(this->bone_layers, pos); continue; } diff --git a/source/blender/collada/collada_utils.h b/source/blender/collada/collada_utils.h index c821a5dd267..74f8dca1492 100644 --- a/source/blender/collada/collada_utils.h +++ b/source/blender/collada/collada_utils.h @@ -34,6 +34,7 @@ #include <vector> #include <map> +#include <algorithm> extern "C" { #include "DNA_object_types.h" |