[Bf-blender-cvs] [d8233d2] master: Fix T46619: Levels node becomes Undefined
Campbell Barton
noreply at git.blender.org
Fri Oct 30 01:03:09 CET 2015
Commit: d8233d230885d4c342d582fffd397dd7b7d4aeed
Author: Campbell Barton
Date: Fri Oct 30 10:49:22 2015 +1100
Branches: master
https://developer.blender.org/rBd8233d230885d4c342d582fffd397dd7b7d4aeed
Fix T46619: Levels node becomes Undefined
regression caused by 79c345ac
===================================================================
M source/blender/blenkernel/intern/node.c
M source/blender/nodes/composite/nodes/node_composite_levels.c
===================================================================
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index d3460dc..68d9609 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -3424,6 +3424,10 @@ void node_type_size_preset(struct bNodeType *ntype, eNodeSizePreset size)
}
}
+/**
+ * \warning Nodes defining a storage type _must_ allocate this for new nodes.
+ * Otherwise nodes will reload as undefined (T46619).
+ */
void node_type_storage(bNodeType *ntype,
const char *storagename,
void (*freefunc)(struct bNode *node),
diff --git a/source/blender/nodes/composite/nodes/node_composite_levels.c b/source/blender/nodes/composite/nodes/node_composite_levels.c
index ffee105..65e5b2f 100644
--- a/source/blender/nodes/composite/nodes/node_composite_levels.c
+++ b/source/blender/nodes/composite/nodes/node_composite_levels.c
@@ -57,7 +57,6 @@ void register_node_type_cmp_view_levels(void)
cmp_node_type_base(&ntype, CMP_NODE_VIEW_LEVELS, "Levels", NODE_CLASS_OUTPUT, NODE_PREVIEW);
node_type_socket_templates(&ntype, cmp_node_view_levels_in, cmp_node_view_levels_out);
node_type_init(&ntype, node_composit_init_view_levels);
- node_type_storage(&ntype, "ImageUser", NULL, NULL);
nodeRegisterType(&ntype);
}
More information about the Bf-blender-cvs
mailing list