[Bf-blender-cvs] [5ffcd8779eb] master: Fix: socket tooltip not showing when there was no type conversion
Jacques Lucke
noreply at git.blender.org
Fri Dec 16 19:39:29 CET 2022
Commit: 5ffcd8779eb27145cbc8de0450be0e2c7b03a915
Author: Jacques Lucke
Date: Fri Dec 16 19:39:14 2022 +0100
Branches: master
https://developer.blender.org/rB5ffcd8779eb27145cbc8de0450be0e2c7b03a915
Fix: socket tooltip not showing when there was no type conversion
===================================================================
M source/blender/editors/space_node/node_draw.cc
===================================================================
diff --git a/source/blender/editors/space_node/node_draw.cc b/source/blender/editors/space_node/node_draw.cc
index 2790e8de6a8..4d551557bac 100644
--- a/source/blender/editors/space_node/node_draw.cc
+++ b/source/blender/editors/space_node/node_draw.cc
@@ -833,10 +833,13 @@ static void create_inspection_string_for_generic_value(const bNodeSocket &socket
const CPPType &socket_type = *socket.typeinfo->base_cpp_type;
const bke::DataTypeConversions &convert = bke::get_implicit_type_conversions();
- if (!convert.is_convertible(value_type, socket_type)) {
- return;
+ if (value_type != socket_type) {
+ if (!convert.is_convertible(value_type, socket_type)) {
+ return;
+ }
}
BUFFER_FOR_CPP_TYPE_VALUE(socket_type, socket_value);
+ /* This will just copy the value if the types are equal. */
convert.convert_to_uninitialized(value_type, socket_type, buffer, socket_value);
BLI_SCOPED_DEFER([&]() { socket_type.destruct(socket_value); });
More information about the Bf-blender-cvs
mailing list