Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <jacques@blender.org>2021-03-23 18:49:47 +0300
committerJacques Lucke <jacques@blender.org>2021-03-23 18:49:47 +0300
commit9a2e623372cbdbffc0daf25427fdf72e1cdb9b51 (patch)
tree32f5d3711deab2632d94e7a816170d5b43f8cc1d
parent433fb9326ece7b0b84f2f548e43059881cca68b5 (diff)
Cleanup: use BLI_assert_unreachable in some places
-rw-r--r--source/blender/blenkernel/BKE_attribute_math.hh2
-rw-r--r--source/blender/blenkernel/intern/attribute_access.cc6
-rw-r--r--source/blender/blenkernel/intern/geometry_component_mesh.cc2
-rw-r--r--source/blender/blenkernel/intern/geometry_set.cc2
-rw-r--r--source/blender/blenkernel/intern/node.cc2
-rw-r--r--source/blender/blenlib/BLI_virtual_array.hh4
-rw-r--r--source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc8
-rw-r--r--source/blender/nodes/intern/node_tree_ref.cc4
-rw-r--r--source/blender/nodes/intern/type_callbacks.cc2
-rw-r--r--source/blender/nodes/shader/nodes/node_shader_vector_math.cc2
-rw-r--r--source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc2
11 files changed, 18 insertions, 18 deletions
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;
}
}
diff --git a/source/blender/blenlib/BLI_virtual_array.hh b/source/blender/blenlib/BLI_virtual_array.hh
index 0f6240bad95..f9b0aaa7de6 100644
--- a/source/blender/blenlib/BLI_virtual_array.hh
+++ b/source/blender/blenlib/BLI_virtual_array.hh
@@ -126,7 +126,7 @@ template<typename T> class VArray {
virtual Span<T> get_span_impl() const
{
- BLI_assert(false);
+ BLI_assert_unreachable();
return {};
}
@@ -139,7 +139,7 @@ template<typename T> class VArray {
{
/* Provide a default implementation, so that subclasses don't have to provide it. This method
* should never be called because `is_single_impl` returns false by default. */
- BLI_assert(false);
+ BLI_assert_unreachable();
return T();
}
};
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc
index 3cf77a76682..01016ec9b44 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc
@@ -65,7 +65,7 @@ static int circle_vert_total(const GeometryNodeMeshCircleFillType fill_type, con
case GEO_NODE_MESH_CIRCLE_FILL_TRIANGLE_FAN:
return verts_num + 1;
}
- BLI_assert(false);
+ BLI_assert_unreachable();
return 0;
}
@@ -78,7 +78,7 @@ static int circle_edge_total(const GeometryNodeMeshCircleFillType fill_type, con
case GEO_NODE_MESH_CIRCLE_FILL_TRIANGLE_FAN:
return verts_num * 2;
}
- BLI_assert(false);
+ BLI_assert_unreachable();
return 0;
}
@@ -92,7 +92,7 @@ static int circle_corner_total(const GeometryNodeMeshCircleFillType fill_type, c
case GEO_NODE_MESH_CIRCLE_FILL_TRIANGLE_FAN:
return verts_num * 3;
}
- BLI_assert(false);
+ BLI_assert_unreachable();
return 0;
}
@@ -106,7 +106,7 @@ static int circle_face_total(const GeometryNodeMeshCircleFillType fill_type, con
case GEO_NODE_MESH_CIRCLE_FILL_TRIANGLE_FAN:
return verts_num;
}
- BLI_assert(false);
+ BLI_assert_unreachable();
return 0;
}
diff --git a/source/blender/nodes/intern/node_tree_ref.cc b/source/blender/nodes/intern/node_tree_ref.cc
index 3735cfe3247..e627a7f4497 100644
--- a/source/blender/nodes/intern/node_tree_ref.cc
+++ b/source/blender/nodes/intern/node_tree_ref.cc
@@ -141,7 +141,7 @@ InputSocketRef &NodeTreeRef::find_input_socket(Map<bNode *, NodeRef *> &node_map
return *socket;
}
}
- BLI_assert(false);
+ BLI_assert_unreachable();
return *node->inputs_[0];
}
@@ -155,7 +155,7 @@ OutputSocketRef &NodeTreeRef::find_output_socket(Map<bNode *, NodeRef *> &node_m
return *socket;
}
}
- BLI_assert(false);
+ BLI_assert_unreachable();
return *node->outputs_[0];
}
diff --git a/source/blender/nodes/intern/type_callbacks.cc b/source/blender/nodes/intern/type_callbacks.cc
index 1f207f880bc..26eeaebc6d4 100644
--- a/source/blender/nodes/intern/type_callbacks.cc
+++ b/source/blender/nodes/intern/type_callbacks.cc
@@ -69,7 +69,7 @@ void socket_expand_in_mf_network(SocketMFNetworkBuilder &builder)
builder.set_constant_value(type, buffer);
}
else {
- BLI_assert(false);
+ BLI_assert_unreachable();
}
}
diff --git a/source/blender/nodes/shader/nodes/node_shader_vector_math.cc b/source/blender/nodes/shader/nodes/node_shader_vector_math.cc
index becc83dd694..3a9822fbc8e 100644
--- a/source/blender/nodes/shader/nodes/node_shader_vector_math.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_vector_math.cc
@@ -285,7 +285,7 @@ static const blender::fn::MultiFunction &get_multi_function(
return builder.get_not_implemented_fn();
}
default:
- BLI_assert(false);
+ BLI_assert_unreachable();
return builder.get_not_implemented_fn();
};
}
diff --git a/source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc b/source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc
index 30b043439b8..3b2c2fa5a03 100644
--- a/source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc
@@ -181,7 +181,7 @@ static const blender::fn::MultiFunction &get_multi_function(
return fn;
}
default:
- BLI_assert(false);
+ BLI_assert_unreachable();
return builder.get_not_implemented_fn();
}
}