ilusha/pbrt-v4
1
0
Fork 0
mirror of https://github.com/mmp/pbrt-v4 synced 2026-09-26 16:20:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

Merge pull request #282 from shadeops/realistic_cam_aperture_file

Browse source 
Only resolve aperture as a file if not a builtin name
This commit is contained in:
Matt Pharr 2022-06-30 05:40:06 -07:00 • committed by GitHub
commit f69b53e596
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/pbrt/cameras.cpp
View file

@ -1333,7 +1333,7 @@ RealisticCamera *RealisticCamera::Create(const ParameterDictionary &parameters,
return image;
};
std::string apertureName = ResolveFilename(parameters.GetOneString("aperture", ""));
std::string apertureName = parameters.GetOneString("aperture", "");
Image apertureImage(alloc);
if (!apertureName.empty()) {
// built-in diaphragm shapes
@ -1380,7 +1380,7 @@ RealisticCamera *RealisticCamera::Create(const ParameterDictionary &parameters,
std::reverse(vert.begin(), vert.end());
apertureImage = rasterize(vert);
} else {
ImageAndMetadata im = Image::Read(apertureName, alloc);
ImageAndMetadata im = Image::Read(ResolveFilename(apertureName), alloc);
apertureImage = std::move(im.image);
if (apertureImage.NChannels() > 1) {
ImageChannelDesc rgbDesc = apertureImage.GetChannelDesc({"R", "G", "B"});