[Bf-blender-cvs] [cd4d80f] master: added missing include

[Gaia Clary]

Commit: cd4d80fac6d38beab5a4620a46849fd2531810bd
Author: Gaia Clary
Date:   Sun May 29 01:38:14 2016 +0200
Branches: master
https://developer.blender.org/rBcd4d80fac6d38beab5a4620a46849fd2531810bd

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"