Merge branch 'master' into compatibility

src/Magnum/Resource.h

@@ -90,7 +90,10 @@ class ResourceKey: public Utility::MurmurHash2::Digest {
          * Creates zero key. Note that it is not the same as calling other
          * constructors with empty string.
          */
-        constexpr ResourceKey() {}
+        constexpr /*implicit*/ ResourceKey() {}
+
+        /** @brief Construct resource key directly from hashed value */
+        explicit ResourceKey(std::size_t key): Utility::MurmurHash2::Digest{Utility::MurmurHash2::Digest::fromByteArray(reinterpret_cast<const char*>(&key))} {}
 
         /** @brief Constructor */
         ResourceKey(const std::string& key): Utility::MurmurHash2::Digest(Utility::MurmurHash2()(key)) {}

src/Magnum/Trade/ObjectData2D.h

@@ -94,6 +94,7 @@ class MAGNUM_EXPORT ObjectData2D {
 
         /** @brief Child objects */
         std::vector<UnsignedInt>& children() { return _children; }
+        const std::vector<UnsignedInt>& children() const { return _children; } /**< @overload */
 
         /** @brief Transformation (relative to parent) */
         Matrix3 transformation() const { return _transformation; }

src/Magnum/Trade/ObjectData3D.h

@@ -96,6 +96,7 @@ class MAGNUM_EXPORT ObjectData3D {
 
         /** @brief Child objects */
         std::vector<UnsignedInt>& children() { return _children; }
+        const std::vector<UnsignedInt>& children() const { return _children; } /**< @overload */
 
         /** @brief Transformation (relative to parent) */
         Matrix4 transformation() const { return _transformation; }