[Bf-blender-cvs] [a6d01365e3b] master: Fix crash opening specific files
Sergey Sharybin
noreply at git.blender.org
Mon Jan 6 11:53:42 CET 2020
Commit: a6d01365e3bb2e11f1028d92f01c180b6a5ccb35
Author: Sergey Sharybin
Date: Mon Jan 6 11:52:35 2020 +0100
Branches: master
https://developer.blender.org/rBa6d01365e3bb2e11f1028d92f01c180b6a5ccb35
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.
===================================================================
M source/blender/blenloader/intern/versioning_cycles.c
===================================================================
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;
More information about the Bf-blender-cvs
mailing list