Merge branch 'master' into NDK-ShadowMapping

Former-commit-id: e2be28b65207dfbb81efe58f31ca31548afecee7
2016-04-17 19:57:15 +02:00
parent 5f16da5e73 922e49accb
commit 37aa00b2e7
354 changed files with 24993 additions and 2830 deletions
--- a/include/Nazara/Core/ObjectRef.hpp
+++ b/include/Nazara/Core/ObjectRef.hpp
@@ -8,6 +8,7 @@
 #define NAZARA_RESOURCEREF_HPP

 #include <Nazara/Prerequesites.hpp>
+#include <Nazara/Core/Algorithm.hpp>
 #include <Nazara/Core/RefCounted.hpp>
 #include <type_traits>

@@ -42,6 +43,9 @@ namespace Nz
 		private:
 			T* m_object;
 	};
+
+    template<typename T> struct PointedType<ObjectRef<T>> {typedef T type;};
+    template<typename T> struct PointedType<ObjectRef<T> const> {typedef T type;};
 }

 #include <Nazara/Core/ObjectRef.inl>