Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2020-01-06 13:52:35 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2020-01-06 13:52:35 +0300
commita6d01365e3bb2e11f1028d92f01c180b6a5ccb35 (patch)
tree9a1e7850b374127bf9c7be14d272b6226682d52a /source/blender/blenloader/intern/versioning_cycles.c
parent948399747226e78b82ba1d5617bcd3b48e874241 (diff)
Fix crash opening specific files
For some reason socket flag and actual presence of link got out of sync. Check for link to be present prior to access it. Fixes crash opening file from T48684.
Diffstat (limited to 'source/blender/blenloader/intern/versioning_cycles.c')
-rw-r--r--source/blender/blenloader/intern/versioning_cycles.c2
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;