Skip to content

Commit 5028d13

Browse files
committed
Merge branch 'next' into fix/logger-with-level
2 parents 7a6aaae + 02c4ffa commit 5028d13

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

cmake/ConfigureEarcut.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ExternalProject_Add(earcut
2626
BINARY_DIR ${EARCUT_PATH}/build
2727
STAMP_DIR ${EARCUT_PATH}/stamp
2828
GIT_REPOSITORY https://github.com/mapbox/earcut.hpp
29-
GIT_TAG a30c14b5676adabe4714ff4173dae8a5d568ab59
29+
GIT_TAG 7fa7aa30183849e988ae79ab2eef19f9ae97acf4
3030
GIT_SHALLOW ON
3131
GIT_PROGRESS ON
3232
CMAKE_GENERATOR ${CMAKE_GENERATOR}

src/geode/model/helpers/component_mesh_edges.cpp

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,11 @@ namespace geode
109109
const Model& model,
110110
const std::array< geode::index_t, 2 >& edge_unique_vertices )
111111
{
112+
if( edge_unique_vertices[0] == NO_ID
113+
|| edge_unique_vertices[1] == NO_ID )
114+
{
115+
return {};
116+
}
112117
const auto line_pairs =
113118
model_edge_pairs( model, edge_unique_vertices,
114119
geode::Line< Model::dim >::component_type_static() );
@@ -146,6 +151,11 @@ namespace geode
146151
surface_component_mesh_edges( const Model& model,
147152
const std::array< geode::index_t, 2 >& edge_unique_vertices )
148153
{
154+
if( edge_unique_vertices[0] == NO_ID
155+
|| edge_unique_vertices[1] == NO_ID )
156+
{
157+
return {};
158+
}
149159
const auto surface_pairs =
150160
model_edge_pairs( model, edge_unique_vertices,
151161
geode::Surface< Model::dim >::component_type_static() );
@@ -184,6 +194,11 @@ namespace geode
184194
const geode::BRep& model,
185195
const std::array< geode::index_t, 2 >& edge_unique_vertices )
186196
{
197+
if( edge_unique_vertices[0] == NO_ID
198+
|| edge_unique_vertices[1] == NO_ID )
199+
{
200+
return {};
201+
}
187202
const auto block_pairs = model_edge_pairs( model,
188203
edge_unique_vertices, geode::Block3D::component_type_static() );
189204
if( block_pairs.empty() )

0 commit comments

Comments
 (0)