diff --git a/src/Magnum/Resource.h b/src/Magnum/Resource.h index d24f5f0e0..79917e141 100644 --- a/src/Magnum/Resource.h +++ b/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(&key))} {} /** @brief Constructor */ ResourceKey(const std::string& key): Utility::MurmurHash2::Digest(Utility::MurmurHash2()(key)) {} diff --git a/src/Magnum/Trade/ObjectData2D.h b/src/Magnum/Trade/ObjectData2D.h index 23d684b43..58125f5b5 100644 --- a/src/Magnum/Trade/ObjectData2D.h +++ b/src/Magnum/Trade/ObjectData2D.h @@ -94,6 +94,7 @@ class MAGNUM_EXPORT ObjectData2D { /** @brief Child objects */ std::vector& children() { return _children; } + const std::vector& children() const { return _children; } /**< @overload */ /** @brief Transformation (relative to parent) */ Matrix3 transformation() const { return _transformation; } diff --git a/src/Magnum/Trade/ObjectData3D.h b/src/Magnum/Trade/ObjectData3D.h index b41467320..b8f1ca7f9 100644 --- a/src/Magnum/Trade/ObjectData3D.h +++ b/src/Magnum/Trade/ObjectData3D.h @@ -96,6 +96,7 @@ class MAGNUM_EXPORT ObjectData3D { /** @brief Child objects */ std::vector& children() { return _children; } + const std::vector& children() const { return _children; } /**< @overload */ /** @brief Transformation (relative to parent) */ Matrix4 transformation() const { return _transformation; }