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/shader | |
parent | a3d4b98a30a8c24ce284027a3a8771f106a114e1 (diff) |
texture curves were not initialized (causing crash), own regression from moving curve initialization outside evaluation.
Diffstat (limited to 'source/blender/nodes/shader')
-rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_curves.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_curves.c b/source/blender/nodes/shader/nodes/node_shader_curves.c index 8831b07d8a0..83cb1d33628 100644 --- a/source/blender/nodes/shader/nodes/node_shader_curves.c +++ b/source/blender/nodes/shader/nodes/node_shader_curves.c @@ -45,12 +45,6 @@ static bNodeSocketTemplate sh_node_curve_vec_out[]= { { -1, 0, "" } }; -static void *node_shader_initexec_curve(bNode *node) -{ - curvemapping_initialize(node->storage); - return NULL; /* unused return */ -} - static void node_shader_exec_curve_vec(void *UNUSED(data), bNode *node, bNodeStack **in, bNodeStack **out) { float vec[3]; @@ -86,7 +80,7 @@ void register_node_type_sh_curve_vec(bNodeTreeType *ttype) node_type_init(&ntype, node_shader_init_curve_vec); node_type_storage(&ntype, "CurveMapping", node_free_curves, node_copy_curves); node_type_exec(&ntype, node_shader_exec_curve_vec); - node_type_exec_new(&ntype, node_shader_initexec_curve, NULL, NULL); /* only for its initexec func */ + node_type_exec_new(&ntype, node_initexec_curves, NULL, NULL); /* only for its initexec func */ node_type_gpu(&ntype, gpu_shader_curve_vec); nodeRegisterType(ttype, &ntype); @@ -144,7 +138,7 @@ void register_node_type_sh_curve_rgb(bNodeTreeType *ttype) node_type_init(&ntype, node_shader_init_curve_rgb); node_type_storage(&ntype, "CurveMapping", node_free_curves, node_copy_curves); node_type_exec(&ntype, node_shader_exec_curve_rgb); - node_type_exec_new(&ntype, node_shader_initexec_curve, NULL, NULL); /* only for its initexec func */ + node_type_exec_new(&ntype, node_initexec_curves, NULL, NULL); /* only for its initexec func */ node_type_gpu(&ntype, gpu_shader_curve_rgb); nodeRegisterType(ttype, &ntype); |