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 /source/blender/nodes
parent433fb9326ece7b0b84f2f548e43059881cca68b5 (diff)
Cleanup: use BLI_assert_unreachable in some places
Diffstat (limited to 'source/blender/nodes')
-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
5 files changed, 9 insertions, 9 deletions
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();
}
}