diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-08-29 11:58:36 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-29 11:58:36 +0400 |
commit | 78ded61065848bf50a31a51ed4b20207ef56bf65 (patch) | |
tree | 33b6a029f8ced24b08c5a9ec0ecdadc824356614 /source/blender/nodes/intern | |
parent | a3d4b98a30a8c24ce284027a3a8771f106a114e1 (diff) |
texture curves were not initialized (causing crash), own regression from moving curve initialization outside evaluation.
Diffstat (limited to 'source/blender/nodes/intern')
-rw-r--r-- | source/blender/nodes/intern/node_util.c | 6 | ||||
-rw-r--r-- | source/blender/nodes/intern/node_util.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/nodes/intern/node_util.c b/source/blender/nodes/intern/node_util.c index 8f9214fa1b2..27258c45fe5 100644 --- a/source/blender/nodes/intern/node_util.c +++ b/source/blender/nodes/intern/node_util.c @@ -73,6 +73,12 @@ void node_copy_standard_storage(bNode *orig_node, bNode *new_node) new_node->storage= MEM_dupallocN(orig_node->storage); } +void *node_initexec_curves(bNode *node) +{ + curvemapping_initialize(node->storage); + return NULL; /* unused return */ +} + /**** Labels ****/ const char *node_blend_label(bNode *node) diff --git a/source/blender/nodes/intern/node_util.h b/source/blender/nodes/intern/node_util.h index 6f167e35262..9f9caef14e2 100644 --- a/source/blender/nodes/intern/node_util.h +++ b/source/blender/nodes/intern/node_util.h @@ -53,6 +53,7 @@ extern void node_free_standard_storage(struct bNode *node); extern void node_copy_curves(struct bNode *orig_node, struct bNode *new_node); extern void node_copy_standard_storage(struct bNode *orig_node, struct bNode *new_node); +extern void *node_initexec_curves(struct bNode *node); /**** Labels ****/ |