[Bf-blender-cvs] [84b18162cf] master: Fixup for rBac58a7fa (HSV doversion)

Dalai Felinto noreply at git.blender.org
Fri Jan 27 11:24:26 CET 2017


Commit: 84b18162cf48bfb9a6a16fcad5faaa0c062d64fc
Author: Dalai Felinto
Date:   Fri Jan 27 11:24:23 2017 +0100
Branches: master
https://developer.blender.org/rB84b18162cf48bfb9a6a16fcad5faaa0c062d64fc

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.

===================================================================

M	source/blender/blenloader/intern/versioning_270.c

===================================================================

diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index c9ea077e6f..6235ebf28e 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. */




More information about the Bf-blender-cvs mailing list