griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Nodes: stop the shader preview job when changing the viewed nodetree

Browse Source 
When the user goes in an out a nested node-tree, the preview job should be stopped.

Pull Request: https://projects.blender.org/blender/blender/pulls/111041
This commit is contained in:
Colin Marmond
2023-08-11 16:13:24 +02:00
committed by Brecht Van Lommel
parent b3485c29a8
commit c966d7c2f9
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/space_node/node_group.cc
View File

@@ -39,6 +39,7 @@
#include "ED_node.hh" /* own include */
#include "ED_node.hh"
#include "ED_node_preview.hh"
#include "ED_render.hh"
#include "ED_screen.hh"
@@ -190,6 +191,7 @@ static int node_group_edit_exec(bContext *C, wmOperator *op)
const bool exit = RNA_boolean_get(op->ptr, "exit");
ED_preview_kill_jobs(CTX_wm_manager(C), CTX_data_main(C));
stop_preview_job(*CTX_wm_manager(C));
bNode *gnode = node_group_get_active(C, node_idname);
@@ -649,6 +651,7 @@ static int node_group_separate_exec(bContext *C, wmOperator *op)
int type = RNA_enum_get(op->ptr, "type");
ED_preview_kill_jobs(CTX_wm_manager(C), bmain);
stop_preview_job(*CTX_wm_manager(C));
/* are we inside of a group? */
bNodeTree *ngroup = snode->edittree;
@@ -1261,6 +1264,7 @@ static int node_group_make_exec(bContext *C, wmOperator *op)
Main *bmain = CTX_data_main(C);
ED_preview_kill_jobs(CTX_wm_manager(C), CTX_data_main(C));
stop_preview_job(*CTX_wm_manager(C));
VectorSet<bNode *> nodes_to_group = get_nodes_to_group(ntree, nullptr);
if (!node_group_make_test_selected(ntree, nodes_to_group, ntree_idname, *op->reports)) {
@@ -1314,6 +1318,7 @@ static int node_group_insert_exec(bContext *C, wmOperator *op)
const char *node_idname = node_group_idname(C);
ED_preview_kill_jobs(CTX_wm_manager(C), CTX_data_main(C));
stop_preview_job(*CTX_wm_manager(C));
bNode *gnode = node_group_get_active(C, node_idname);
if (!gnode || !gnode->id) {