Merge pull request #411 from dmurdoch/callbackbug

Missed passing target to recursive search.
dmurdoch · Feb 19, 2024 · 38acbdb · 38acbdb
2 parents 0d31d58 + 45f2eda
commit 38acbdb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,5 +1,5 @@
 Package: rgl
-Version: 1.2.13
+Version: 1.2.15
 Title: 3D Visualization Using OpenGL
 Authors@R: c(person("Duncan", "Murdoch", role = c("aut", "cre"),
                      email = "murdoch.duncan@gmail.com"),

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,4 @@
-# rgl 1.2.14
+# rgl 1.2.15
 
 ## Major changes
 
@@ -29,6 +29,9 @@ run in a Shiny session.
 * Smooth shapes were not rendered correctly by `rglwidget()`.
   This was especially noticeable for spheres with `fov = 0`, but was present in other cases as well (issue #401).
 * `textype = "alpha"` was not rendered correctly by `rglwidget()` (issue #408).
+* `setUserCallbacks()` and related functions failed when
+the `subscene` argument was anything other than the root
+subscene.
 
 # rgl 1.2.1
 

diff --git a/R/setUserCallbacks.R b/R/setUserCallbacks.R
@@ -6,7 +6,7 @@ findSubscene <- function(subscene, id) {
   subscenes <- subscene$subscenes
   if (!is.null(subscenes)) {
     for (i in seq_along(subscenes)) {
-      if (!is.null(result <- findSubscene(subscenes[[i]])))
+      if (!is.null(result <- findSubscene(subscenes[[i]], id)))
         return(result)
     }
   }