Skip to content

#14675 | TextureLoader - Regex update #14682

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

Merged
merged 2 commits into from
Aug 9, 2018
Merged

#14675 | TextureLoader - Regex update #14682

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
402290d
#14675 | TextureLoader - Regex update
zuko-symphony Aug 9, 2018
971d768
#14675 | CR Updates
zuko-symphony Aug 9, 2018
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
2 changes: 1 addition & 1 deletion src/loaders/TextureLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Object.assign( TextureLoader.prototype, {
texture.image = image;

// JPEGs can't have an alpha channel, so memory can be saved by storing them as RGB.
var isJPEG = url.search( /\.(jpg|jpeg)$/ ) > 0 || url.search( /^data\:image\/jpeg/ ) === 0;
var isJPEG = url.search( /\.(?:jpe?g|JPE?G)$/ ) > 0 || url.search( /^data\:image\/jpeg/ ) === 0;

texture.format = isJPEG ? RGBFormat : RGBAFormat;
texture.needsUpdate = true;
Expand Down