diff options
Diffstat (limited to 'source/blender/compositor/nodes')
12 files changed, 17 insertions, 16 deletions
diff --git a/source/blender/compositor/nodes/COM_CombineColorNode.cc b/source/blender/compositor/nodes/COM_CombineColorNode.cc index 36ff24cb9c3..7802a585c05 100644 --- a/source/blender/compositor/nodes/COM_CombineColorNode.cc +++ b/source/blender/compositor/nodes/COM_CombineColorNode.cc @@ -12,7 +12,7 @@ CombineColorNode::CombineColorNode(bNode *editor_node) : Node(editor_node) } void CombineColorNode::convert_to_operations(NodeConverter &converter, - const CompositorContext &UNUSED(context)) const + const CompositorContext & /*context*/) const { NodeInput *input_rsocket = this->get_input_socket(0); NodeInput *input_gsocket = this->get_input_socket(1); diff --git a/source/blender/compositor/nodes/COM_CombineXYZNode.cc b/source/blender/compositor/nodes/COM_CombineXYZNode.cc index 0b46f7ba0d4..dd09dabef02 100644 --- a/source/blender/compositor/nodes/COM_CombineXYZNode.cc +++ b/source/blender/compositor/nodes/COM_CombineXYZNode.cc @@ -12,7 +12,7 @@ CombineXYZNode::CombineXYZNode(bNode *editor_node) : Node(editor_node) } void CombineXYZNode::convert_to_operations(NodeConverter &converter, - const CompositorContext &UNUSED(context)) const + const CompositorContext & /*context*/) const { NodeInput *input_x_socket = this->get_input_socket(0); NodeInput *input_y_socket = this->get_input_socket(1); diff --git a/source/blender/compositor/nodes/COM_ConvertColorSpaceNode.cc b/source/blender/compositor/nodes/COM_ConvertColorSpaceNode.cc index 7d557de66e4..d26b649e30b 100644 --- a/source/blender/compositor/nodes/COM_ConvertColorSpaceNode.cc +++ b/source/blender/compositor/nodes/COM_ConvertColorSpaceNode.cc @@ -25,7 +25,7 @@ ConvertColorSpaceNode::ConvertColorSpaceNode(bNode *editorNode) : Node(editorNod } void ConvertColorSpaceNode::convert_to_operations(NodeConverter &converter, - const CompositorContext &UNUSED(context)) const + const CompositorContext & /*context*/) const { const bNode *b_node = get_bnode(); diff --git a/source/blender/compositor/nodes/COM_CropNode.cc b/source/blender/compositor/nodes/COM_CropNode.cc index 849fb80a8a8..80f345e8762 100644 --- a/source/blender/compositor/nodes/COM_CropNode.cc +++ b/source/blender/compositor/nodes/COM_CropNode.cc @@ -16,8 +16,8 @@ void CropNode::convert_to_operations(NodeConverter &converter, { const bNode *node = get_bnode(); NodeTwoXYs *crop_settings = (NodeTwoXYs *)node->storage; - bool relative = (bool)node->custom2; - bool crop_image = (bool)node->custom1; + bool relative = bool(node->custom2); + bool crop_image = bool(node->custom1); CropBaseOperation *operation; if (crop_image) { operation = new CropImageOperation(); diff --git a/source/blender/compositor/nodes/COM_CryptomatteNode.cc b/source/blender/compositor/nodes/COM_CryptomatteNode.cc index 42d699af01b..ee31fce0ea8 100644 --- a/source/blender/compositor/nodes/COM_CryptomatteNode.cc +++ b/source/blender/compositor/nodes/COM_CryptomatteNode.cc @@ -10,6 +10,7 @@ #include "COM_MultilayerImageOperation.h" #include "COM_RenderLayersProg.h" #include "COM_SetAlphaMultiplyOperation.h" +#include "COM_SetAlphaReplaceOperation.h" #include "COM_SetColorOperation.h" namespace blender::compositor { @@ -48,7 +49,7 @@ void CryptomatteBaseNode::convert_to_operations(NodeConverter &converter, converter.map_output_socket(output_image_socket, apply_mask_operation->get_output_socket(0)); NodeOutput *output_pick_socket = this->get_output_socket(2); - SetAlphaMultiplyOperation *extract_pick_operation = new SetAlphaMultiplyOperation(); + SetAlphaReplaceOperation *extract_pick_operation = new SetAlphaReplaceOperation(); converter.add_operation(extract_pick_operation); converter.add_input_value(extract_pick_operation->get_input_socket(1), 1.0f); converter.add_link(cryptomatte_operation->get_output_socket(0), @@ -240,8 +241,8 @@ CryptomatteOperation *CryptomatteNode::create_cryptomatte_operation( CryptomatteOperation *CryptomatteLegacyNode::create_cryptomatte_operation( NodeConverter &converter, - const CompositorContext &UNUSED(context), - const bNode &UNUSED(node), + const CompositorContext & /*context*/, + const bNode & /*node*/, const NodeCryptomatte *cryptomatte_settings) const { const int num_inputs = inputs_.size() - 1; diff --git a/source/blender/compositor/nodes/COM_MapUVNode.cc b/source/blender/compositor/nodes/COM_MapUVNode.cc index ed9bff657f3..0ff86cabd4d 100644 --- a/source/blender/compositor/nodes/COM_MapUVNode.cc +++ b/source/blender/compositor/nodes/COM_MapUVNode.cc @@ -17,7 +17,7 @@ void MapUVNode::convert_to_operations(NodeConverter &converter, const bNode *node = this->get_bnode(); MapUVOperation *operation = new MapUVOperation(); - operation->set_alpha((float)node->custom1); + operation->set_alpha(float(node->custom1)); operation->set_canvas_input_index(1); converter.add_operation(operation); diff --git a/source/blender/compositor/nodes/COM_MaskNode.cc b/source/blender/compositor/nodes/COM_MaskNode.cc index f92e307328d..3c6812d606f 100644 --- a/source/blender/compositor/nodes/COM_MaskNode.cc +++ b/source/blender/compositor/nodes/COM_MaskNode.cc @@ -41,7 +41,7 @@ void MaskNode::convert_to_operations(NodeConverter &converter, operation->set_mask(mask); operation->set_framenumber(context.get_framenumber()); - operation->set_feather((bool)(editor_node->custom1 & CMP_NODEFLAG_MASK_NO_FEATHER) == 0); + operation->set_feather(bool(editor_node->custom1 & CMP_NODEFLAG_MASK_NO_FEATHER) == 0); if ((editor_node->custom1 & CMP_NODEFLAG_MASK_MOTION_BLUR) && (editor_node->custom2 > 1) && (editor_node->custom3 > FLT_EPSILON)) { diff --git a/source/blender/compositor/nodes/COM_OutputFileNode.cc b/source/blender/compositor/nodes/COM_OutputFileNode.cc index c83bcf42efd..50989f73986 100644 --- a/source/blender/compositor/nodes/COM_OutputFileNode.cc +++ b/source/blender/compositor/nodes/COM_OutputFileNode.cc @@ -65,7 +65,7 @@ void OutputFileNode::convert_to_operations(NodeConverter &converter, if (storage->format.imtype == R_IMF_IMTYPE_MULTILAYER) { const bool use_half_float = (storage->format.depth == R_IMF_CHAN_DEPTH_16); - /* single output operation for the multilayer file */ + /* Single output operation for the multi-layer file. */ OutputOpenExrMultiLayerOperation *output_operation; if (is_multiview && storage->format.views_format == R_IMF_VIEWS_MULTIVIEW) { @@ -104,7 +104,7 @@ void OutputFileNode::convert_to_operations(NodeConverter &converter, char path[FILE_MAX]; /* combine file path for the input */ - BLI_join_dirfile(path, FILE_MAX, storage->base_path, sockdata->path); + BLI_path_join(path, FILE_MAX, storage->base_path, sockdata->path); NodeOperation *output_operation = nullptr; diff --git a/source/blender/compositor/nodes/COM_SceneTimeNode.cc b/source/blender/compositor/nodes/COM_SceneTimeNode.cc index edd6efdb67b..dd5784f03ee 100644 --- a/source/blender/compositor/nodes/COM_SceneTimeNode.cc +++ b/source/blender/compositor/nodes/COM_SceneTimeNode.cc @@ -20,7 +20,7 @@ void SceneTimeNode::convert_to_operations(NodeConverter &converter, const int frameNumber = context.get_framenumber(); const Scene *scene = context.get_scene(); - const double frameRate = (((double)scene->r.frs_sec) / (double)scene->r.frs_sec_base); + const double frameRate = (double(scene->r.frs_sec) / double(scene->r.frs_sec_base)); SecondOperation->set_value(float(frameNumber / frameRate)); converter.add_operation(SecondOperation); diff --git a/source/blender/compositor/nodes/COM_SeparateColorNode.cc b/source/blender/compositor/nodes/COM_SeparateColorNode.cc index 28ebbb35e9a..6732396004f 100644 --- a/source/blender/compositor/nodes/COM_SeparateColorNode.cc +++ b/source/blender/compositor/nodes/COM_SeparateColorNode.cc @@ -12,7 +12,7 @@ SeparateColorNode::SeparateColorNode(bNode *editor_node) : Node(editor_node) } void SeparateColorNode::convert_to_operations(NodeConverter &converter, - const CompositorContext &UNUSED(context)) const + const CompositorContext & /*context*/) const { NodeInput *image_socket = this->get_input_socket(0); NodeOutput *output_rsocket = this->get_output_socket(0); diff --git a/source/blender/compositor/nodes/COM_SeparateXYZNode.cc b/source/blender/compositor/nodes/COM_SeparateXYZNode.cc index 4e7704dcdc8..7aa8de04c34 100644 --- a/source/blender/compositor/nodes/COM_SeparateXYZNode.cc +++ b/source/blender/compositor/nodes/COM_SeparateXYZNode.cc @@ -13,7 +13,7 @@ SeparateXYZNode::SeparateXYZNode(bNode *editor_node) : Node(editor_node) } void SeparateXYZNode::convert_to_operations(NodeConverter &converter, - const CompositorContext &UNUSED(context)) const + const CompositorContext & /*context*/) const { NodeInput *vector_socket = this->get_input_socket(0); NodeOutput *output_x_socket = this->get_output_socket(0); diff --git a/source/blender/compositor/nodes/COM_TimeNode.cc b/source/blender/compositor/nodes/COM_TimeNode.cc index 4f4f6f7bf8a..4004a5f718f 100644 --- a/source/blender/compositor/nodes/COM_TimeNode.cc +++ b/source/blender/compositor/nodes/COM_TimeNode.cc @@ -31,7 +31,7 @@ void TimeNode::convert_to_operations(NodeConverter &converter, fac = 1.0f; } else if (node->custom1 < node->custom2) { - fac = (context.get_framenumber() - node->custom1) / (float)(node->custom2 - node->custom1); + fac = (context.get_framenumber() - node->custom1) / float(node->custom2 - node->custom1); } BKE_curvemapping_init((CurveMapping *)node->storage); |