Merge pull request from SamGondelman/color

Case 21070: Fix black albedo coloring
This commit is contained in:
John Conklin II 2019-02-08 14:42:19 -08:00 committed by GitHub
commit 95aadeafb0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -87,7 +87,7 @@ void Material::setUnlit(bool value) {
}
void Material::setAlbedo(const glm::vec3& albedo, bool isSRGB) {
_key.setAlbedo(glm::any(glm::greaterThan(albedo, glm::vec3(0.0f))));
_key.setAlbedo(true);
_albedo = (isSRGB ? ColorUtils::sRGBToLinearVec3(albedo) : albedo);
}