Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix irradiance generation in MaterialXView #1647

Merged
merged 1 commit into from
Jan 11, 2024
+2 −2
Merged

Fix irradiance generation in MaterialXView #1647

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions source/MaterialXView/Viewer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,15 +402,15 @@ void Viewer::loadEnvironmentLight()
}

// Look for an irradiance map using an expected filename convention.
mx::ImagePtr envIrradianceMap = _imageHandler->getZeroImage();
mx::ImagePtr envIrradianceMap;
if (!_normalizeEnvironment && !_splitDirectLight)
{
mx::FilePath envIrradiancePath = _envRadianceFilename.getParentPath() / IRRADIANCE_MAP_FOLDER / _envRadianceFilename.getBaseName();
envIrradianceMap = _imageHandler->acquireImage(envIrradiancePath);
}

// If not found, then generate an irradiance map via spherical harmonics.
if (envIrradianceMap == _imageHandler->getZeroImage())
if (!envIrradianceMap || envIrradianceMap->getWidth() == 1)
{
if (_generateReferenceIrradiance)
{
Expand Down