blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Avoid node tree update tag when changed nodes which are not affecting result 

This was we don't have re-compo or viewport re-rendering happening when changing
nodes which are not connected to the output at all (for example when adding new
nodes or changing settings for unconnected nodes).

Only basic operations are covered for now. checks could be added to more tools
when needed.

Currently it's not fully optimal implementation, but seems to work fast enough.
Don't see reliable alternative to that -- keeping tag in the node wouldn't work
because of the node groups (which are probably already broken, but should be
easy to solve with current approach). So guess it's more matter of optimizing
path search from a node to output.

Before processing forward let's check whether it's indeed something we want
and whether the approach is indeed not fully bad.

Reviewers: campbellbarton, mont29

Subscribers: sebastian_k

Differential Revision: https://developer.blender.org/D1765
This commit is contained in:
Sergey Sharybin 2016-02-05 01:39:42 +05:00
parent 0d12e086f5
commit 83824947ba
Notes: blender-bot 2023-02-14 10:32:59 +01:00 
Referenced by issue #47870, Viewport rendering isn't updating with changing of values of a material node group. but working if you change inside node group!
11 changed files with 167 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/include/ED_node.h
View File

@ -80,7 +80,7 @@ void ED_node_draw_snap(struct View2D *v2d, const float cent[2], float size, Node
/* node_draw.c */
void ED_node_tree_update(const struct bContext *C);
void ED_node_tag_update_id(struct ID *id);
void ED_node_tag_update_nodetree(struct Main *bmain, struct bNodeTree *ntree);
void ED_node_tag_update_nodetree(struct Main *bmain, struct bNodeTree *ntree, struct bNode *node);
void ED_node_sort(struct bNodeTree *ntree);
float ED_node_grid_size(void);

3
source/blender/editors/space_node/drawnode.c
View File

@ -2884,7 +2884,8 @@ static void node_texture_set_butfunc(bNodeType *ntype)
static void node_property_update_default(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr)
{
bNodeTree *ntree = ptr->id.data;
ED_node_tag_update_nodetree(bmain, ntree);
bNode *node = ptr->data;
ED_node_tag_update_nodetree(bmain, ntree, node);
}
static void node_socket_template_properties_update(bNodeType *ntype, bNodeSocketTemplate *stemp)

25
source/blender/editors/space_node/node_draw.c
View File

@ -153,18 +153,27 @@ void ED_node_tag_update_id(ID *id)
}
}
void ED_node_tag_update_nodetree(Main *bmain, bNodeTree *ntree)
void ED_node_tag_update_nodetree(Main *bmain, bNodeTree *ntree, bNode *node)
{
if (!ntree)
return;
bool do_tag_update = true;
if (node != NULL) {
if (!node_connected_to_output(ntree, node)) {
do_tag_update = false;
}
}
/* look through all datablocks, to support groups */
FOREACH_NODETREE(bmain, tntree, id) {
/* check if nodetree uses the group */
if (ntreeHasTree(tntree, ntree))
ED_node_tag_update_id(id);
} FOREACH_NODETREE_END
if (do_tag_update) {
FOREACH_NODETREE(bmain, tntree, id) {
/* check if nodetree uses the group */
if (ntreeHasTree(tntree, ntree))
ED_node_tag_update_id(id);
} FOREACH_NODETREE_END
}
if (ntree->type == NTREE_TEXTURE)
ntreeTexCheckCyclics(ntree);
}

33
source/blender/editors/space_node/node_edit.c
View File

@ -657,10 +657,10 @@ void ED_node_set_active(Main *bmain, bNodeTree *ntree, bNode *node)
node->flag |= NODE_DO_OUTPUT;
if (was_output == 0)
ED_node_tag_update_nodetree(bmain, ntree);
ED_node_tag_update_nodetree(bmain, ntree, node);
}
else if (do_update)
ED_node_tag_update_nodetree(bmain, ntree);
ED_node_tag_update_nodetree(bmain, ntree, node);
/* if active texture changed, free glsl materials */
if ((node->flag & NODE_ACTIVE_TEXTURE) && !was_active_texture) {
@ -692,7 +692,7 @@ void ED_node_set_active(Main *bmain, bNodeTree *ntree, bNode *node)
node->flag |= NODE_DO_OUTPUT;
if (was_output == 0)
ED_node_tag_update_nodetree(bmain, ntree);
ED_node_tag_update_nodetree(bmain, ntree, node);
/* addnode() doesnt link this yet... */
node->id = (ID *)BKE_image_verify_viewer(IMA_TYPE_COMPOSITE, "Viewer Node");
@ -722,11 +722,11 @@ void ED_node_set_active(Main *bmain, bNodeTree *ntree, bNode *node)
tnode->flag &= ~NODE_DO_OUTPUT;
node->flag |= NODE_DO_OUTPUT;
ED_node_tag_update_nodetree(bmain, ntree);
ED_node_tag_update_nodetree(bmain, ntree, node);
}
}
else if (do_update)
ED_node_tag_update_nodetree(bmain, ntree);
ED_node_tag_update_nodetree(bmain, ntree, node);
}
else if (ntree->type == NTREE_TEXTURE) {
// XXX
@ -1177,7 +1177,8 @@ static int node_duplicate_exec(bContext *C, wmOperator *op)
bNode *node, *newnode, *lastnode;
bNodeLink *link, *newlink, *lastlink;
const bool keep_inputs = RNA_boolean_get(op->ptr, "keep_inputs");
bool do_tag_update = false;
ED_preview_kill_jobs(CTX_wm_manager(C), CTX_data_main(C));
lastnode = ntree->nodes.last;
@ -1254,6 +1255,8 @@ static int node_duplicate_exec(bContext *C, wmOperator *op)
nodeSetSelected(node, false);
node->flag &= ~NODE_ACTIVE;
nodeSetSelected(newnode, true);
do_tag_update |= (do_tag_update || node_connected_to_output(ntree, newnode));
}
/* make sure we don't copy new nodes again! */
@ -1264,7 +1267,9 @@ static int node_duplicate_exec(bContext *C, wmOperator *op)
ntreeUpdateTree(CTX_data_main(C), snode->edittree);
snode_notify(C, snode);
snode_dag_update(C, snode);
if (do_tag_update) {
snode_dag_update(C, snode);
}
return OPERATOR_FINISHED;
}
@ -1623,6 +1628,7 @@ static int node_mute_exec(bContext *C, wmOperator *UNUSED(op))
{
SpaceNode *snode = CTX_wm_space_node(C);
bNode *node;
bool do_tag_update = false;
ED_preview_kill_jobs(CTX_wm_manager(C), CTX_data_main(C));
@ -1631,11 +1637,14 @@ static int node_mute_exec(bContext *C, wmOperator *UNUSED(op))
if ((node->flag & SELECT) && node->typeinfo->update_internal_links) {
node->flag ^= NODE_MUTED;
snode_update(snode, node);
do_tag_update |= (do_tag_update || node_connected_to_output(snode->edittree, node));
}
}
snode_notify(C, snode);
snode_dag_update(C, snode);
if (do_tag_update) {
snode_dag_update(C, snode);
}
return OPERATOR_FINISHED;
}
@ -1661,13 +1670,15 @@ static int node_delete_exec(bContext *C, wmOperator *UNUSED(op))
{
SpaceNode *snode = CTX_wm_space_node(C);
bNode *node, *next;
bool do_tag_update = false;
ED_preview_kill_jobs(CTX_wm_manager(C), CTX_data_main(C));
for (node = snode->edittree->nodes.first; node; node = next) {
next = node->next;
if (node->flag & SELECT) {
/* check id user here, nodeFreeNode is called for free dbase too */
do_tag_update |= (do_tag_update || node_connected_to_output(snode->edittree, node));
if (node->id)
id_us_min(node->id);
nodeFreeNode(snode->edittree, node);
@ -1677,7 +1688,9 @@ static int node_delete_exec(bContext *C, wmOperator *UNUSED(op))
ntreeUpdateTree(CTX_data_main(C), snode->edittree);
snode_notify(C, snode);
snode_dag_update(C, snode);
if (do_tag_update) {
snode_dag_update(C, snode);
}
return OPERATOR_FINISHED;
}

2
source/blender/editors/space_node/node_intern.h
View File

@ -155,6 +155,8 @@ void NODE_OT_group_edit(struct wmOperatorType *ot);
/* node_relationships.c */
bool node_connected_to_output(struct bNodeTree *ntree, struct bNode *node);
void NODE_OT_link(struct wmOperatorType *ot);
void NODE_OT_link_make(struct wmOperatorType *ot);
void NODE_OT_links_cut(struct wmOperatorType *ot);

106
source/blender/editors/space_node/node_relationships.c
View File

@ -59,6 +59,55 @@
#include "node_intern.h" /* own include */
/* ****************** Relations helpers *********************** */
static bool ntree_check_nodes_connected_dfs(bNodeTree *ntree,
bNode *from,
bNode *to)
{
if (from->flag & NODE_TEST) {
return false;
}
from->flag |= NODE_TEST;
for (bNodeLink *link = ntree->links.first; link != NULL; link = link->next) {
if (link->fromnode == from) {
if (link->tonode == to) {
return true;
}
else {
if (ntree_check_nodes_connected_dfs(ntree, link->tonode, to)) {
return true;
}
}
}
}
return false;
}
static bool ntree_check_nodes_connected(bNodeTree *ntree, bNode *from, bNode *to)
{
if (from == to) {
return true;
}
ntreeNodeFlagSet(ntree, NODE_TEST, false);
return ntree_check_nodes_connected_dfs(ntree, from, to);
}
bool node_connected_to_output(bNodeTree *ntree, bNode *node)
{
for (bNode *current_node = ntree->nodes.first;
current_node != NULL;
current_node = current_node->next)
{
if (current_node->flag & NODE_DO_OUTPUT) {
if (ntree_check_nodes_connected(ntree, node, current_node)) {
return true;
}
}
}
return false;
}
/* ****************** Add *********************** */
@ -468,7 +517,8 @@ static void node_link_exit(bContext *C, wmOperator *op, bool apply_links)
bNodeTree *ntree = snode->edittree;
bNodeLinkDrag *nldrag = op->customdata;
LinkData *linkdata;
bool do_tag_update = false;
/* avoid updates while applying links */
ntree->is_updating = true;
for (linkdata = nldrag->links.first; linkdata; linkdata = linkdata->next) {
@ -493,15 +543,27 @@ static void node_link_exit(bContext *C, wmOperator *op, bool apply_links)
/* we might need to remove a link */
node_remove_extra_links(snode, link);
if (link->tonode) {
do_tag_update |= (do_tag_update || node_connected_to_output(ntree, link->tonode));
}
}
else
else {
/* See note below, but basically TEST flag means that the link
* was connected to output (or to a node which affects the
* output).
*/
do_tag_update |= (link->flag & NODE_LINK_TEST) != 0;
nodeRemLink(ntree, link);
}
}
ntree->is_updating = false;
ntreeUpdateTree(CTX_data_main(C), ntree);
snode_notify(C, snode);
snode_dag_update(C, snode);
if (do_tag_update) {
snode_dag_update(C, snode);
}
BLI_remlink(&snode->linkdrag, nldrag);
/* links->data pointers are either held by the tree or freed already */
@ -632,7 +694,18 @@ static bNodeLinkDrag *node_link_init(SpaceNode *snode, float cursor[2], bool det
*oplink = *link;
oplink->next = oplink->prev = NULL;
oplink->flag |= NODE_LINK_VALID;
/* The link could be disconnected and in that case we
* wouldn't be able to check whether tag update is
* needed or not when releasing mouse button. So we
* cache whether the link affects output or not here
* using TEST flag.
*/
oplink->flag &= ~NODE_LINK_TEST;
if (node_connected_to_output(snode->edittree, link->tonode)) {
oplink->flag |= NODE_LINK_TEST;
}
BLI_addtail(&nldrag->links, linkdata);
nodeRemLink(snode->edittree, link);
}
@ -647,7 +720,11 @@ static bNodeLinkDrag *node_link_init(SpaceNode *snode, float cursor[2], bool det
oplink->fromnode = node;
oplink->fromsock = sock;
oplink->flag |= NODE_LINK_VALID;
oplink->flag &= ~NODE_LINK_TEST;
if (node_connected_to_output(snode->edittree, node)) {
oplink->flag |= NODE_LINK_TEST;
}
BLI_addtail(&nldrag->links, linkdata);
}
}
@ -668,7 +745,11 @@ static bNodeLinkDrag *node_link_init(SpaceNode *snode, float cursor[2], bool det
*oplink = *link;
oplink->next = oplink->prev = NULL;
oplink->flag |= NODE_LINK_VALID;
oplink->flag &= ~NODE_LINK_TEST;
if (node_connected_to_output(snode->edittree, link->tonode)) {
oplink->flag |= NODE_LINK_TEST;
}
BLI_addtail(&nldrag->links, linkdata);
nodeRemLink(snode->edittree, link);
@ -687,7 +768,11 @@ static bNodeLinkDrag *node_link_init(SpaceNode *snode, float cursor[2], bool det
oplink->tonode = node;
oplink->tosock = sock;
oplink->flag |= NODE_LINK_VALID;
oplink->flag &= ~NODE_LINK_TEST;
if (node_connected_to_output(snode->edittree, node)) {
oplink->flag |= NODE_LINK_TEST;
}
BLI_addtail(&nldrag->links, linkdata);
}
}
@ -817,6 +902,7 @@ static int cut_links_exec(bContext *C, wmOperator *op)
ARegion *ar = CTX_wm_region(C);
float mcoords[256][2];
int i = 0;
bool do_tag_update = false;
RNA_BEGIN (op->ptr, itemptr, "path")
{
@ -849,6 +935,8 @@ static int cut_links_exec(bContext *C, wmOperator *op)
found = true;
}
do_tag_update |= (do_tag_update || node_connected_to_output(snode->edittree, link->tonode));
snode_update(snode, link->tonode);
nodeRemLink(snode->edittree, link);
}
@ -857,7 +945,9 @@ static int cut_links_exec(bContext *C, wmOperator *op)
if (found) {
ntreeUpdateTree(CTX_data_main(C), snode->edittree);
snode_notify(C, snode);
snode_dag_update(C, snode);
if (do_tag_update) {
snode_dag_update(C, snode);
}
return OPERATOR_FINISHED;
}

6
source/blender/editors/space_node/node_templates.c
View File

@ -168,7 +168,7 @@ static void node_socket_disconnect(Main *bmain, bNodeTree *ntree, bNode *node_to
nodeUpdate(ntree, node_to);
ntreeUpdateTree(bmain, ntree);
ED_node_tag_update_nodetree(bmain, ntree);
ED_node_tag_update_nodetree(bmain, ntree, node_to);
}
/* remove all nodes connected to this socket, if they aren't connected to other nodes */
@ -183,7 +183,7 @@ static void node_socket_remove(Main *bmain, bNodeTree *ntree, bNode *node_to, bN
nodeUpdate(ntree, node_to);
ntreeUpdateTree(bmain, ntree);
ED_node_tag_update_nodetree(bmain, ntree);
ED_node_tag_update_nodetree(bmain, ntree, node_to);
}
/* add new node connected to this socket, or replace an existing one */
@ -279,7 +279,7 @@ static void node_socket_add_replace(const bContext *C, bNodeTree *ntree, bNode *
nodeUpdate(ntree, node_to);
ntreeUpdateTree(CTX_data_main(C), ntree);
ED_node_tag_update_nodetree(CTX_data_main(C), ntree);
ED_node_tag_update_nodetree(CTX_data_main(C), ntree, node_to);
}
/****************************** Node Link Menu *******************************/

2
source/blender/editors/uvedit/uvedit_ops.c
View File

@ -170,7 +170,7 @@ void ED_object_assign_active_image(Main *bmain, Object *ob, int mat_nr, Image *i
if (node && is_image_texture_node(node)) {
node->id = &ima->id;
ED_node_tag_update_nodetree(bmain, ma->nodetree);
ED_node_tag_update_nodetree(bmain, ma->nodetree, node);
}
}

2
source/blender/makesrna/intern/rna_color.c
View File

@ -326,7 +326,7 @@ static void rna_ColorRamp_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *
for (node = ntree->nodes.first; node; node = node->next) {
if (ELEM(node->type, SH_NODE_VALTORGB, CMP_NODE_VALTORGB, TEX_NODE_VALTORGB)) {
ED_node_tag_update_nodetree(bmain, ntree);
ED_node_tag_update_nodetree(bmain, ntree, node);
}
}
break;

29
source/blender/makesrna/intern/rna_nodetree.c
View File

@ -657,11 +657,12 @@ static bool rna_NodeTree_check(bNodeTree *ntree, ReportList *reports)
static void rna_NodeTree_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr)
{
bNodeTree *ntree = (bNodeTree *)ptr->id.data;
bNode *node = (bNode *)ptr->data;
WM_main_add_notifier(NC_NODE | NA_EDITED, NULL);
WM_main_add_notifier(NC_SCENE | ND_NODES, &ntree->id);
ED_node_tag_update_nodetree(bmain, ntree);
ED_node_tag_update_nodetree(bmain, ntree, node);
}
static bNode *rna_NodeTree_node_new(bNodeTree *ntree, bContext *C, ReportList *reports, const char *type)
@ -1048,7 +1049,7 @@ static void rna_NodeTree_interface_update(bNodeTree *ntree, bContext *C)
ntree->update |= NTREE_UPDATE_GROUP;
ntreeUpdateTree(G.main, ntree);
ED_node_tag_update_nodetree(CTX_data_main(C), ntree);
ED_node_tag_update_nodetree(CTX_data_main(C), ntree, NULL);
}
@ -1545,12 +1546,13 @@ static int rna_Node_parent_poll(PointerRNA *ptr, PointerRNA value)
static void rna_Node_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr)
{
bNodeTree *ntree = (bNodeTree *)ptr->id.data;
ED_node_tag_update_nodetree(bmain, ntree);
bNode *node = (bNode *)ptr->data;
ED_node_tag_update_nodetree(bmain, ntree, node);
}
static void rna_Node_socket_value_update(ID *id, bNode *UNUSED(node), bContext *C)
static void rna_Node_socket_value_update(ID *id, bNode *node, bContext *C)
{
ED_node_tag_update_nodetree(CTX_data_main(C), (bNodeTree *)id);
ED_node_tag_update_nodetree(CTX_data_main(C), (bNodeTree *)id, node);
}
static void rna_Node_select_set(PointerRNA *ptr, int value)
@ -1916,7 +1918,11 @@ static PointerRNA rna_NodeSocket_node_get(PointerRNA *ptr)
static void rna_NodeSocket_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr)
{
bNodeTree *ntree = (bNodeTree *)ptr->id.data;
ED_node_tag_update_nodetree(bmain, ntree);
bNodeSocket *sock = (bNodeSocket *)ptr->data;
bNode *node;
if (nodeFindNode(ntree, sock, &node, NULL)) {
ED_node_tag_update_nodetree(bmain, ntree, node);
}
}
static int rna_NodeSocket_is_output_get(PointerRNA *ptr)
@ -2182,7 +2188,7 @@ static void rna_NodeSocketInterface_update(Main *bmain, Scene *UNUSED(scene), Po
ntree->update |= NTREE_UPDATE_GROUP;
ntreeUpdateTree(G.main, ntree);
ED_node_tag_update_nodetree(bmain, ntree);
ED_node_tag_update_nodetree(bmain, ntree, NULL);
}
@ -2438,8 +2444,9 @@ static void rna_CompositorNode_tag_need_exec(bNode *node)
static void rna_Node_tex_image_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr)
{
bNodeTree *ntree = (bNodeTree *)ptr->id.data;
bNode *node = (bNode *)ptr->data;
ED_node_tag_update_nodetree(bmain, ntree);
ED_node_tag_update_nodetree(bmain, ntree, node);
WM_main_add_notifier(NC_IMAGE, NULL);
}
@ -2451,7 +2458,7 @@ static void rna_Node_material_update(Main *bmain, Scene *UNUSED(scene), PointerR
if (node->id)
nodeSetActive(ntree, node);
ED_node_tag_update_nodetree(bmain, ntree);
ED_node_tag_update_nodetree(bmain, ntree, node);
}
static void rna_NodeGroup_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr)
@ -2462,7 +2469,7 @@ static void rna_NodeGroup_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *
if (node->id)
ntreeUpdateTree(bmain, (bNodeTree *)node->id);
ED_node_tag_update_nodetree(bmain, ntree);
ED_node_tag_update_nodetree(bmain, ntree, node);
}
static void rna_NodeGroup_node_tree_set(PointerRNA *ptr, const PointerRNA value)
@ -2972,7 +2979,7 @@ static void rna_ShaderNodeScript_update(Main *bmain, Scene *scene, PointerRNA *p
RE_engine_free(engine);
}
ED_node_tag_update_nodetree(bmain, ntree);
ED_node_tag_update_nodetree(bmain, ntree, node);
}
static void rna_ShaderNodeSubsurface_update(Main *bmain, Scene *scene, PointerRNA *ptr)

2
source/blender/makesrna/intern/rna_texture.c
View File

@ -174,7 +174,7 @@ static void rna_Texture_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *pt
}
else if (GS(id->name) == ID_NT) {
bNodeTree *ntree = ptr->id.data;
ED_node_tag_update_nodetree(bmain, ntree);
ED_node_tag_update_nodetree(bmain, ntree, NULL);
}
}