archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix error in node flag check

Browse Source
This commit is contained in:
Campbell Barton
2017-05-04 02:57:39 +10:00
parent 15189baa52
commit 6abcd6cfd5
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3608,7 +3608,7 @@ void node_draw_link(View2D *v2d, SpaceNode *snode, bNodeLink *link)
return; return;
if (link->fromsock->flag & SOCK_UNAVAIL) if (link->fromsock->flag & SOCK_UNAVAIL)
return; return;
if ((link->fromsock->flag & SOCK_VIRTUAL) || (link->fromsock->flag & SOCK_VIRTUAL)) if ((link->fromsock->flag & SOCK_VIRTUAL) || (link->tosock->flag & SOCK_VIRTUAL))
do_dashed = true; do_dashed = true;
if (link->flag & NODE_LINK_VALID) { if (link->flag & NODE_LINK_VALID) {

2
source/blender/nodes/composite/nodes/node_composite_image.c
View File

@@ -193,7 +193,7 @@ void node_cmp_rlayers_register_pass(bNodeTree *ntree, bNode *node, Scene *scene,
{ {
RLayerUpdateData *data = node->storage; RLayerUpdateData *data = node->storage;
if (scene == NULL || srl == NULL || data == NULL || node->id != scene) { if (scene == NULL || srl == NULL || data == NULL || node->id != (ID *)scene) {
return; return;
} }