Skip to content

[pull] dev from mrdoob:dev #1418

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 2 commits into from
Jun 12, 2026
+14 −0
Merged

[pull] dev from mrdoob:dev #1418

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
c888e71
WebGPURenderer: Fix displacement-map shadows (#33774)
sunag Jun 12, 2026
a0bed5c
USDAParser: Fix inline-brace prim definitions being silently dropped …
wheresoli Jun 12, 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
2 changes: 2 additions & 0 deletions examples/jsm/loaders/usd/USDAParser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ class USDAParser {

} else if ( line.endsWith( '{' ) ) {

string = line.slice( 0, - 1 ).trim() || string;

const group = target[ string ] || {};
stack.push( group );

Expand Down
12 changes: 12 additions & 0 deletions src/renderers/common/Renderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3499,6 +3499,9 @@ class Renderer {
let materialDepthNode;
let materialPositionNode;
let materialSide;
let materialDisplacementMap;
let materialDisplacementScale;
let materialDisplacementBias;

const previousSourceMaterial = this._currentSourceMaterial;

Expand All @@ -3521,6 +3524,9 @@ class Renderer {
materialDepthNode = ( overrideMaterial.isNodeMaterial ) ? overrideMaterial.depthNode : null;
materialPositionNode = ( overrideMaterial.isNodeMaterial ) ? overrideMaterial.positionNode : null;
materialSide = scene.overrideMaterial.side;
materialDisplacementMap = overrideMaterial.displacementMap;
materialDisplacementScale = overrideMaterial.displacementScale;
materialDisplacementBias = overrideMaterial.displacementBias;

if ( material.positionNode && material.positionNode.isNode ) {

Expand All @@ -3530,6 +3536,9 @@ class Renderer {

overrideMaterial.alphaTest = material.alphaTest;
overrideMaterial.alphaMap = material.alphaMap;
overrideMaterial.displacementMap = material.displacementMap;
overrideMaterial.displacementScale = material.displacementScale;
overrideMaterial.displacementBias = material.displacementBias;
overrideMaterial.transparent = material.transparent || material.transmission > 0 ||
( material.transmissionNode && material.transmissionNode.isNode ) ||
( material.backdropNode && material.backdropNode.isNode );
Expand Down Expand Up @@ -3584,6 +3593,9 @@ class Renderer {
scene.overrideMaterial.depthNode = materialDepthNode;
scene.overrideMaterial.positionNode = materialPositionNode;
scene.overrideMaterial.side = materialSide;
scene.overrideMaterial.displacementMap = materialDisplacementMap;
scene.overrideMaterial.displacementScale = materialDisplacementScale;
scene.overrideMaterial.displacementBias = materialDisplacementBias;

}

Expand Down