diff options
| author | YimingWu <xp8110@outlook.com> | 2020-02-01 05:35:40 +0300 |
|---|---|---|
| committer | YimingWu <xp8110@outlook.com> | 2020-02-01 05:35:40 +0300 |
| commit | f7770cb97bb9d19d0806f67da9377129fd4d09b0 (patch) | |
| tree | 2cd22d612ffba3a509d5548332c9cc8a06a1a638 /source/blender/blenloader/intern/versioning_cycles.c | |
| parent | b47883a990ee68e659a8a8b44729be9b8e0d002f (diff) | |
| parent | dc3f073d1c5255e79763dfff3ef17f6216f1b391 (diff) | |
Merge remote-tracking branch 'origin/master' into temp-lanpr-review
Diffstat (limited to 'source/blender/blenloader/intern/versioning_cycles.c')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_cycles.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/versioning_cycles.c b/source/blender/blenloader/intern/versioning_cycles.c index a4ad954254a..466dd02b3b3 100644 --- a/source/blender/blenloader/intern/versioning_cycles.c +++ b/source/blender/blenloader/intern/versioning_cycles.c @@ -1219,7 +1219,7 @@ static void update_noise_and_wave_distortion(bNodeTree *ntree) bNodeSocket *sockDistortion = nodeFindSocket(node, SOCK_IN, "Distortion"); float *distortion = cycles_node_socket_float_value(sockDistortion); - if (socket_is_used(sockDistortion)) { + if (socket_is_used(sockDistortion) && sockDistortion->link != NULL) { bNode *distortionInputNode = sockDistortion->link->fromnode; bNodeSocket *distortionInputSock = sockDistortion->link->fromsock; |