diff options
| author | Michael Kowalski <makowalski@nvidia.com> | 2022-01-07 02:02:02 +0300 |
|---|---|---|
| committer | Michael Kowalski <makowalski@nvidia.com> | 2022-01-07 02:02:02 +0300 |
| commit | 442b8e3dcdbe200d9ac449a07a89726a3329ac14 (patch) | |
| tree | 10af735a2d0c6aee1c321a372940387bc590f391 /source/blender/nodes/composite/nodes/node_composite_outputFile.cc | |
| parent | 18bf798dc6032f67c247f0b64e246e94a88f3f5f (diff) | |
| parent | 3e92b4ed2408eacd126c0deb7790891025b2c075 (diff) | |
Merge remote-tracking branch 'origin/master' into temp-usd-preview-surf-export
Diffstat (limited to 'source/blender/nodes/composite/nodes/node_composite_outputFile.cc')
| -rw-r--r-- | source/blender/nodes/composite/nodes/node_composite_outputFile.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/nodes/composite/nodes/node_composite_outputFile.cc b/source/blender/nodes/composite/nodes/node_composite_outputFile.cc index 79074375a23..f4699ec02d0 100644 --- a/source/blender/nodes/composite/nodes/node_composite_outputFile.cc +++ b/source/blender/nodes/composite/nodes/node_composite_outputFile.cc @@ -135,8 +135,7 @@ bNodeSocket *ntreeCompositOutputFileAddSocket(bNodeTree *ntree, ntree, node, SOCK_IN, SOCK_RGBA, PROP_NONE, nullptr, name); /* create format data for the input socket */ - NodeImageMultiFileSocket *sockdata = (NodeImageMultiFileSocket *)MEM_callocN( - sizeof(NodeImageMultiFileSocket), "socket image format"); + NodeImageMultiFileSocket *sockdata = MEM_cnew<NodeImageMultiFileSocket>(__func__); sock->storage = sockdata; BLI_strncpy_utf8(sockdata->path, name, sizeof(sockdata->path)); @@ -203,8 +202,7 @@ static void init_output_file(const bContext *C, PointerRNA *ptr) Scene *scene = CTX_data_scene(C); bNodeTree *ntree = (bNodeTree *)ptr->owner_id; bNode *node = (bNode *)ptr->data; - NodeImageMultiFile *nimf = (NodeImageMultiFile *)MEM_callocN(sizeof(NodeImageMultiFile), - "node image multi file"); + NodeImageMultiFile *nimf = MEM_cnew<NodeImageMultiFile>(__func__); ImageFormatData *format = nullptr; node->storage = nimf; @@ -441,11 +439,12 @@ void register_node_type_cmp_output_file() { static bNodeType ntype; - cmp_node_type_base(&ntype, CMP_NODE_OUTPUT_FILE, "File Output", NODE_CLASS_OUTPUT, NODE_PREVIEW); + cmp_node_type_base(&ntype, CMP_NODE_OUTPUT_FILE, "File Output", NODE_CLASS_OUTPUT); node_type_socket_templates(&ntype, nullptr, nullptr); ntype.draw_buttons = node_composit_buts_file_output; ntype.draw_buttons_ex = node_composit_buts_file_output_ex; ntype.initfunc_api = init_output_file; + ntype.flag |= NODE_PREVIEW; node_type_storage(&ntype, "NodeImageMultiFile", free_output_file, copy_output_file); node_type_update(&ntype, update_output_file); |