diff --git a/doc/changelog.dox b/doc/changelog.dox index 5ae3e9647..20584cba7 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -287,6 +287,9 @@ See also: - @ref Trade::PhongMaterialData now supports both color and texture instead of just one or the other, can reference normal textures as well and specfify texture coordinate transform +- @ref Trade::PhongMaterialData now supports non-default texture coordinate + sets (see [mosra/magnum#278](https://github.com/mosra/magnum/pull/278), + [mosra/magnum#438](https://github.com/mosra/magnum/pull/438)) - Added @ref Trade::AbstractImporter::setFlags() and @ref Trade::AbstractImageConverter::setFlags() for configuring common plugin behavior such as output verbosity level; exposed also via a new diff --git a/doc/credits.dox b/doc/credits.dox index 8b4e01bb9..0f2d03b18 100644 --- a/doc/credits.dox +++ b/doc/credits.dox @@ -139,10 +139,10 @@ Are the below lists missing your name or something's wrong? - **Jan Dupal** ([\@JanDupal](https://github.com/JanDupal)) --- Homebrew package for `magnum-bindings` - **Jonathan Hale** ([\@Squareys](https://github.com/Squareys)) --- - @ref Audio library enhancements, @ref Platform::GlfwApplication and - @ref Platform::EmscriptenApplication implementation, frustum and cone - culling, bug reports, Windows build improvements, documentation - improvements and tons of other stuff + @ref Audio and @ref Trade library enhancements, + @ref Platform::GlfwApplication and @ref Platform::EmscriptenApplication + implementation, frustum and cone culling, bug reports, Windows build + improvements, documentation improvements and tons of other stuff - **Joel Clay** ([\@jclay](https://github.com/jclay)) --- Vcpkg packages - **Konstantinos Chatzilygeroudis** ([\@costashatz](https://github.com/costashatz)) --- Debian package, improvements to @ref Platform::GlfwApplication and diff --git a/src/Magnum/Trade/PhongMaterialData.cpp b/src/Magnum/Trade/PhongMaterialData.cpp index 25fe471cb..6cc95981b 100644 --- a/src/Magnum/Trade/PhongMaterialData.cpp +++ b/src/Magnum/Trade/PhongMaterialData.cpp @@ -3,6 +3,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Vladimír Vondruš + Copyright © 2020 Jonathan Hale Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/Trade/PhongMaterialData.h b/src/Magnum/Trade/PhongMaterialData.h index 2c889736d..35a0ec333 100644 --- a/src/Magnum/Trade/PhongMaterialData.h +++ b/src/Magnum/Trade/PhongMaterialData.h @@ -5,6 +5,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Vladimír Vondruš + Copyright © 2020 Jonathan Hale Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),