diff --git a/src/Magnum/DebugTools/FrameProfiler.h b/src/Magnum/DebugTools/FrameProfiler.h index b02835961..3d1dd4a48 100644 --- a/src/Magnum/DebugTools/FrameProfiler.h +++ b/src/Magnum/DebugTools/FrameProfiler.h @@ -375,10 +375,11 @@ class MAGNUM_DEBUGTOOLS_EXPORT FrameProfiler { /** * @brief Print an overview of all measurements to a console at given rate * - * Expected to be called every frame. On every `frequency`th frame - * prints the same information as @ref statistics(), but in addition, - * if the output is a TTY, it's colored and overwrites itself instead - * of filling up the terminal history. + * Expected to be called every frame. If profiling is enabled, on every + * `frequency`th frame prints the same information as @ref statistics(), + * but in addition, if the output is a TTY, it's colored and overwrites + * itself instead of filling up the terminal history. If profiling is + * disabled, does nothing. * @see @ref isMeasurementAvailable(), @ref isEnabled() * @ref Corrade::Utility::Debug::isTty() */ diff --git a/src/Magnum/MeshTools/CompressIndices.cpp b/src/Magnum/MeshTools/CompressIndices.cpp index 220f3517f..b687c978b 100644 --- a/src/Magnum/MeshTools/CompressIndices.cpp +++ b/src/Magnum/MeshTools/CompressIndices.cpp @@ -39,8 +39,8 @@ namespace Magnum { namespace MeshTools { namespace { template inline Containers::Array compress(const Containers::StridedArrayView1D& indices, Long offset) { - /* Can't use Utility::copy() here because we're copying from a larger type - to a smaller one (and subtracting an offset in addition) */ + /* Can't use Math::castInto() here because we're subtracting an offset in + addition */ Containers::Array buffer(indices.size()*sizeof(T)); for(std::size_t i = 0; i != indices.size(); ++i) { T index = static_cast(indices[i] - offset); diff --git a/src/Magnum/SceneTools/FlattenMeshHierarchy.h b/src/Magnum/SceneTools/FlattenMeshHierarchy.h index e8c5c1ac1..949c0df6e 100644 --- a/src/Magnum/SceneTools/FlattenMeshHierarchy.h +++ b/src/Magnum/SceneTools/FlattenMeshHierarchy.h @@ -26,7 +26,7 @@ */ /** @file - * @brief Function @ref Magnum::SceneTools::flattenMeshHierarchy2D(), @ref Magnum::SceneTools::flattenMeshHierarchy3D() + * @brief Function @ref Magnum::SceneTools::flattenMeshHierarchy2D(), @ref Magnum::SceneTools::flattenMeshHierarchy2DInto(), @ref Magnum::SceneTools::flattenMeshHierarchy3D(), @ref Magnum::SceneTools::flattenMeshHierarchy3DInto() * @m_since_latest */ diff --git a/src/Magnum/ShaderTools/AbstractConverter.h b/src/Magnum/ShaderTools/AbstractConverter.h index 0b9c24358..8fa57d291 100644 --- a/src/Magnum/ShaderTools/AbstractConverter.h +++ b/src/Magnum/ShaderTools/AbstractConverter.h @@ -349,6 +349,8 @@ produce the usual assertions. that exposes functionality of all shader converter plugins through a command line interface. + + @m_class{m-block m-warning} @par Multiple shader sources diff --git a/src/Magnum/Trade/MeshData.h b/src/Magnum/Trade/MeshData.h index ece42a4f1..331d81113 100644 --- a/src/Magnum/Trade/MeshData.h +++ b/src/Magnum/Trade/MeshData.h @@ -58,8 +58,10 @@ identifier using @ref meshAttributeCustom(MeshAttribute) and @ref meshAttributeCustom(UnsignedShort). Unlike the builtin ones, these can be of any type. An importer that exposes custom attributes then may also provide a string mapping using @ref AbstractImporter::meshAttributeForName() -and @ref AbstractImporter::meshAttributeName(). See documentation of a -particular importer for details. +and @ref AbstractImporter::meshAttributeName(); conversely a scene converter +supporting custom mesh attributes can have the string mapping specified via +@ref AbstractSceneConverter::setMeshAttributeName(). See documentation of a +particular importer and scene converter for details. @see @ref MeshAttributeData, @ref VertexFormat */ /* 16 bits because 8 bits is not enough to cover all potential per-edge, diff --git a/src/Magnum/Trade/SceneData.h b/src/Magnum/Trade/SceneData.h index b7edb74d7..973649be3 100644 --- a/src/Magnum/Trade/SceneData.h +++ b/src/Magnum/Trade/SceneData.h @@ -118,8 +118,10 @@ to and from a numeric identifier using @ref sceneFieldCustom(SceneField) and @ref sceneFieldCustom(UnsignedInt). Unlike the builtin ones, these can be of any type. An importer that exposes custom fields then may also provide a string mapping using @ref AbstractImporter::sceneFieldForName() and -@ref AbstractImporter::sceneFieldName(). See documentation of a particular -importer for details. +@ref AbstractImporter::sceneFieldName(); conversely a scene converter +supporting custom scene fields can have the string mapping specified via +@ref AbstractSceneConverter::setSceneFieldName(). See documentation of a +particular importer and scene converter for details. @see @ref SceneFieldData, @ref SceneFieldType */ enum class SceneField: UnsignedInt {