blender
/
blender
135
425
Fork 608
Code Issues 6.2k Pull Requests 781 Projects 19 Wiki Activity

Geometry Nodes: add Inspection Index to Repeat Zone #112818

Merged
Jacques Lucke merged 7 commits from JacquesLucke/blender:repeat-viewer-iteration into main 2023-09-27 11:09:46 +02:00
Conversation 9 Commits 7 Files Changed 13 +10 -10
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 71e6f6778d - Show all commits

2
scripts/startup/bl_ui/space_node.py
View File

@ -1128,7 +1128,7 @@ class NODE_PT_repeat_zone_items(Panel):
layout.use_property_decorate = False
layout.prop(active_item, "socket_type")
layout.prop(output_node, "viewer_iteration")
layout.prop(output_node, "inspection_index")
# Grease Pencil properties

2
source/blender/editors/space_node/space_node.cc
View File

@ -320,7 +320,7 @@ bool push_compute_context_for_tree_path(const SpaceNode &snode,
const auto &storage = *static_cast<const NodeGeometryRepeatOutput *>(
zone->output_node->storage);
compute_context_builder.push<bke::RepeatZoneComputeContext>(*zone->output_node,
storage.viewer_iteration);
storage.inspection_index);
break;
}
}

2
source/blender/editors/util/ed_viewer_path.cc
View File

@ -40,7 +40,7 @@ static ViewerPathElem *viewer_path_elem_for_zone(const bNodeTreeZone &zone)
const auto &storage = *static_cast<NodeGeometryRepeatOutput *>(zone.output_node->storage);
RepeatZoneViewerPathElem *node_elem = BKE_viewer_path_elem_new_repeat_zone();
node_elem->repeat_output_node_id = zone.output_node->identifier;
node_elem->iteration = storage.viewer_iteration;
node_elem->iteration = storage.inspection_index;
return &node_elem->base;
}
}

2
source/blender/makesdna/DNA_node_types.h
View File

@ -1829,7 +1829,7 @@ typedef struct NodeGeometryRepeatOutput {
int active_index;
/** Identifier to give to the next repeat item. */
int next_identifier;
int viewer_iteration;
int inspection_index;
#ifdef __cplusplus
blender::Span<NodeRepeatItem> items_span() const;

10
source/blender/makesrna/intern/rna_nodetree.cc
View File

@ -9090,12 +9090,12 @@ static void def_geo_repeat_output(StructRNA *srna)
RNA_def_property_ui_text(prop, "Active Item Index", "Index of the active item");
RNA_def_property_update(prop, NC_NODE, nullptr);
prop = RNA_def_property(srna, "viewer_iteration", PROP_INT, PROP_NONE);
prop = RNA_def_property(srna, "inspection_index", PROP_INT, PROP_NONE);
RNA_def_property_ui_range(prop, 0, INT32_MAX, 1, -1);
RNA_def_property_ui_text(
prop,
"Viewer Iteration",
"Iteration that is used by inspection features like the viewer node or socket inspection");
RNA_def_property_ui_text(prop,
"Inspection Index",
"Iteration index that is used by inspection features like the viewer "
"node or socket inspection");
RNA_def_property_update(prop, NC_NODE, nullptr);
}

2
source/blender/nodes/intern/geometry_nodes_log.cc
View File

@ -495,7 +495,7 @@ static void find_tree_zone_hash_recursive(
const auto &storage = *static_cast<const NodeGeometryRepeatOutput *>(
zone.output_node->storage);
compute_context_builder.push<bke::RepeatZoneComputeContext>(*zone.output_node,
storage.viewer_iteration);
storage.inspection_index);
break;
}
}