bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Fix: Socket inspection error for data-block sockets

Browse Source 
After rB47276b847017, for certain socket types such as object or
material, the name of the item is not obtained correctly leading
the tooltip to display random non-character memory values as text.

Differential Revision: https://developer.blender.org/D14762
This commit is contained in:
Ethan-Hall 2022-04-28 15:05:56 -05:00 committed by Hans Goudey
parent 8095875dff
commit 708fabe3d7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/space_node/node_draw.cc
View File

@ -780,26 +780,26 @@ struct SocketTooltipData {
static void create_inspection_string_for_generic_value(const GPointer value, std::stringstream &ss) static void create_inspection_string_for_generic_value(const GPointer value, std::stringstream &ss)
{ {
auto id_to_inspection_string = [&](ID *id, short idcode) { auto id_to_inspection_string = [&](const ID *id, const short idcode) {
ss << (id ? id->name + 2 : TIP_("None")) << " (" << BKE_idtype_idcode_to_name(idcode) << ")"; ss << (id ? id->name + 2 : TIP_("None")) << " (" << BKE_idtype_idcode_to_name(idcode) << ")";
}; };
const CPPType &type = *value.type(); const CPPType &type = *value.type();
const void *buffer = value.get(); const void *buffer = value.get();
if (type.is<Object *>()) { if (type.is<Object *>()) {
id_to_inspection_string((ID *)buffer, ID_OB); id_to_inspection_string(*static_cast<const ID *const *>(buffer), ID_OB);
} }
else if (type.is<Material *>()) { else if (type.is<Material *>()) {
id_to_inspection_string((ID *)buffer, ID_MA); id_to_inspection_string(*static_cast<const ID *const *>(buffer), ID_MA);
} }
else if (type.is<Tex *>()) { else if (type.is<Tex *>()) {
id_to_inspection_string((ID *)buffer, ID_TE); id_to_inspection_string(*static_cast<const ID *const *>(buffer), ID_TE);
} }
else if (type.is<Image *>()) { else if (type.is<Image *>()) {
id_to_inspection_string((ID *)buffer, ID_IM); id_to_inspection_string(*static_cast<const ID *const *>(buffer), ID_IM);
} }
else if (type.is<Collection *>()) { else if (type.is<Collection *>()) {
id_to_inspection_string((ID *)buffer, ID_GR); id_to_inspection_string(*static_cast<const ID *const *>(buffer), ID_GR);
} }
else if (type.is<int>()) { else if (type.is<int>()) {
ss << *(int *)buffer << TIP_(" (Integer)"); ss << *(int *)buffer << TIP_(" (Integer)");