From 7ab565fe8739de081a9e5dc594d7ad0de37db5a8 Mon Sep 17 00:00:00 2001 From: Eric Sherouse Date: Tue, 9 Oct 2018 16:36:28 -0400 Subject: [PATCH 1/2] Possible fix for scene.pickFromRay bug --- Source/Scene/Scene.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/Scene/Scene.js b/Source/Scene/Scene.js index fe0e922db839..d247bce70256 100644 --- a/Source/Scene/Scene.js +++ b/Source/Scene/Scene.js @@ -2944,7 +2944,9 @@ define([ // the function modifies scene state that should remain constant over the frame. var functions = scene._frameState.afterRender; for (var i = 0, length = functions.length; i < length; ++i) { - functions[i](); + if (functions[i]) { + functions[i](); + } scene.requestRender(); } From 3718cf615ba5172933cc5c0d5248e3644bd11db8 Mon Sep 17 00:00:00 2001 From: Eric Sherouse Date: Wed, 10 Oct 2018 10:27:09 -0400 Subject: [PATCH 2/2] Removed callAfterRenderFunctions() inside getRayIntersection --- Source/Scene/Scene.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Source/Scene/Scene.js b/Source/Scene/Scene.js index d247bce70256..2b62d87cad5f 100644 --- a/Source/Scene/Scene.js +++ b/Source/Scene/Scene.js @@ -2944,9 +2944,7 @@ define([ // the function modifies scene state that should remain constant over the frame. var functions = scene._frameState.afterRender; for (var i = 0, length = functions.length; i < length; ++i) { - if (functions[i]) { - functions[i](); - } + functions[i](); scene.requestRender(); } @@ -3691,7 +3689,6 @@ define([ scene._view = scene._defaultView; context.endFrame(); - callAfterRenderFunctions(scene); if (defined(object) || defined(position)) { return {