From 6abcd6cfd545ecd3cb61b4ece065b10890779cd6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 4 May 2017 02:57:39 +1000 Subject: [PATCH] Fix error in node flag check --- source/blender/editors/space_node/drawnode.c | 2 +- source/blender/nodes/composite/nodes/node_composite_image.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index b7c41f04879..9b517425c1f 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -3608,7 +3608,7 @@ void node_draw_link(View2D *v2d, SpaceNode *snode, bNodeLink *link) return; if (link->fromsock->flag & SOCK_UNAVAIL) 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; if (link->flag & NODE_LINK_VALID) { diff --git a/source/blender/nodes/composite/nodes/node_composite_image.c b/source/blender/nodes/composite/nodes/node_composite_image.c index 510e24554f0..f1fdaa32ce4 100644 --- a/source/blender/nodes/composite/nodes/node_composite_image.c +++ b/source/blender/nodes/composite/nodes/node_composite_image.c @@ -193,7 +193,7 @@ void node_cmp_rlayers_register_pass(bNodeTree *ntree, bNode *node, Scene *scene, { 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; }