From b867f16e274cbd87dde40e201df01a75c8b3ce74 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 18 Oct 2023 16:02:13 +0200 Subject: [PATCH] Cleanup: compiler warnings --- .../blender/blenkernel/intern/customdata.cc | 2 ++ source/blender/nodes/intern/node_socket.cc | 22 +++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/source/blender/blenkernel/intern/customdata.cc b/source/blender/blenkernel/intern/customdata.cc index dae84ee6f12..3efffe4ac11 100644 --- a/source/blender/blenkernel/intern/customdata.cc +++ b/source/blender/blenkernel/intern/customdata.cc @@ -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) { diff --git a/source/blender/nodes/intern/node_socket.cc b/source/blender/nodes/intern/node_socket.cc index c1393834c9f..c605ff28d4a 100644 --- a/source/blender/nodes/intern/node_socket.cc +++ b/source/blender/nodes/intern/node_socket.cc @@ -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);