Merge branch 'blender-v3.4-release'
This commit is contained in:
commit
71efb7805b
|
@ -2711,7 +2711,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];
|
||||
|
@ -2733,8 +2732,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);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue