diff --git a/src/Magnum/Trade/AbstractMaterialData.h b/src/Magnum/Trade/AbstractMaterialData.h index 1472165bd..47e89ce64 100644 --- a/src/Magnum/Trade/AbstractMaterialData.h +++ b/src/Magnum/Trade/AbstractMaterialData.h @@ -40,7 +40,7 @@ namespace Magnum { namespace Trade { @see @ref AbstractMaterialData::type() */ enum class MaterialType: UnsignedByte { - Phong /**< Phong shading */ + Phong /**< Phong shading (see @ref PhongMaterialData) */ }; /** diff --git a/src/Magnum/Trade/ObjectData2D.h b/src/Magnum/Trade/ObjectData2D.h index 896e7fff0..a95cf7f1d 100644 --- a/src/Magnum/Trade/ObjectData2D.h +++ b/src/Magnum/Trade/ObjectData2D.h @@ -110,8 +110,10 @@ class MAGNUM_EXPORT ObjectData2D { /** * @brief Instance ID - * @return ID of given camera / light / mesh etc., specified by - * @ref instanceType() + * + * Returns ID of given camera / light / mesh etc., specified by + * @ref instanceType(). If @ref instanceType() is + * @ref ObjectInstanceType2D::Empty, this function returns `-1`. */ Int instance() const { return _instance; } diff --git a/src/Magnum/Trade/ObjectData3D.h b/src/Magnum/Trade/ObjectData3D.h index b2aea9419..0bf7a3f1f 100644 --- a/src/Magnum/Trade/ObjectData3D.h +++ b/src/Magnum/Trade/ObjectData3D.h @@ -42,8 +42,8 @@ namespace Magnum { namespace Trade { @see @ref ObjectData3D::instanceType() */ enum class ObjectInstanceType3D: UnsignedByte { - Camera, /**< Camera instance (see CameraData) */ - Light, /**< Light instance (see LightData) */ + Camera, /**< Camera instance (see @ref CameraData) */ + Light, /**< Light instance (see @ref LightData) */ /** * Mesh instance. The data can be cast to @ref MeshObjectData3D to provide @@ -54,7 +54,6 @@ enum class ObjectInstanceType3D: UnsignedByte { Empty /**< Empty */ }; - /** @brief Three-dimensional object data