Skip to content

Commit b1567a0

Browse files
authored
Nodes: Ensure getBackgroundNode() and getEnvironmentNode() only returns nodes. (#30169)
1 parent f28ec3c commit b1567a0

File tree

1 file changed

+38
-2
lines changed

1 file changed

+38
-2
lines changed

src/renderers/common/nodes/Nodes.js

+38-2
Original file line numberDiff line numberDiff line change
@@ -199,13 +199,49 @@ class Nodes extends DataMap {
199199

200200
getEnvironmentNode( scene ) {
201201

202-
return scene.environmentNode || this.get( scene ).environmentNode || null;
202+
let environmentNode = null;
203+
204+
if ( scene.environmentNode && scene.environmentNode.isNode ) {
205+
206+
environmentNode = scene.environmentNode;
207+
208+
} else {
209+
210+
const sceneData = this.get( scene );
211+
212+
if ( sceneData.environmentNode ) {
213+
214+
environmentNode = sceneData.environmentNode;
215+
216+
}
217+
218+
}
219+
220+
return environmentNode;
203221

204222
}
205223

206224
getBackgroundNode( scene ) {
207225

208-
return scene.backgroundNode || this.get( scene ).backgroundNode || null;
226+
let backgroundNode = null;
227+
228+
if ( scene.backgroundNode && scene.backgroundNode.isNode ) {
229+
230+
backgroundNode = scene.backgroundNode;
231+
232+
} else {
233+
234+
const sceneData = this.get( scene );
235+
236+
if ( sceneData.backgroundNode ) {
237+
238+
backgroundNode = sceneData.backgroundNode;
239+
240+
}
241+
242+
}
243+
244+
return backgroundNode;
209245

210246
}
211247

0 commit comments

Comments
 (0)