Commit: f640094386900bf2d8b8c90dd0dc1393909807c2
Author: Gaia Clary
Date: Sun May 29 01:38:14 2016 +0200
Branches: compositor-2016
https://developer.blender.org/rBf640094386900bf2d8b8c90dd0dc1393909807c2
added missing include
===================================================================
M source/blender/collada/collada_utils.cpp
M source/blender/collada/collada_utils.h
===================================================================
diff --git a/source/blender/collada/collada_utils.cpp
b/source/blender/collada/collada_utils.cpp
index 1377563..f0984fb 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 c821a5d..74f8dca 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"
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
