diff options
author | Aaron Carlisle <Blendify> | 2021-12-25 19:11:05 +0300 |
---|---|---|
committer | Aaron Carlisle <carlisle.b3d@gmail.com> | 2021-12-25 19:12:08 +0300 |
commit | c5862da5ad990bd72a6f713c52f7d74416bce16a (patch) | |
tree | 055efaae74f4d48c44f9f08485343a2c599ad82e /source/blender/nodes/function | |
parent | 9085b4a731fd5315eb97c00fc4bbf7c163698ebc (diff) |
Cleanup: use new c++ guarded allocator API in nodes
Also simplify the allocation name to `__func__`
Reviewed By: JacquesLucke
Differential Revision: https://developer.blender.org/D13665
Diffstat (limited to 'source/blender/nodes/function')
6 files changed, 6 insertions, 8 deletions
diff --git a/source/blender/nodes/function/nodes/node_fn_compare.cc b/source/blender/nodes/function/nodes/node_fn_compare.cc index e773563ca5f..e1c15ac2be1 100644 --- a/source/blender/nodes/function/nodes/node_fn_compare.cc +++ b/source/blender/nodes/function/nodes/node_fn_compare.cc @@ -97,8 +97,7 @@ static void node_compare_update(bNodeTree *ntree, bNode *node) static void node_compare_init(bNodeTree *UNUSED(tree), bNode *node) { - NodeFunctionCompare *data = (NodeFunctionCompare *)MEM_callocN(sizeof(NodeFunctionCompare), - __func__); + NodeFunctionCompare *data = MEM_cnew<NodeFunctionCompare>(__func__); data->operation = NODE_COMPARE_GREATER_THAN; data->data_type = SOCK_FLOAT; data->mode = NODE_COMPARE_MODE_ELEMENT; diff --git a/source/blender/nodes/function/nodes/node_fn_input_bool.cc b/source/blender/nodes/function/nodes/node_fn_input_bool.cc index 1358bf8a223..5623a6df357 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_bool.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_bool.cc @@ -43,7 +43,7 @@ static void fn_node_input_bool_build_multi_function(NodeMultiFunctionBuilder &bu static void fn_node_input_bool_init(bNodeTree *UNUSED(ntree), bNode *node) { - NodeInputBool *data = (NodeInputBool *)MEM_callocN(sizeof(NodeInputBool), __func__); + NodeInputBool *data = MEM_cnew<NodeInputBool>(__func__); node->storage = data; } diff --git a/source/blender/nodes/function/nodes/node_fn_input_color.cc b/source/blender/nodes/function/nodes/node_fn_input_color.cc index 43bb654b776..cb8d95fc63a 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_color.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_color.cc @@ -43,7 +43,7 @@ static void fn_node_input_color_build_multi_function( static void fn_node_input_color_init(bNodeTree *UNUSED(ntree), bNode *node) { - NodeInputColor *data = (NodeInputColor *)MEM_callocN(sizeof(NodeInputColor), __func__); + NodeInputColor *data = MEM_cnew<NodeInputColor>(__func__); copy_v4_fl4(data->color, 0.5f, 0.5f, 0.5f, 1.0f); node->storage = data; } diff --git a/source/blender/nodes/function/nodes/node_fn_input_int.cc b/source/blender/nodes/function/nodes/node_fn_input_int.cc index ddbb86e2661..b82dc06395d 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_int.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_int.cc @@ -43,7 +43,7 @@ static void fn_node_input_int_build_multi_function(NodeMultiFunctionBuilder &bui static void fn_node_input_int_init(bNodeTree *UNUSED(ntree), bNode *node) { - NodeInputInt *data = (NodeInputInt *)MEM_callocN(sizeof(NodeInputInt), __func__); + NodeInputInt *data = MEM_cnew<NodeInputInt>(__func__); node->storage = data; } diff --git a/source/blender/nodes/function/nodes/node_fn_input_vector.cc b/source/blender/nodes/function/nodes/node_fn_input_vector.cc index 1e5fd186b5a..352e834ee5b 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_vector.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_vector.cc @@ -44,8 +44,7 @@ static void fn_node_input_vector_build_multi_function(NodeMultiFunctionBuilder & static void fn_node_input_vector_init(bNodeTree *UNUSED(ntree), bNode *node) { - NodeInputVector *data = (NodeInputVector *)MEM_callocN(sizeof(NodeInputVector), - "input vector node"); + NodeInputVector *data = MEM_cnew<NodeInputVector>(__func__); node->storage = data; } diff --git a/source/blender/nodes/function/nodes/node_fn_random_value.cc b/source/blender/nodes/function/nodes/node_fn_random_value.cc index b053482c99d..24814047dda 100644 --- a/source/blender/nodes/function/nodes/node_fn_random_value.cc +++ b/source/blender/nodes/function/nodes/node_fn_random_value.cc @@ -63,7 +63,7 @@ static void fn_node_random_value_layout(uiLayout *layout, bContext *UNUSED(C), P static void fn_node_random_value_init(bNodeTree *UNUSED(tree), bNode *node) { - NodeRandomValue *data = (NodeRandomValue *)MEM_callocN(sizeof(NodeRandomValue), __func__); + NodeRandomValue *data = MEM_cnew<NodeRandomValue>(__func__); data->data_type = CD_PROP_FLOAT; node->storage = data; } |