From 3a31fcebcf5f189366d1fe2b48e431a034238771 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Mon, 10 Jun 2024 22:23:03 -0400 Subject: [PATCH] Fix: Link error in lite build without STL IO --- source/blender/nodes/geometry/CMakeLists.txt | 9 +++++++-- .../blender/nodes/geometry/nodes/node_geo_import_stl.cc | 6 ++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/source/blender/nodes/geometry/CMakeLists.txt b/source/blender/nodes/geometry/CMakeLists.txt index 81b44289277..bb4ee06d90b 100644 --- a/source/blender/nodes/geometry/CMakeLists.txt +++ b/source/blender/nodes/geometry/CMakeLists.txt @@ -240,10 +240,15 @@ set(LIB bf_nodes PRIVATE bf::intern::atomic PRIVATE bf::extern::fmtlib - PRIVATE bf_io_common - PRIVATE bf_io_stl ) +if(WITH_IO_STL) + list(APPEND LIB + PRIVATE bf_io_common + PRIVATE bf_io_stl + ) +endif() + if(WITH_BULLET) list(APPEND INC_SYS ${BULLET_INCLUDE_DIRS} diff --git a/source/blender/nodes/geometry/nodes/node_geo_import_stl.cc b/source/blender/nodes/geometry/nodes/node_geo_import_stl.cc index 978e2949d92..ac3e7b97636 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_import_stl.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_import_stl.cc @@ -24,6 +24,7 @@ static void node_declare(NodeDeclarationBuilder &b) static void node_geo_exec(GeoNodeExecParams params) { +#ifdef WITH_IO_STL const std::string path = params.extract_input("Path"); if (path.empty()) { @@ -71,6 +72,11 @@ static void node_geo_exec(GeoNodeExecParams params) else { params.set_default_remaining_outputs(); } +#else + params.error_message_add(NodeWarningType::Error, + TIP_("Disabled, Blender was compiled without OpenSubdiv")); + params.set_default_remaining_outputs(); +#endif } static void node_register()