[Bf-blender-cvs] [91ecf47b2c6] master: Fix: Sample nearest surface node crash with empty mesh

[Hans Goudey]

Commit: 91ecf47b2c6b884aadb5550adeda03d5700988d4
Author: Hans Goudey
Date:   Tue Oct 18 10:07:32 2022 -0500
Branches: master
https://developer.blender.org/rB91ecf47b2c6b884aadb5550adeda03d5700988d4

Fix: Sample nearest surface node crash with empty mesh

===================================================================

M	source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc

===================================================================

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;