Skip to content

[pull] dev from mrdoob:dev #1198

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
pull merged 3 commits into from
Mar 11, 2026
Merged

[pull] dev from mrdoob:dev #1198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6173b5a
GLTFLoader: Handle zero `ior` edge case. (#33119)
Mugen87 Mar 11, 2026
3ad2c78
Update ESLint to ECMA 2022. (#33128)
PoseidonEnergy Mar 11, 2026
91aff1f
DataTextureLoader: Fix log regression. (#33148)
Mugen87 Mar 11, 2026
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 eslint.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export default [
jsdoc
},
languageOptions: {
ecmaVersion: 2018,
ecmaVersion: 2022,
sourceType: 'module',
globals: {
...globals.browser,
Expand Down Expand Up @@ -134,7 +134,7 @@ export default [
name: 'editor rules',
files: [ 'editor/**/*.js' ],
languageOptions: {
ecmaVersion: 2020,
ecmaVersion: 2022,
sourceType: 'module'
}
}
Expand Down
2 changes: 2 additions & 0 deletions examples/jsm/loaders/GLTFLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1273,6 +1273,8 @@ class GLTFMaterialsIorExtension {

materialParams.ior = extension.ior !== undefined ? extension.ior : 1.5;

if ( materialParams.ior === 0 ) materialParams.ior = 1000; // see #26167

return Promise.resolve();

}
Expand Down
7 changes: 4 additions & 3 deletions src/loaders/DataTextureLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { LinearFilter, LinearMipmapLinearFilter, ClampToEdgeWrapping } from '../
import { FileLoader } from './FileLoader.js';
import { DataTexture } from '../textures/DataTexture.js';
import { Loader } from './Loader.js';
import { error } from '../utils.js';

/**
* Abstract base class for loading binary texture formats RGBE, EXR or TGA.
Expand Down Expand Up @@ -57,15 +58,15 @@ class DataTextureLoader extends Loader {

texData = scope.parse( buffer );

} catch ( error ) {
} catch ( e ) {

if ( onError !== undefined ) {

onError( error );
onError( e );

} else {

error( error );
error( e );
return;

}
Expand Down