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:
authorCampbell Barton <ideasman42@gmail.com>2015-10-30 02:49:22 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-10-30 02:57:02 +0300
commitd8233d230885d4c342d582fffd397dd7b7d4aeed (patch)
tree710b621e718d1aedfca1248de16973c0cb4dd439
parent8014180720d81131f2ca4b541142816f459a5f3c (diff)
Fix T46619: Levels node becomes Undefined
regression caused by 79c345ac
-rw-r--r--source/blender/blenkernel/intern/node.c4
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_levels.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index d3460dcb481..68d9609e069 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 ffee10528ee..65e5b2fedf1 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);
}