Merge branch 'master' into 28
authorCampbell Barton <ideasman42@gmail.com>
Wed, 3 May 2017 16:58:26 +0000 (02:58 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 3 May 2017 16:58:26 +0000 (02:58 +1000)
source/blender/editors/space_node/drawnode.c
source/blender/nodes/composite/nodes/node_composite_image.c

index b6b015e216cc0915b45c8b65d7fa043b26154f33..db174a4e560f7deda9595dc887e5fc5a1c70d687 100644 (file)
@@ -3505,7 +3505,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) {
index 510e24554f06bb234c5aae4698782f472585a605..f1fdaa32ce4f7f9b71d774460a4416fc1e7d86ed 100644 (file)
@@ -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;
        }