Merge branch 'master' into cycles_path_guidingcycles_path_guiding

1 files changed, 5 insertions, 1 deletions

diff --git a/source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc b/source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc
index 44851a0ade5..95bf7199d63 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc
@@ -240,7 +240,11 @@ static void node_geo_exec(GeoNodeExecParams params)
     params.set_default_remaining_outputs();
     return;
   }
-  if (mesh->totpoly == 0 && mesh->totvert != 0) {
+  if (mesh->totvert == 0) {
+    params.set_default_remaining_outputs();
+    return;
+  }
+  if (mesh->totpoly == 0) {
     params.error_message_add(NodeWarningType::Error, TIP_("The source mesh must have faces"));
     params.set_default_remaining_outputs();
     return;