Merge branch 'master' into feature/neuronlistfh-db1

natverse · Jan 26, 2021 · d8e0cd8 · d8e0cd8
2 parents 810e994 + eae539f
commit d8e0cd8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/R/hxsurf.R b/R/hxsurf.R
@@ -709,10 +709,7 @@ pointsinside<-function(x, surf, ...) UseMethod('pointsinside')
 #' @rdname pointsinside
 pointsinside.default<-function(x, surf, ..., rval=c('logical','distance', 
                                                     'mesh3d', 'consistent_logical')) {
-  if(!requireNamespace('Rvcg', quietly = TRUE))
-    stop("Please install suggested library Rvcg to use pointsinside")
   rval=match.arg(rval)
-
   if(rval=='logical') {
     # use optimised contains_points approach
     return(contains_points(surf, x, ...))
@@ -723,6 +720,9 @@ pointsinside.default<-function(x, surf, ..., rval=c('logical','distance',
            "with boundingbox objects!")
   }
 
+  if(!requireNamespace('Rvcg', quietly = TRUE))
+    stop("Please install suggested library Rvcg to use pointsinside")
+
   if(!inherits(surf,'mesh3d')) {
     surf=as.mesh3d(surf, ...)
   }