From 9a2e623372cbdbffc0daf25427fdf72e1cdb9b51 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Tue, 23 Mar 2021 16:49:47 +0100 Subject: Cleanup: use BLI_assert_unreachable in some places --- source/blender/blenkernel/BKE_attribute_math.hh | 2 +- source/blender/blenkernel/intern/attribute_access.cc | 6 +++--- source/blender/blenkernel/intern/geometry_component_mesh.cc | 2 +- source/blender/blenkernel/intern/geometry_set.cc | 2 +- source/blender/blenkernel/intern/node.cc | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/BKE_attribute_math.hh b/source/blender/blenkernel/BKE_attribute_math.hh index 0294a8c09d5..16fc0db60fb 100644 --- a/source/blender/blenkernel/BKE_attribute_math.hh +++ b/source/blender/blenkernel/BKE_attribute_math.hh @@ -49,7 +49,7 @@ void convert_to_static_type(const CustomDataType data_type, const Func &func) func(Color4f()); break; default: - BLI_assert(false); + BLI_assert_unreachable(); break; } } diff --git a/source/blender/blenkernel/intern/attribute_access.cc b/source/blender/blenkernel/intern/attribute_access.cc index 91b5b01e3eb..2ab0b6ce531 100644 --- a/source/blender/blenkernel/intern/attribute_access.cc +++ b/source/blender/blenkernel/intern/attribute_access.cc @@ -299,7 +299,7 @@ static int attribute_data_type_complexity(const CustomDataType data_type) #endif default: /* Only accept "generic" custom data types used by the attribute system. */ - BLI_assert(false); + BLI_assert_unreachable(); return 0; } } @@ -341,7 +341,7 @@ static int attribute_domain_priority(const AttributeDomain domain) return 4; default: /* Domain not supported in nodes yet. */ - BLI_assert(false); + BLI_assert_unreachable(); return 0; } } @@ -703,7 +703,7 @@ bool GeometryComponent::attribute_domain_supported(const AttributeDomain domain) int GeometryComponent::attribute_domain_size(const AttributeDomain UNUSED(domain)) const { - BLI_assert(false); + BLI_assert_unreachable(); return 0; } diff --git a/source/blender/blenkernel/intern/geometry_component_mesh.cc b/source/blender/blenkernel/intern/geometry_component_mesh.cc index eee7c2ff09e..5dc14104046 100644 --- a/source/blender/blenkernel/intern/geometry_component_mesh.cc +++ b/source/blender/blenkernel/intern/geometry_component_mesh.cc @@ -179,7 +179,7 @@ int MeshComponent::attribute_domain_size(const AttributeDomain domain) const case ATTR_DOMAIN_POLYGON: return mesh_->totpoly; default: - BLI_assert(false); + BLI_assert_unreachable(); break; } return 0; diff --git a/source/blender/blenkernel/intern/geometry_set.cc b/source/blender/blenkernel/intern/geometry_set.cc index f47d88cbeed..a09c3f5f3d3 100644 --- a/source/blender/blenkernel/intern/geometry_set.cc +++ b/source/blender/blenkernel/intern/geometry_set.cc @@ -65,7 +65,7 @@ GeometryComponent *GeometryComponent::create(GeometryComponentType component_typ case GEO_COMPONENT_TYPE_VOLUME: return new VolumeComponent(); } - BLI_assert(false); + BLI_assert_unreachable(); return nullptr; } diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc index ea8d0b5415c..d06e4030117 100644 --- a/source/blender/blenkernel/intern/node.cc +++ b/source/blender/blenkernel/intern/node.cc @@ -438,7 +438,7 @@ static void write_node_socket_default_value(BlendWriter *writer, bNodeSocket *so case SOCK_CUSTOM: case SOCK_SHADER: case SOCK_GEOMETRY: - BLI_assert(false); + BLI_assert_unreachable(); break; } } -- cgit v1.2.3