Skip to content

[pull] dev from mrdoob:dev #1288

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Apr 20, 2026
Merged

[pull] dev from mrdoob:dev #1288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36599a7
NodeMaterialObserver: Fix default version value of textures. (#33422)
Mugen87 Apr 20, 2026
95b9a43
Editor: Remove legacy JSON format Worker code. (#33423)
Apr 20, 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
22 changes: 0 additions & 22 deletions editor/js/Loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,28 +466,6 @@ function Loader( editor ) {

const contents = event.target.result;

// 2.0

if ( contents.indexOf( 'postMessage' ) !== - 1 ) {

const blob = new Blob( [ contents ], { type: 'text/javascript' } );
const url = URL.createObjectURL( blob );

const worker = new Worker( url );

worker.onmessage = function ( event ) {

event.data.metadata = { version: 2 };
handleJSON( event.data );

};

worker.postMessage( Date.now() );

return;

}

// >= 3.0

let data;
Expand Down
Binary file modified examples/screenshots/webgpu_rendertarget_2d-array_3d.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/materials/nodes/manager/NodeMaterialObserver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ class NodeMaterialObserver {

if ( value.isTexture === true ) {

data[ property ] = { id: value.id, version: value.version };
data[ property ] = { id: value.id, version: 0 };

} else {

Expand Down
3 changes: 2 additions & 1 deletion test/e2e/puppeteer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ const exceptionList = [
'webgpu_tsl_editor',
'webxr_vr_video',
'webgpu_tsl_transpiler',
'webgpu_rendertarget_2d-array_3d',

// Need more time to render
'css3d_mixed',
Expand Down Expand Up @@ -219,7 +220,7 @@ async function main() {
const buildInjection = ( code ) => code
.replace( /Math\.random\(\) \* 0xffffffff/g, 'Math._random() * 0xffffffff' )
// Disables WebGPU timestamp queries to prevent Inspector/Profiler from crashing in E2E software mode
.replace( /this\.trackTimestamp\s*=\s*\(\s*parameters\.trackTimestamp\s*===\s*true\s*\);/g, "Object.defineProperty(this, 'trackTimestamp', { get: () => false, set: () => {} });" );
.replace( /this\.trackTimestamp\s*=\s*\(\s*parameters\.trackTimestamp\s*===\s*true\s*\);/g, 'Object.defineProperty(this, \'trackTimestamp\', { get: () => false, set: () => {} });' );

const cleanPage = await fs.readFile( 'test/e2e/clean-page.js', 'utf8' );
const injection = await fs.readFile( 'test/e2e/deterministic-injection.js', 'utf8' );
Expand Down
Loading