blender
/
blender
137
418
Fork 600
Code Issues 6.3k Pull Requests 783 Projects 19 Wiki Activity

Geometry Nodes: support panels in geometry nodes modifier #116472

Merged
Jacques Lucke merged 10 commits from JacquesLucke/blender:nodes-modifier-panels into main 2023-12-23 16:33:25 +01:00
Conversation 1 Commits 10 Files Changed 3 +2 -4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2cb9709e38 - Show all commits

6
source/blender/modifiers/intern/MOD_nodes.cc
View File

@ -1900,8 +1900,7 @@ static void draw_interface_panel_content(const bContext *C,
for (const bNodeTreeInterfaceItem *item : interface_panel.items()) {
if (item->item_type == NODE_INTERFACE_PANEL) {
const bNodeTreeInterfacePanel &sub_interface_panel =
*reinterpret_cast<const bNodeTreeInterfacePanel *>(item);
const auto &sub_interface_panel = *reinterpret_cast<const bNodeTreeInterfacePanel *>(item);
JacquesLucke marked this conversation as resolved Outdated
Hans Goudey commented 2023-12-23 15:33:02 +01:00
Outdated
Review
Copy Link

Using const auto & after these reinterpret casts looks a bit nicer

Using `const auto &` after these reinterpret casts looks a bit nicer
NodesModifierPanel *panel = find_panel_by_id(nmd, sub_interface_panel.identifier);
PointerRNA panel_ptr = RNA_pointer_create(
modifier_ptr->owner_id, &RNA_NodesModifierPanel, panel);
@ -1913,8 +1912,7 @@ static void draw_interface_panel_content(const bContext *C,
}
}
else {
const bNodeTreeInterfaceSocket &interface_socket =
*reinterpret_cast<const bNodeTreeInterfaceSocket *>(item);
const auto &interface_socket = *reinterpret_cast<const bNodeTreeInterfaceSocket *>(item);
if (interface_socket.flag & NODE_INTERFACE_SOCKET_INPUT) {
if (!(interface_socket.flag & NODE_INTERFACE_SOCKET_HIDE_IN_MODIFIER)) {
draw_property_for_socket(