Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Goudey <h.goudey@me.com>2022-10-04 01:37:25 +0300
committerHans Goudey <h.goudey@me.com>2022-10-04 01:38:16 +0300
commit97746129d5870beedc40e3c035c7982ce8a6bebc (patch)
treeb819b8e7875e6684aad7ea1f6bb7922d4fa1c8fc /source/blender/compositor
parented7f5713f8f9d605e3cd4cce42e40fb5c6bf4bf5 (diff)
Cleanup: replace UNUSED macro with commented args in C++ code
This is the conventional way of dealing with unused arguments in C++, since it works on all compilers. Regex find and replace: `UNUSED\((\w+)\)` -> `/*$1*/`
Diffstat (limited to 'source/blender/compositor')
-rw-r--r--source/blender/compositor/intern/COM_MetaData.cc2
-rw-r--r--source/blender/compositor/intern/COM_MultiThreadedOperation.h12
-rw-r--r--source/blender/compositor/intern/COM_NodeOperation.h6
-rw-r--r--source/blender/compositor/intern/COM_WorkScheduler.cc2
-rw-r--r--source/blender/compositor/nodes/COM_CombineColorNode.cc2
-rw-r--r--source/blender/compositor/nodes/COM_CombineXYZNode.cc2
-rw-r--r--source/blender/compositor/nodes/COM_ConvertColorSpaceNode.cc2
-rw-r--r--source/blender/compositor/nodes/COM_CryptomatteNode.cc4
-rw-r--r--source/blender/compositor/nodes/COM_SeparateColorNode.cc2
-rw-r--r--source/blender/compositor/nodes/COM_SeparateXYZNode.cc2
-rw-r--r--source/blender/compositor/operations/COM_BilateralBlurOperation.cc2
-rw-r--r--source/blender/compositor/operations/COM_BokehImageOperation.cc2
-rw-r--r--source/blender/compositor/operations/COM_CalculateMeanOperation.cc8
-rw-r--r--source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cc7
-rw-r--r--source/blender/compositor/operations/COM_CompositorOperation.cc4
-rw-r--r--source/blender/compositor/operations/COM_ConstantOperation.cc2
-rw-r--r--source/blender/compositor/operations/COM_DenoiseOperation.cc14
-rw-r--r--source/blender/compositor/operations/COM_DirectionalBlurOperation.cc2
-rw-r--r--source/blender/compositor/operations/COM_DisplaceOperation.cc4
-rw-r--r--source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cc6
-rw-r--r--source/blender/compositor/operations/COM_FastGaussianBlurOperation.cc8
-rw-r--r--source/blender/compositor/operations/COM_FastGaussianBlurOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_GlareBaseOperation.cc4
-rw-r--r--source/blender/compositor/operations/COM_ImageOperation.cc8
-rw-r--r--source/blender/compositor/operations/COM_InpaintOperation.cc2
-rw-r--r--source/blender/compositor/operations/COM_KeyingBlurOperation.cc2
-rw-r--r--source/blender/compositor/operations/COM_MapUVOperation.cc4
-rw-r--r--source/blender/compositor/operations/COM_MaskOperation.cc2
-rw-r--r--source/blender/compositor/operations/COM_MovieClipOperation.cc6
-rw-r--r--source/blender/compositor/operations/COM_MultilayerImageOperation.cc2
-rw-r--r--source/blender/compositor/operations/COM_NormalizeOperation.cc8
-rw-r--r--source/blender/compositor/operations/COM_OutputFileOperation.cc4
-rw-r--r--source/blender/compositor/operations/COM_PlaneCornerPinOperation.cc4
-rw-r--r--source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cc2
-rw-r--r--source/blender/compositor/operations/COM_PreviewOperation.cc4
-rw-r--r--source/blender/compositor/operations/COM_RenderLayersProg.cc10
-rw-r--r--source/blender/compositor/operations/COM_SMAAOperation.cc10
-rw-r--r--source/blender/compositor/operations/COM_ScaleOperation.h4
-rw-r--r--source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cc2
-rw-r--r--source/blender/compositor/operations/COM_TonemapOperation.cc6
-rw-r--r--source/blender/compositor/operations/COM_VectorBlurOperation.cc4
-rw-r--r--source/blender/compositor/operations/COM_ViewerOperation.cc2
-rw-r--r--source/blender/compositor/realtime_compositor/intern/utilities.cc4
-rw-r--r--source/blender/compositor/tests/COM_BuffersIterator_test.cc8
44 files changed, 102 insertions, 101 deletions
diff --git a/source/blender/compositor/intern/COM_MetaData.cc b/source/blender/compositor/intern/COM_MetaData.cc
index 9ee3d7e5c22..94a0bc8706b 100644
--- a/source/blender/compositor/intern/COM_MetaData.cc
+++ b/source/blender/compositor/intern/COM_MetaData.cc
@@ -72,7 +72,7 @@ void MetaDataExtractCallbackData::set_cryptomatte_keys(blender::StringRef crypto
void MetaDataExtractCallbackData::extract_cryptomatte_meta_data(void *_data,
const char *propname,
char *propvalue,
- int UNUSED(len))
+ int /*len*/)
{
MetaDataExtractCallbackData *data = static_cast<MetaDataExtractCallbackData *>(_data);
blender::StringRefNull key(propname);
diff --git a/source/blender/compositor/intern/COM_MultiThreadedOperation.h b/source/blender/compositor/intern/COM_MultiThreadedOperation.h
index 9ec81fa834e..355081c374d 100644
--- a/source/blender/compositor/intern/COM_MultiThreadedOperation.h
+++ b/source/blender/compositor/intern/COM_MultiThreadedOperation.h
@@ -24,9 +24,9 @@ class MultiThreadedOperation : public NodeOperation {
/**
* Called before an update memory buffer pass is executed. Single-threaded calls.
*/
- virtual void update_memory_buffer_started(MemoryBuffer *UNUSED(output),
- const rcti &UNUSED(area),
- Span<MemoryBuffer *> UNUSED(inputs))
+ virtual void update_memory_buffer_started(MemoryBuffer * /*output*/,
+ const rcti & /*area*/,
+ Span<MemoryBuffer *> /*inputs*/)
{
}
@@ -40,9 +40,9 @@ class MultiThreadedOperation : public NodeOperation {
/**
* Called after an update memory buffer pass is executed. Single-threaded calls.
*/
- virtual void update_memory_buffer_finished(MemoryBuffer *UNUSED(output),
- const rcti &UNUSED(area),
- Span<MemoryBuffer *> UNUSED(inputs))
+ virtual void update_memory_buffer_finished(MemoryBuffer * /*output*/,
+ const rcti & /*area*/,
+ Span<MemoryBuffer *> /*inputs*/)
{
}
diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h
index aa9e4329ab6..a00ac1352fe 100644
--- a/source/blender/compositor/intern/COM_NodeOperation.h
+++ b/source/blender/compositor/intern/COM_NodeOperation.h
@@ -628,9 +628,9 @@ class NodeOperation {
/**
* Executes operation updating output memory buffer. Single-threaded calls.
*/
- virtual void update_memory_buffer(MemoryBuffer *UNUSED(output),
- const rcti &UNUSED(area),
- Span<MemoryBuffer *> UNUSED(inputs))
+ virtual void update_memory_buffer(MemoryBuffer * /*output*/,
+ const rcti & /*area*/,
+ Span<MemoryBuffer *> /*inputs*/)
{
}
diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cc b/source/blender/compositor/intern/COM_WorkScheduler.cc
index 9414d7d7afa..9067807d98c 100644
--- a/source/blender/compositor/intern/COM_WorkScheduler.cc
+++ b/source/blender/compositor/intern/COM_WorkScheduler.cc
@@ -377,7 +377,7 @@ static void threading_model_queue_deinitialize()
/** \name Task Scheduling
* \{ */
-static void threading_model_task_execute(TaskPool *__restrict UNUSED(pool), void *task_data)
+static void threading_model_task_execute(TaskPool *__restrict /*pool*/, void *task_data)
{
WorkPackage *package = static_cast<WorkPackage *>(task_data);
CPUDevice device(BLI_task_parallel_thread_id(nullptr));
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_CryptomatteNode.cc b/source/blender/compositor/nodes/COM_CryptomatteNode.cc
index 42d699af01b..751ac0003bf 100644
--- a/source/blender/compositor/nodes/COM_CryptomatteNode.cc
+++ b/source/blender/compositor/nodes/COM_CryptomatteNode.cc
@@ -240,8 +240,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_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/operations/COM_BilateralBlurOperation.cc b/source/blender/compositor/operations/COM_BilateralBlurOperation.cc
index 3711851e8f5..c808ec02690 100644
--- a/source/blender/compositor/operations/COM_BilateralBlurOperation.cc
+++ b/source/blender/compositor/operations/COM_BilateralBlurOperation.cc
@@ -95,7 +95,7 @@ bool BilateralBlurOperation::determine_depending_area_of_interest(
return NodeOperation::determine_depending_area_of_interest(&new_input, read_operation, output);
}
-void BilateralBlurOperation::get_area_of_interest(const int UNUSED(input_idx),
+void BilateralBlurOperation::get_area_of_interest(const int /*input_idx*/,
const rcti &output_area,
rcti &r_input_area)
{
diff --git a/source/blender/compositor/operations/COM_BokehImageOperation.cc b/source/blender/compositor/operations/COM_BokehImageOperation.cc
index 9828d38d83f..b74ac9dac64 100644
--- a/source/blender/compositor/operations/COM_BokehImageOperation.cc
+++ b/source/blender/compositor/operations/COM_BokehImageOperation.cc
@@ -96,7 +96,7 @@ void BokehImageOperation::execute_pixel_sampled(float output[4],
void BokehImageOperation::update_memory_buffer_partial(MemoryBuffer *output,
const rcti &area,
- Span<MemoryBuffer *> UNUSED(inputs))
+ Span<MemoryBuffer *> /*inputs*/)
{
const float shift = data_->lensshift;
const float shift2 = shift / 2.0f;
diff --git a/source/blender/compositor/operations/COM_CalculateMeanOperation.cc b/source/blender/compositor/operations/COM_CalculateMeanOperation.cc
index 4e5832a7d34..9dbeabafa5a 100644
--- a/source/blender/compositor/operations/COM_CalculateMeanOperation.cc
+++ b/source/blender/compositor/operations/COM_CalculateMeanOperation.cc
@@ -144,15 +144,15 @@ void CalculateMeanOperation::set_setting(int setting)
}
void CalculateMeanOperation::get_area_of_interest(int input_idx,
- const rcti &UNUSED(output_area),
+ const rcti & /*output_area*/,
rcti &r_input_area)
{
BLI_assert(input_idx == 0);
r_input_area = get_input_operation(input_idx)->get_canvas();
}
-void CalculateMeanOperation::update_memory_buffer_started(MemoryBuffer *UNUSED(output),
- const rcti &UNUSED(area),
+void CalculateMeanOperation::update_memory_buffer_started(MemoryBuffer * /*output*/,
+ const rcti & /*area*/,
Span<MemoryBuffer *> inputs)
{
if (!iscalculated_) {
@@ -164,7 +164,7 @@ void CalculateMeanOperation::update_memory_buffer_started(MemoryBuffer *UNUSED(o
void CalculateMeanOperation::update_memory_buffer_partial(MemoryBuffer *output,
const rcti &area,
- Span<MemoryBuffer *> UNUSED(inputs))
+ Span<MemoryBuffer *> /*inputs*/)
{
output->fill(area, &result_);
}
diff --git a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cc b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cc
index 95acf51413c..709218297b7 100644
--- a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cc
+++ b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cc
@@ -81,8 +81,9 @@ void *CalculateStandardDeviationOperation::initialize_tile_data(rcti *rect)
return nullptr;
}
-void CalculateStandardDeviationOperation::update_memory_buffer_started(
- MemoryBuffer *UNUSED(output), const rcti &UNUSED(area), Span<MemoryBuffer *> inputs)
+void CalculateStandardDeviationOperation::update_memory_buffer_started(MemoryBuffer * /*output*/,
+ const rcti & /*area*/,
+ Span<MemoryBuffer *> inputs)
{
if (!iscalculated_) {
const MemoryBuffer *input = inputs[0];
@@ -104,7 +105,7 @@ void CalculateStandardDeviationOperation::update_memory_buffer_started(
}
void CalculateStandardDeviationOperation::update_memory_buffer_partial(
- MemoryBuffer *output, const rcti &area, Span<MemoryBuffer *> UNUSED(inputs))
+ MemoryBuffer *output, const rcti &area, Span<MemoryBuffer *> /*inputs*/)
{
output->fill(area, &standard_deviation_);
}
diff --git a/source/blender/compositor/operations/COM_CompositorOperation.cc b/source/blender/compositor/operations/COM_CompositorOperation.cc
index 039a2538427..1ff27607d09 100644
--- a/source/blender/compositor/operations/COM_CompositorOperation.cc
+++ b/source/blender/compositor/operations/COM_CompositorOperation.cc
@@ -197,7 +197,7 @@ void CompositorOperation::execute_region(rcti *rect, uint /*tile_number*/)
}
}
-void CompositorOperation::update_memory_buffer_partial(MemoryBuffer *UNUSED(output),
+void CompositorOperation::update_memory_buffer_partial(MemoryBuffer * /*output*/,
const rcti &area,
Span<MemoryBuffer *> inputs)
{
@@ -213,7 +213,7 @@ void CompositorOperation::update_memory_buffer_partial(MemoryBuffer *UNUSED(outp
depth_buf.copy_from(inputs[2], area);
}
-void CompositorOperation::determine_canvas(const rcti &UNUSED(preferred_area), rcti &r_area)
+void CompositorOperation::determine_canvas(const rcti & /*preferred_area*/, rcti &r_area)
{
int width, height;
BKE_render_resolution(rd_, false, &width, &height);
diff --git a/source/blender/compositor/operations/COM_ConstantOperation.cc b/source/blender/compositor/operations/COM_ConstantOperation.cc
index 0977da5e37c..21c10f2b52a 100644
--- a/source/blender/compositor/operations/COM_ConstantOperation.cc
+++ b/source/blender/compositor/operations/COM_ConstantOperation.cc
@@ -19,7 +19,7 @@ bool ConstantOperation::can_get_constant_elem() const
void ConstantOperation::update_memory_buffer(MemoryBuffer *output,
const rcti &area,
- Span<MemoryBuffer *> UNUSED(inputs))
+ Span<MemoryBuffer *> /*inputs*/)
{
BLI_assert(output->is_a_single_elem());
const float *constant = get_constant_elem();
diff --git a/source/blender/compositor/operations/COM_DenoiseOperation.cc b/source/blender/compositor/operations/COM_DenoiseOperation.cc
index 123f33d3c9e..5019c2bb158 100644
--- a/source/blender/compositor/operations/COM_DenoiseOperation.cc
+++ b/source/blender/compositor/operations/COM_DenoiseOperation.cc
@@ -89,7 +89,7 @@ class DenoiseFilter {
}
#else
- void init_and_lock_denoiser(MemoryBuffer *UNUSED(output))
+ void init_and_lock_denoiser(MemoryBuffer * /*output*/)
{
}
@@ -97,11 +97,11 @@ class DenoiseFilter {
{
}
- void set_image(const StringRef UNUSED(name), MemoryBuffer *UNUSED(buffer))
+ void set_image(const StringRef /*name*/, MemoryBuffer * /*buffer*/)
{
}
- template<typename T> void set(const StringRef UNUSED(option_name), T UNUSED(value))
+ template<typename T> void set(const StringRef /*option_name*/, T /*value*/)
{
}
@@ -132,8 +132,8 @@ bool DenoiseBaseOperation::determine_depending_area_of_interest(
return NodeOperation::determine_depending_area_of_interest(&new_input, read_operation, output);
}
-void DenoiseBaseOperation::get_area_of_interest(const int UNUSED(input_idx),
- const rcti &UNUSED(output_area),
+void DenoiseBaseOperation::get_area_of_interest(const int /*input_idx*/,
+ const rcti & /*output_area*/,
rcti &r_input_area)
{
r_input_area = this->get_canvas();
@@ -251,7 +251,7 @@ void DenoiseOperation::generate_denoise(MemoryBuffer *output,
}
void DenoiseOperation::update_memory_buffer(MemoryBuffer *output,
- const rcti &UNUSED(area),
+ const rcti & /*area*/,
Span<MemoryBuffer *> inputs)
{
if (!output_rendered_) {
@@ -304,7 +304,7 @@ void DenoisePrefilterOperation::generate_denoise(MemoryBuffer *output, MemoryBuf
}
void DenoisePrefilterOperation::update_memory_buffer(MemoryBuffer *output,
- const rcti &UNUSED(area),
+ const rcti & /*area*/,
Span<MemoryBuffer *> inputs)
{
if (!output_rendered_) {
diff --git a/source/blender/compositor/operations/COM_DirectionalBlurOperation.cc b/source/blender/compositor/operations/COM_DirectionalBlurOperation.cc
index 31ff3b5f4a2..5e292fa12c2 100644
--- a/source/blender/compositor/operations/COM_DirectionalBlurOperation.cc
+++ b/source/blender/compositor/operations/COM_DirectionalBlurOperation.cc
@@ -128,7 +128,7 @@ bool DirectionalBlurOperation::determine_depending_area_of_interest(
}
void DirectionalBlurOperation::get_area_of_interest(const int input_idx,
- const rcti &UNUSED(output_area),
+ const rcti & /*output_area*/,
rcti &r_input_area)
{
BLI_assert(input_idx == 0);
diff --git a/source/blender/compositor/operations/COM_DisplaceOperation.cc b/source/blender/compositor/operations/COM_DisplaceOperation.cc
index bbc8c09e866..1aec8e12242 100644
--- a/source/blender/compositor/operations/COM_DisplaceOperation.cc
+++ b/source/blender/compositor/operations/COM_DisplaceOperation.cc
@@ -209,8 +209,8 @@ void DisplaceOperation::get_area_of_interest(const int input_idx,
}
}
-void DisplaceOperation::update_memory_buffer_started(MemoryBuffer *UNUSED(output),
- const rcti &UNUSED(area),
+void DisplaceOperation::update_memory_buffer_started(MemoryBuffer * /*output*/,
+ const rcti & /*area*/,
Span<MemoryBuffer *> inputs)
{
MemoryBuffer *vector = inputs[1];
diff --git a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cc b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cc
index 28c0b44ac2f..e120dd5f41a 100644
--- a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cc
+++ b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cc
@@ -1354,15 +1354,15 @@ void DoubleEdgeMaskOperation::deinit_execution()
}
}
-void DoubleEdgeMaskOperation::get_area_of_interest(int UNUSED(input_idx),
- const rcti &UNUSED(output_area),
+void DoubleEdgeMaskOperation::get_area_of_interest(int /*input_idx*/,
+ const rcti & /*output_area*/,
rcti &r_input_area)
{
r_input_area = this->get_canvas();
}
void DoubleEdgeMaskOperation::update_memory_buffer(MemoryBuffer *output,
- const rcti &UNUSED(area),
+ const rcti & /*area*/,
Span<MemoryBuffer *> inputs)
{
if (!is_output_rendered_) {
diff --git a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cc b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cc
index 988b1c0d533..7557d1bc4bd 100644
--- a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cc
+++ b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cc
@@ -384,15 +384,15 @@ void *FastGaussianBlurValueOperation::initialize_tile_data(rcti *rect)
return iirgaus_;
}
-void FastGaussianBlurValueOperation::get_area_of_interest(const int UNUSED(input_idx),
- const rcti &UNUSED(output_area),
+void FastGaussianBlurValueOperation::get_area_of_interest(const int /*input_idx*/,
+ const rcti & /*output_area*/,
rcti &r_input_area)
{
r_input_area = this->get_canvas();
}
-void FastGaussianBlurValueOperation::update_memory_buffer_started(MemoryBuffer *UNUSED(output),
- const rcti &UNUSED(area),
+void FastGaussianBlurValueOperation::update_memory_buffer_started(MemoryBuffer * /*output*/,
+ const rcti & /*area*/,
Span<MemoryBuffer *> inputs)
{
if (iirgaus_ == nullptr) {
diff --git a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
index 157d3c7f32f..0f7064c19a5 100644
--- a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
+++ b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
@@ -31,9 +31,9 @@ class FastGaussianBlurOperation : public BlurBaseOperation {
void update_memory_buffer_started(MemoryBuffer *output,
const rcti &area,
Span<MemoryBuffer *> inputs) override;
- void update_memory_buffer_partial(MemoryBuffer *UNUSED(output),
- const rcti &UNUSED(area),
- Span<MemoryBuffer *> UNUSED(inputs)) override
+ void update_memory_buffer_partial(MemoryBuffer * /*output*/,
+ const rcti & /*area*/,
+ Span<MemoryBuffer *> /*inputs*/) override
{
}
};
diff --git a/source/blender/compositor/operations/COM_GlareBaseOperation.cc b/source/blender/compositor/operations/COM_GlareBaseOperation.cc
index 13f55b5909c..93d3c2063ae 100644
--- a/source/blender/compositor/operations/COM_GlareBaseOperation.cc
+++ b/source/blender/compositor/operations/COM_GlareBaseOperation.cc
@@ -56,7 +56,7 @@ bool GlareBaseOperation::determine_depending_area_of_interest(rcti * /*input*/,
}
void GlareBaseOperation::get_area_of_interest(const int input_idx,
- const rcti &UNUSED(output_area),
+ const rcti & /*output_area*/,
rcti &r_input_area)
{
BLI_assert(input_idx == 0);
@@ -68,7 +68,7 @@ void GlareBaseOperation::get_area_of_interest(const int input_idx,
}
void GlareBaseOperation::update_memory_buffer(MemoryBuffer *output,
- const rcti &UNUSED(area),
+ const rcti & /*area*/,
Span<MemoryBuffer *> inputs)
{
if (!is_output_rendered_) {
diff --git a/source/blender/compositor/operations/COM_ImageOperation.cc b/source/blender/compositor/operations/COM_ImageOperation.cc
index 0d0b699eefc..e1ac5e42be3 100644
--- a/source/blender/compositor/operations/COM_ImageOperation.cc
+++ b/source/blender/compositor/operations/COM_ImageOperation.cc
@@ -90,7 +90,7 @@ void BaseImageOperation::deinit_execution()
}
}
-void BaseImageOperation::determine_canvas(const rcti &UNUSED(preferred_area), rcti &r_area)
+void BaseImageOperation::determine_canvas(const rcti & /*preferred_area*/, rcti &r_area)
{
ImBuf *stackbuf = get_im_buf();
@@ -155,7 +155,7 @@ void ImageOperation::execute_pixel_sampled(float output[4], float x, float y, Pi
void ImageOperation::update_memory_buffer_partial(MemoryBuffer *output,
const rcti &area,
- Span<MemoryBuffer *> UNUSED(inputs))
+ Span<MemoryBuffer *> /*inputs*/)
{
output->copy_from(buffer_, area, true);
}
@@ -179,7 +179,7 @@ void ImageAlphaOperation::execute_pixel_sampled(float output[4],
void ImageAlphaOperation::update_memory_buffer_partial(MemoryBuffer *output,
const rcti &area,
- Span<MemoryBuffer *> UNUSED(inputs))
+ Span<MemoryBuffer *> /*inputs*/)
{
output->copy_from(buffer_, area, 3, COM_DATA_TYPE_VALUE_CHANNELS, 0);
}
@@ -205,7 +205,7 @@ void ImageDepthOperation::execute_pixel_sampled(float output[4],
void ImageDepthOperation::update_memory_buffer_partial(MemoryBuffer *output,
const rcti &area,
- Span<MemoryBuffer *> UNUSED(inputs))
+ Span<MemoryBuffer *> /*inputs*/)
{
if (depth_buffer_) {
output->copy_from(depth_buffer_, area);
diff --git a/source/blender/compositor/operations/COM_InpaintOperation.cc b/source/blender/compositor/operations/COM_InpaintOperation.cc
index 12533c26a53..a2e02e9f045 100644
--- a/source/blender/compositor/operations/COM_InpaintOperation.cc
+++ b/source/blender/compositor/operations/COM_InpaintOperation.cc
@@ -267,7 +267,7 @@ bool InpaintSimpleOperation::determine_depending_area_of_interest(
}
void InpaintSimpleOperation::get_area_of_interest(const int input_idx,
- const rcti &UNUSED(output_area),
+ const rcti & /*output_area*/,
rcti &r_input_area)
{
BLI_assert(input_idx == 0);
diff --git a/source/blender/compositor/operations/COM_KeyingBlurOperation.cc b/source/blender/compositor/operations/COM_KeyingBlurOperation.cc
index 4ae11c04506..a63789f06c3 100644
--- a/source/blender/compositor/operations/COM_KeyingBlurOperation.cc
+++ b/source/blender/compositor/operations/COM_KeyingBlurOperation.cc
@@ -75,7 +75,7 @@ bool KeyingBlurOperation::determine_depending_area_of_interest(rcti *input,
return NodeOperation::determine_depending_area_of_interest(&new_input, read_operation, output);
}
-void KeyingBlurOperation::get_area_of_interest(const int UNUSED(input_idx),
+void KeyingBlurOperation::get_area_of_interest(const int /*input_idx*/,
const rcti &output_area,
rcti &r_input_area)
{
diff --git a/source/blender/compositor/operations/COM_MapUVOperation.cc b/source/blender/compositor/operations/COM_MapUVOperation.cc
index e6899949528..c300508268e 100644
--- a/source/blender/compositor/operations/COM_MapUVOperation.cc
+++ b/source/blender/compositor/operations/COM_MapUVOperation.cc
@@ -201,8 +201,8 @@ void MapUVOperation::get_area_of_interest(const int input_idx,
}
}
-void MapUVOperation::update_memory_buffer_started(MemoryBuffer *UNUSED(output),
- const rcti &UNUSED(area),
+void MapUVOperation::update_memory_buffer_started(MemoryBuffer * /*output*/,
+ const rcti & /*area*/,
Span<MemoryBuffer *> inputs)
{
const MemoryBuffer *uv_input = inputs[UV_INPUT_INDEX];
diff --git a/source/blender/compositor/operations/COM_MaskOperation.cc b/source/blender/compositor/operations/COM_MaskOperation.cc
index d8b7c52d9d7..53f59f831db 100644
--- a/source/blender/compositor/operations/COM_MaskOperation.cc
+++ b/source/blender/compositor/operations/COM_MaskOperation.cc
@@ -131,7 +131,7 @@ void MaskOperation::execute_pixel_sampled(float output[4],
void MaskOperation::update_memory_buffer_partial(MemoryBuffer *output,
const rcti &area,
- Span<MemoryBuffer *> UNUSED(inputs))
+ Span<MemoryBuffer *> /*inputs*/)
{
Vector<MaskRasterHandle *> handles = get_non_null_handles();
if (handles.size() == 0) {
diff --git a/source/blender/compositor/operations/COM_MovieClipOperation.cc b/source/blender/compositor/operations/COM_MovieClipOperation.cc
index b62d972e807..bbc762bf667 100644
--- a/source/blender/compositor/operations/COM_MovieClipOperation.cc
+++ b/source/blender/compositor/operations/COM_MovieClipOperation.cc
@@ -53,7 +53,7 @@ void MovieClipBaseOperation::deinit_execution()
}
}
-void MovieClipBaseOperation::determine_canvas(const rcti &UNUSED(preferred_area), rcti &r_area)
+void MovieClipBaseOperation::determine_canvas(const rcti & /*preferred_area*/, rcti &r_area)
{
r_area = COM_AREA_NONE;
if (movie_clip_) {
@@ -94,7 +94,7 @@ void MovieClipBaseOperation::execute_pixel_sampled(float output[4],
void MovieClipBaseOperation::update_memory_buffer_partial(MemoryBuffer *output,
const rcti &area,
- Span<MemoryBuffer *> UNUSED(inputs))
+ Span<MemoryBuffer *> /*inputs*/)
{
if (movie_clip_buffer_) {
output->copy_from(movie_clip_buffer_, area);
@@ -126,7 +126,7 @@ void MovieClipAlphaOperation::execute_pixel_sampled(float output[4],
void MovieClipAlphaOperation::update_memory_buffer_partial(MemoryBuffer *output,
const rcti &area,
- Span<MemoryBuffer *> UNUSED(inputs))
+ Span<MemoryBuffer *> /*inputs*/)
{
if (movie_clip_buffer_) {
output->copy_from(movie_clip_buffer_, area, 3, COM_DATA_TYPE_VALUE_CHANNELS, 0);
diff --git a/source/blender/compositor/operations/COM_MultilayerImageOperation.cc b/source/blender/compositor/operations/COM_MultilayerImageOperation.cc
index 991a909ddb7..9a825939deb 100644
--- a/source/blender/compositor/operations/COM_MultilayerImageOperation.cc
+++ b/source/blender/compositor/operations/COM_MultilayerImageOperation.cc
@@ -37,7 +37,7 @@ ImBuf *MultilayerBaseOperation::get_im_buf()
void MultilayerBaseOperation::update_memory_buffer_partial(MemoryBuffer *output,
const rcti &area,
- Span<MemoryBuffer *> UNUSED(inputs))
+ Span<MemoryBuffer *> /*inputs*/)
{
output->copy_from(buffer_, area);
}
diff --git a/source/blender/compositor/operations/COM_NormalizeOperation.cc b/source/blender/compositor/operations/COM_NormalizeOperation.cc
index 1131fc28439..b408964c35f 100644
--- a/source/blender/compositor/operations/COM_NormalizeOperation.cc
+++ b/source/blender/compositor/operations/COM_NormalizeOperation.cc
@@ -114,15 +114,15 @@ void NormalizeOperation::deinitialize_tile_data(rcti * /*rect*/, void * /*data*/
/* pass */
}
-void NormalizeOperation::get_area_of_interest(const int UNUSED(input_idx),
- const rcti &UNUSED(output_area),
+void NormalizeOperation::get_area_of_interest(const int /*input_idx*/,
+ const rcti & /*output_area*/,
rcti &r_input_area)
{
r_input_area = get_input_operation(0)->get_canvas();
}
-void NormalizeOperation::update_memory_buffer_started(MemoryBuffer *UNUSED(output),
- const rcti &UNUSED(area),
+void NormalizeOperation::update_memory_buffer_started(MemoryBuffer * /*output*/,
+ const rcti & /*area*/,
Span<MemoryBuffer *> inputs)
{
if (cached_instance_ == nullptr) {
diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.cc b/source/blender/compositor/operations/COM_OutputFileOperation.cc
index 6c7333c007a..711ea787c41 100644
--- a/source/blender/compositor/operations/COM_OutputFileOperation.cc
+++ b/source/blender/compositor/operations/COM_OutputFileOperation.cc
@@ -287,7 +287,7 @@ void OutputSingleLayerOperation::deinit_execution()
image_input_ = nullptr;
}
-void OutputSingleLayerOperation::update_memory_buffer_partial(MemoryBuffer *UNUSED(output),
+void OutputSingleLayerOperation::update_memory_buffer_partial(MemoryBuffer * /*output*/,
const rcti &area,
Span<MemoryBuffer *> inputs)
{
@@ -449,7 +449,7 @@ void OutputOpenExrMultiLayerOperation::deinit_execution()
}
}
-void OutputOpenExrMultiLayerOperation::update_memory_buffer_partial(MemoryBuffer *UNUSED(output),
+void OutputOpenExrMultiLayerOperation::update_memory_buffer_partial(MemoryBuffer * /*output*/,
const rcti &area,
Span<MemoryBuffer *> inputs)
{
diff --git a/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cc b/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cc
index 006f1f919ba..fcd37f2a179 100644
--- a/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cc
+++ b/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cc
@@ -195,8 +195,8 @@ void PlaneCornerPinMaskOperation::determine_canvas(const rcti &preferred_area, r
r_area = preferred_area;
}
-void PlaneCornerPinMaskOperation::get_area_of_interest(const int UNUSED(input_idx),
- const rcti &UNUSED(output_area),
+void PlaneCornerPinMaskOperation::get_area_of_interest(const int /*input_idx*/,
+ const rcti & /*output_area*/,
rcti &r_input_area)
{
/* All corner inputs are used as constants. */
diff --git a/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cc b/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cc
index 18b43f73356..59e924311e3 100644
--- a/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cc
+++ b/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cc
@@ -284,7 +284,7 @@ void PlaneDistortMaskOperation::execute_pixel_sampled(float output[4],
void PlaneDistortMaskOperation::update_memory_buffer_partial(MemoryBuffer *output,
const rcti &area,
- Span<MemoryBuffer *> UNUSED(inputs))
+ Span<MemoryBuffer *> /*inputs*/)
{
for (BuffersIterator<float> it = output->iterate_with({}, area); !it.is_end(); ++it) {
int inside_count = 0;
diff --git a/source/blender/compositor/operations/COM_PreviewOperation.cc b/source/blender/compositor/operations/COM_PreviewOperation.cc
index cf48942c542..2b9fc7ddc8c 100644
--- a/source/blender/compositor/operations/COM_PreviewOperation.cc
+++ b/source/blender/compositor/operations/COM_PreviewOperation.cc
@@ -101,7 +101,7 @@ bool PreviewOperation::determine_depending_area_of_interest(rcti *input,
return NodeOperation::determine_depending_area_of_interest(&new_input, read_operation, output);
}
-void PreviewOperation::determine_canvas(const rcti &UNUSED(preferred_area), rcti &r_area)
+void PreviewOperation::determine_canvas(const rcti & /*preferred_area*/, rcti &r_area)
{
/* Use default preview resolution as preferred ensuring it has size so that
* generated inputs (which don't have resolution on their own) are displayed */
@@ -154,7 +154,7 @@ void PreviewOperation::get_area_of_interest(const int input_idx,
r_input_area.ymax = output_area.ymax / divider_;
}
-void PreviewOperation::update_memory_buffer_partial(MemoryBuffer *UNUSED(output),
+void PreviewOperation::update_memory_buffer_partial(MemoryBuffer * /*output*/,
const rcti &area,
Span<MemoryBuffer *> inputs)
{
diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.cc b/source/blender/compositor/operations/COM_RenderLayersProg.cc
index e390ab38c7f..d95ee2a5e1a 100644
--- a/source/blender/compositor/operations/COM_RenderLayersProg.cc
+++ b/source/blender/compositor/operations/COM_RenderLayersProg.cc
@@ -169,7 +169,7 @@ void RenderLayersProg::deinit_execution()
}
}
-void RenderLayersProg::determine_canvas(const rcti &UNUSED(preferred_area), rcti &r_area)
+void RenderLayersProg::determine_canvas(const rcti & /*preferred_area*/, rcti &r_area)
{
Scene *sce = this->get_scene();
Render *re = (sce) ? RE_GetSceneRender(sce) : nullptr;
@@ -235,7 +235,7 @@ std::unique_ptr<MetaData> RenderLayersProg::get_meta_data()
void RenderLayersProg::update_memory_buffer_partial(MemoryBuffer *output,
const rcti &area,
- Span<MemoryBuffer *> UNUSED(inputs))
+ Span<MemoryBuffer *> /*inputs*/)
{
BLI_assert(output->get_num_channels() >= elementsize_);
if (layer_buffer_) {
@@ -266,7 +266,7 @@ void RenderLayersAOOperation::execute_pixel_sampled(float output[4],
void RenderLayersAOOperation::update_memory_buffer_partial(MemoryBuffer *output,
const rcti &area,
- Span<MemoryBuffer *> UNUSED(inputs))
+ Span<MemoryBuffer *> /*inputs*/)
{
BLI_assert(output->get_num_channels() == COM_DATA_TYPE_COLOR_CHANNELS);
BLI_assert(elementsize_ == COM_DATA_TYPE_COLOR_CHANNELS);
@@ -300,7 +300,7 @@ void RenderLayersAlphaProg::execute_pixel_sampled(float output[4],
void RenderLayersAlphaProg::update_memory_buffer_partial(MemoryBuffer *output,
const rcti &area,
- Span<MemoryBuffer *> UNUSED(inputs))
+ Span<MemoryBuffer *> /*inputs*/)
{
BLI_assert(output->get_num_channels() == COM_DATA_TYPE_VALUE_CHANNELS);
BLI_assert(elementsize_ == COM_DATA_TYPE_COLOR_CHANNELS);
@@ -335,7 +335,7 @@ void RenderLayersDepthProg::execute_pixel_sampled(float output[4],
void RenderLayersDepthProg::update_memory_buffer_partial(MemoryBuffer *output,
const rcti &area,
- Span<MemoryBuffer *> UNUSED(inputs))
+ Span<MemoryBuffer *> /*inputs*/)
{
BLI_assert(output->get_num_channels() == COM_DATA_TYPE_VALUE_CHANNELS);
BLI_assert(elementsize_ == COM_DATA_TYPE_VALUE_CHANNELS);
diff --git a/source/blender/compositor/operations/COM_SMAAOperation.cc b/source/blender/compositor/operations/COM_SMAAOperation.cc
index 7bbc600cda2..8f4ed844b9f 100644
--- a/source/blender/compositor/operations/COM_SMAAOperation.cc
+++ b/source/blender/compositor/operations/COM_SMAAOperation.cc
@@ -196,7 +196,7 @@ bool SMAAEdgeDetectionOperation::determine_depending_area_of_interest(
return NodeOperation::determine_depending_area_of_interest(&new_input, read_operation, output);
}
-void SMAAEdgeDetectionOperation::get_area_of_interest(const int UNUSED(input_idx),
+void SMAAEdgeDetectionOperation::get_area_of_interest(const int /*input_idx*/,
const rcti &output_area,
rcti &r_input_area)
{
@@ -505,14 +505,14 @@ void SMAABlendingWeightCalculationOperation::execute_pixel(float output[4],
}
void SMAABlendingWeightCalculationOperation::update_memory_buffer_started(
- MemoryBuffer *UNUSED(output), const rcti &UNUSED(out_area), Span<MemoryBuffer *> inputs)
+ MemoryBuffer * /*output*/, const rcti & /*out_area*/, Span<MemoryBuffer *> inputs)
{
const MemoryBuffer *image = inputs[0];
sample_image_fn_ = [=](int x, int y, float *out) { image->read_elem_checked(x, y, out); };
}
void SMAABlendingWeightCalculationOperation::update_memory_buffer_partial(
- MemoryBuffer *output, const rcti &out_area, Span<MemoryBuffer *> UNUSED(inputs))
+ MemoryBuffer *output, const rcti &out_area, Span<MemoryBuffer *> /*inputs*/)
{
for (BuffersIterator<float> it = output->iterate_with({}, out_area); !it.is_end(); ++it) {
const int x = it.x;
@@ -631,7 +631,7 @@ bool SMAABlendingWeightCalculationOperation::determine_depending_area_of_interes
return NodeOperation::determine_depending_area_of_interest(&new_input, read_operation, output);
}
-void SMAABlendingWeightCalculationOperation::get_area_of_interest(const int UNUSED(input_idx),
+void SMAABlendingWeightCalculationOperation::get_area_of_interest(const int /*input_idx*/,
const rcti &output_area,
rcti &r_input_area)
{
@@ -1123,7 +1123,7 @@ bool SMAANeighborhoodBlendingOperation::determine_depending_area_of_interest(
return NodeOperation::determine_depending_area_of_interest(&new_input, read_operation, output);
}
-void SMAANeighborhoodBlendingOperation::get_area_of_interest(const int UNUSED(input_idx),
+void SMAANeighborhoodBlendingOperation::get_area_of_interest(const int /*input_idx*/,
const rcti &output_area,
rcti &r_input_area)
{
diff --git a/source/blender/compositor/operations/COM_ScaleOperation.h b/source/blender/compositor/operations/COM_ScaleOperation.h
index 4cd50f3ead3..ba291342e96 100644
--- a/source/blender/compositor/operations/COM_ScaleOperation.h
+++ b/source/blender/compositor/operations/COM_ScaleOperation.h
@@ -112,12 +112,12 @@ class ScaleRelativeOperation : public ScaleOperation {
rcti *output) override;
void execute_pixel_sampled(float output[4], float x, float y, PixelSampler sampler) override;
- float get_relative_scale_x_factor(float UNUSED(width)) override
+ float get_relative_scale_x_factor(float /*width*/) override
{
return 1.0f;
}
- float get_relative_scale_y_factor(float UNUSED(height)) override
+ float get_relative_scale_y_factor(float /*height*/) override
{
return 1.0f;
}
diff --git a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cc b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cc
index e27ffcb7c9b..a62977c3280 100644
--- a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cc
+++ b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cc
@@ -384,7 +384,7 @@ void ScreenLensDistortionOperation::determine_canvas(const rcti &preferred_area,
}
void ScreenLensDistortionOperation::get_area_of_interest(const int input_idx,
- const rcti &UNUSED(output_area),
+ const rcti & /*output_area*/,
rcti &r_input_area)
{
if (input_idx != 0) {
diff --git a/source/blender/compositor/operations/COM_TonemapOperation.cc b/source/blender/compositor/operations/COM_TonemapOperation.cc
index ae5b60c4912..6f560eafc67 100644
--- a/source/blender/compositor/operations/COM_TonemapOperation.cc
+++ b/source/blender/compositor/operations/COM_TonemapOperation.cc
@@ -139,7 +139,7 @@ void TonemapOperation::deinitialize_tile_data(rcti * /*rect*/, void * /*data*/)
}
void TonemapOperation::get_area_of_interest(const int input_idx,
- const rcti &UNUSED(output_area),
+ const rcti & /*output_area*/,
rcti &r_input_area)
{
BLI_assert(input_idx == 0);
@@ -170,8 +170,8 @@ static Luminance calc_area_luminance(const MemoryBuffer *input, const rcti &area
return lum;
}
-void TonemapOperation::update_memory_buffer_started(MemoryBuffer *UNUSED(output),
- const rcti &UNUSED(area),
+void TonemapOperation::update_memory_buffer_started(MemoryBuffer * /*output*/,
+ const rcti & /*area*/,
Span<MemoryBuffer *> inputs)
{
if (cached_instance_ == nullptr) {
diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.cc b/source/blender/compositor/operations/COM_VectorBlurOperation.cc
index c71d88695a7..1330557c06f 100644
--- a/source/blender/compositor/operations/COM_VectorBlurOperation.cc
+++ b/source/blender/compositor/operations/COM_VectorBlurOperation.cc
@@ -103,8 +103,8 @@ bool VectorBlurOperation::determine_depending_area_of_interest(rcti * /*input*/,
return false;
}
-void VectorBlurOperation::get_area_of_interest(const int UNUSED(input_idx),
- const rcti &UNUSED(output_area),
+void VectorBlurOperation::get_area_of_interest(const int /*input_idx*/,
+ const rcti & /*output_area*/,
rcti &r_input_area)
{
r_input_area = this->get_canvas();
diff --git a/source/blender/compositor/operations/COM_ViewerOperation.cc b/source/blender/compositor/operations/COM_ViewerOperation.cc
index 1d0aead3a94..b4ff6878784 100644
--- a/source/blender/compositor/operations/COM_ViewerOperation.cc
+++ b/source/blender/compositor/operations/COM_ViewerOperation.cc
@@ -216,7 +216,7 @@ eCompositorPriority ViewerOperation::get_render_priority() const
return eCompositorPriority::Low;
}
-void ViewerOperation::update_memory_buffer_partial(MemoryBuffer *UNUSED(output),
+void ViewerOperation::update_memory_buffer_partial(MemoryBuffer * /*output*/,
const rcti &area,
Span<MemoryBuffer *> inputs)
{
diff --git a/source/blender/compositor/realtime_compositor/intern/utilities.cc b/source/blender/compositor/realtime_compositor/intern/utilities.cc
index 1a5823b8441..25472d6ed50 100644
--- a/source/blender/compositor/realtime_compositor/intern/utilities.cc
+++ b/source/blender/compositor/realtime_compositor/intern/utilities.cc
@@ -71,7 +71,7 @@ bool is_output_linked_to_node_conditioned(DOutputSocket output, FunctionRef<bool
{
bool condition_satisfied = false;
output.foreach_target_socket(
- [&](DInputSocket target, const TargetSocketPathInfo &UNUSED(path_info)) {
+ [&](DInputSocket target, const TargetSocketPathInfo & /*path_info*/) {
if (condition(target.node())) {
condition_satisfied = true;
return;
@@ -85,7 +85,7 @@ int number_of_inputs_linked_to_output_conditioned(DOutputSocket output,
{
int count = 0;
output.foreach_target_socket(
- [&](DInputSocket target, const TargetSocketPathInfo &UNUSED(path_info)) {
+ [&](DInputSocket target, const TargetSocketPathInfo & /*path_info*/) {
if (condition(target)) {
count++;
}
diff --git a/source/blender/compositor/tests/COM_BuffersIterator_test.cc b/source/blender/compositor/tests/COM_BuffersIterator_test.cc
index 03748760029..89febb38655 100644
--- a/source/blender/compositor/tests/COM_BuffersIterator_test.cc
+++ b/source/blender/compositor/tests/COM_BuffersIterator_test.cc
@@ -237,7 +237,7 @@ TEST_F(BuffersIteratorTest, OutputIteration)
{
set_inputs_enabled(false);
test_iteration(
- [](BuffersIterator<float> &it, const rcti &UNUSED(area)) {
+ [](BuffersIterator<float> &it, const rcti & /*area*/) {
EXPECT_EQ(it.get_num_inputs(), 0);
for (; !it.is_end(); ++it) {
const int dummy = it.y * BUFFER_WIDTH + it.x;
@@ -247,7 +247,7 @@ TEST_F(BuffersIteratorTest, OutputIteration)
it.out[3] = dummy + 4.0f;
}
},
- [](float *out, Span<const float *> UNUSED(ins), const int x, const int y) {
+ [](float *out, Span<const float *> /*ins*/, const int x, const int y) {
const int dummy = y * BUFFER_WIDTH + x;
EXPECT_NEAR(out[0], dummy + 1.0f, FLT_EPSILON);
EXPECT_NEAR(out[1], dummy + 2.0f, FLT_EPSILON);
@@ -260,7 +260,7 @@ TEST_F(BuffersIteratorTest, OutputAndInputsIteration)
{
set_inputs_enabled(true);
test_iteration(
- [](BuffersIterator<float> &it, const rcti &UNUSED(area)) {
+ [](BuffersIterator<float> &it, const rcti & /*area*/) {
EXPECT_EQ(it.get_num_inputs(), NUM_INPUTS);
for (; !it.is_end(); ++it) {
const float *in1 = it.in(0);
@@ -271,7 +271,7 @@ TEST_F(BuffersIteratorTest, OutputAndInputsIteration)
it.out[3] = in1[3] - in2[1];
}
},
- [](float *out, Span<const float *> ins, const int UNUSED(x), const int UNUSED(y)) {
+ [](float *out, Span<const float *> ins, const int /*x*/, const int /*y*/) {
const float *in1 = ins[0];
const float *in2 = ins[1];
EXPECT_NEAR(out[0], in1[0] + in2[0], FLT_EPSILON);