diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-05-03 19:58:26 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-05-03 19:58:26 +0300 |
| commit | b9451c04931d228161c1fb212c6c7a09545a86b7 (patch) | |
| tree | 8f3b828721d51516ebd997ff516c770238daa18b /source/blender/nodes | |
| parent | 82e242cc7287ce56d10f88a76de5418a7b20e239 (diff) | |
| parent | 6abcd6cfd545ecd3cb61b4ece065b10890779cd6 (diff) | |
Merge branch 'master' into 28
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/composite/nodes/node_composite_image.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |