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:
authorDalai Felinto <dfelinto@gmail.com>2017-01-27 13:24:23 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-01-27 13:24:23 +0300
commit84b18162cf48bfb9a6a16fcad5faaa0c062d64fc (patch)
tree74740cf90a2fbd0521d3f632aa22e4ced2a9b731
parentbce9e80d82a539bfe3c9afdce6c05e82e867ac1f (diff)
Fixup for rBac58a7fa (HSV doversion)
We are not bumping file version, but we cannot have the doversion code running twice. In this particular case it was crashing files, since we were setting node->storage to NULL, and later on accessing it.
-rw-r--r--source/blender/blenloader/intern/versioning_270.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index c9ea077e6f6..6235ebf28ee 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -216,6 +216,10 @@ static void anim_change_prop_name(FCurve *fcu,
static void do_version_hue_sat_node(bNodeTree *ntree, bNode *node)
{
+ if (node->storage == NULL) {
+ return;
+ }
+
/* Make sure new sockets are properly created. */
node_verify_socket_templates(ntree, node);
/* Convert value from old storage to new sockets. */