griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: compiler warnings

Browse Source
This commit is contained in:
Brecht Van Lommel
2023-10-18 16:02:13 +02:00
parent 50cabead7f
commit b867f16e27
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/customdata.cc
View File

@@ -2414,6 +2414,7 @@ static void ensure_layer_data_is_mutable(CustomDataLayer &layer, const int totel
}
}
#ifndef NDEBUG
static bool layer_is_mutable(CustomDataLayer &layer)
{
if (layer.sharing_info == nullptr) {
@@ -2421,6 +2422,7 @@ static bool layer_is_mutable(CustomDataLayer &layer)
}
return layer.sharing_info->is_mutable();
}
#endif
void CustomData_ensure_data_is_mutable(CustomDataLayer *layer, const int totelem)
{

22
source/blender/nodes/intern/node_socket.cc
View File

@@ -411,40 +411,40 @@ static const char *get_current_socket_identifier_for_future_socket(
socket_decls);
}
case GEO_NODE_BLUR_ATTRIBUTE: {
return get_identifier_from_decl({"Value"}, socket, socket_decls);
return get_identifier_from_decl("Value", socket, socket_decls);
}
case GEO_NODE_SAMPLE_CURVE: {
return get_identifier_from_decl({"Value"}, socket, socket_decls);
return get_identifier_from_decl("Value", socket, socket_decls);
}
case GEO_NODE_EVALUATE_AT_INDEX: {
return get_identifier_from_decl({"Value"}, socket, socket_decls);
return get_identifier_from_decl("Value", socket, socket_decls);
}
case GEO_NODE_EVALUATE_ON_DOMAIN: {
return get_identifier_from_decl({"Value"}, socket, socket_decls);
return get_identifier_from_decl("Value", socket, socket_decls);
}
case GEO_NODE_INPUT_NAMED_ATTRIBUTE: {
return get_identifier_from_decl({"Attribute"}, socket, socket_decls);
return get_identifier_from_decl("Attribute", socket, socket_decls);
}
case GEO_NODE_RAYCAST: {
return get_identifier_from_decl({"Attribute"}, socket, socket_decls);
return get_identifier_from_decl("Attribute", socket, socket_decls);
}
case GEO_NODE_SAMPLE_INDEX: {
return get_identifier_from_decl({"Value"}, socket, socket_decls);
return get_identifier_from_decl("Value", socket, socket_decls);
}
case GEO_NODE_SAMPLE_NEAREST_SURFACE: {
return get_identifier_from_decl({"Value"}, socket, socket_decls);
return get_identifier_from_decl("Value", socket, socket_decls);
}
case FN_NODE_RANDOM_VALUE: {
return get_identifier_from_decl({"Min", "Max", "Value"}, socket, socket_decls);
}
case GEO_NODE_SAMPLE_UV_SURFACE: {
return get_identifier_from_decl({"Value"}, socket, socket_decls);
return get_identifier_from_decl("Value", socket, socket_decls);
}
case GEO_NODE_STORE_NAMED_ATTRIBUTE: {
return get_identifier_from_decl({"Value"}, socket, socket_decls);
return get_identifier_from_decl("Value", socket, socket_decls);
}
case GEO_NODE_VIEWER: {
return get_identifier_from_decl({"Value"}, socket, socket_decls);
return get_identifier_from_decl("Value", socket, socket_decls);
}
case SH_NODE_MIX: {
return get_identifier_from_decl({"A", "B", "Result"}, socket, socket_decls);