[Bf-blender-cvs] [3648fd9917d] blender-v3.4-release: Fix: node frame boundaries incorrect when opening files
Jacques Lucke
noreply at git.blender.org
Mon Nov 21 11:22:56 CET 2022
Commit: 3648fd9917dbd03ff5747ca1b65ede6629d86338
Author: Jacques Lucke
Date: Mon Nov 21 11:22:44 2022 +0100
Branches: blender-v3.4-release
https://developer.blender.org/rB3648fd9917dbd03ff5747ca1b65ede6629d86338
Fix: node frame boundaries incorrect when opening files
Make sure that frame dimensions are updated in the correct order.
===================================================================
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 151f04e0a2d..7b2d7e61543 100644
--- a/source/blender/editors/space_node/node_draw.cc
+++ b/source/blender/editors/space_node/node_draw.cc
@@ -2712,7 +2712,6 @@ static void node_update_nodetree(const bContext &C,
count_multi_input_socket_links(ntree, *snode);
- /* Update nodes front to back, so children sizes get updated before parents. */
for (const int i : nodes.index_range()) {
bNode &node = *nodes[i];
uiBlock &block = *blocks[i];
@@ -2734,8 +2733,9 @@ static void node_update_nodetree(const bContext &C,
}
}
- /* Now calculate the size of frame nodes, which can depend on the size of other nodes. */
- for (const int i : nodes.index_range()) {
+ /* Now calculate the size of frame nodes, which can depend on the size of other nodes.
+ * Update nodes in reverse, so children sizes get updated before parents. */
+ for (int i = nodes.size() - 1; i >= 0; i--) {
if (nodes[i]->type == NODE_FRAME) {
frame_node_prepare_for_draw(*nodes[i], nodes);
}
More information about the Bf-blender-cvs
mailing list