diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2016-05-29 02:38:14 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2016-06-08 22:45:40 +0300 |
| commit | f640094386900bf2d8b8c90dd0dc1393909807c2 (patch) | |
| tree | e3bb0c5a5eab9166f5c6387aa7a3f7eaf813f300 | |
| parent | 6866b1888e4ea7a8ce8acf788e499146cbe3a5ed (diff) | |
added missing include
| -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" |