blender/blender
152
489
Fork 720
Code Issues 6.8k Pull Requests 893 Projects 18 Wiki Activity

Fix: Delay image node preview loading to improve open animation #121147

Open
Guillermo Venegas wants to merge 2 commits from guishe/blender:delay-load-images into main
pull from: guishe/blender:delay-load-images
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 2 Files Changed 1 +16
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/space_node/node_add.cc
View File

@ -726,6 +726,18 @@ static int node_add_file_modal(bContext *C, wmOperator *op, const wmEvent *event
/* End stack animation. */
if (duration > node_stack_anim_duration) {
WM_event_timer_remove(CTX_wm_manager(C), nullptr, data->anim_timer);
/* Reenable node previews. Only enabled by default in compositor nodes. */
guishe marked this conversation as resolved Outdated
Hans Goudey commented 2024-04-26 22:02:13 +02:00
Outdated
Review
Copy Link

Grammar:

  • Enable back -> Reenable
  • to compositor nodes -> in compositor nodes
Grammar: - `Enable back` -> `Reenable` - `to compositor nodes` -> `in compositor nodes`
SpaceNode &snode = *CTX_wm_space_node(C);
bNodeTree &node_tree = *snode.edittree;
if (node_tree.type == NTREE_COMPOSIT) {
for (bNode *node : data->nodes) {
if (node_is_previewable(snode, node_tree, *node)) {
node->flag |= NODE_PREVIEW;
}
}
Main *bmain = CTX_data_main(C);
ED_node_tree_propagate_change(C, bmain, &node_tree);
}
MEM_delete(data);
op->customdata = nullptr;
return (OPERATOR_FINISHED | OPERATOR_PASS_THROUGH);
@ -811,6 +823,10 @@ static int node_add_file_exec(bContext *C, wmOperator *op)
node_deselect_all(node_tree);
for (bNode *node : nodes) {
nodeSetSelected(node, true);
/* Temporarily disable node preview for smoother stack animation. */
if (nodes.size() > 1 && node_is_previewable(snode, node_tree, *node)) {
node->flag &= ~NODE_PREVIEW;
}
}
ED_node_set_active(bmain, &snode, &node_tree, nodes[0], nullptr);