[Bf-blender-cvs] [91d9f46aeca] master: Cleanup: Use const for node data in compositor
Hans Goudey
noreply at git.blender.org
Wed Aug 31 19:10:23 CEST 2022
Commit: 91d9f46aecacab60d747b757cf57ecdc1b18913a
Author: Hans Goudey
Date: Wed Aug 31 11:49:35 2022 -0500
Branches: master
https://developer.blender.org/rB91d9f46aecacab60d747b757cf57ecdc1b18913a
Cleanup: Use const for node data in compositor
Push the const usage a bit further for compositor nodes, so that they
are more explicit about not modifying original nodes from the editor.
Differential Revision: https://developer.blender.org/D15822
===================================================================
M source/blender/compositor/intern/COM_Node.h
M source/blender/compositor/nodes/COM_AlphaOverNode.cc
M source/blender/compositor/nodes/COM_AntiAliasingNode.cc
M source/blender/compositor/nodes/COM_BlurNode.cc
M source/blender/compositor/nodes/COM_BokehBlurNode.cc
M source/blender/compositor/nodes/COM_BokehImageNode.cc
M source/blender/compositor/nodes/COM_BoxMaskNode.cc
M source/blender/compositor/nodes/COM_BrightnessNode.cc
M source/blender/compositor/nodes/COM_ChannelMatteNode.cc
M source/blender/compositor/nodes/COM_ChromaMatteNode.cc
M source/blender/compositor/nodes/COM_ColorBalanceNode.cc
M source/blender/compositor/nodes/COM_ColorCorrectionNode.cc
M source/blender/compositor/nodes/COM_ColorCurveNode.cc
M source/blender/compositor/nodes/COM_ColorMatteNode.cc
M source/blender/compositor/nodes/COM_ColorRampNode.cc
M source/blender/compositor/nodes/COM_ColorSpillNode.cc
M source/blender/compositor/nodes/COM_CombineColorNode.cc
M source/blender/compositor/nodes/COM_CombineColorNodeLegacy.cc
M source/blender/compositor/nodes/COM_CompositorNode.cc
M source/blender/compositor/nodes/COM_ConvertAlphaNode.cc
M source/blender/compositor/nodes/COM_ConvertColorSpaceNode.cc
M source/blender/compositor/nodes/COM_CropNode.cc
M source/blender/compositor/nodes/COM_CryptomatteNode.cc
M source/blender/compositor/nodes/COM_DefocusNode.cc
M source/blender/compositor/nodes/COM_DenoiseNode.cc
M source/blender/compositor/nodes/COM_DespeckleNode.cc
M source/blender/compositor/nodes/COM_DifferenceMatteNode.cc
M source/blender/compositor/nodes/COM_DilateErodeNode.cc
M source/blender/compositor/nodes/COM_DirectionalBlurNode.cc
M source/blender/compositor/nodes/COM_DistanceMatteNode.cc
M source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cc
M source/blender/compositor/nodes/COM_GlareNode.cc
M source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cc
M source/blender/compositor/nodes/COM_IDMaskNode.cc
M source/blender/compositor/nodes/COM_ImageNode.cc
M source/blender/compositor/nodes/COM_InpaintNode.cc
M source/blender/compositor/nodes/COM_InvertNode.cc
M source/blender/compositor/nodes/COM_KeyingNode.cc
M source/blender/compositor/nodes/COM_KeyingScreenNode.cc
M source/blender/compositor/nodes/COM_LensDistortionNode.cc
M source/blender/compositor/nodes/COM_LuminanceMatteNode.cc
M source/blender/compositor/nodes/COM_MapUVNode.cc
M source/blender/compositor/nodes/COM_MapValueNode.cc
M source/blender/compositor/nodes/COM_MaskNode.cc
M source/blender/compositor/nodes/COM_MixNode.cc
M source/blender/compositor/nodes/COM_MovieClipNode.cc
M source/blender/compositor/nodes/COM_MovieDistortionNode.cc
M source/blender/compositor/nodes/COM_OutputFileNode.cc
M source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cc
M source/blender/compositor/nodes/COM_ScaleNode.cc
M source/blender/compositor/nodes/COM_SeparateColorNode.cc
M source/blender/compositor/nodes/COM_SeparateColorNodeLegacy.cc
M source/blender/compositor/nodes/COM_SplitViewerNode.cc
M source/blender/compositor/nodes/COM_Stabilize2dNode.cc
M source/blender/compositor/nodes/COM_SunBeamsNode.cc
M source/blender/compositor/nodes/COM_SwitchViewNode.cc
M source/blender/compositor/nodes/COM_TextureNode.cc
M source/blender/compositor/nodes/COM_TimeNode.cc
M source/blender/compositor/nodes/COM_TonemapNode.cc
M source/blender/compositor/nodes/COM_TrackPositionNode.cc
M source/blender/compositor/nodes/COM_TranslateNode.cc
M source/blender/compositor/nodes/COM_VectorBlurNode.cc
M source/blender/compositor/nodes/COM_VectorCurveNode.cc
M source/blender/compositor/nodes/COM_ViewerNode.cc
M source/blender/compositor/operations/COM_BokehImageOperation.h
M source/blender/compositor/operations/COM_BoxMaskOperation.h
M source/blender/compositor/operations/COM_CurveBaseOperation.cc
M source/blender/compositor/operations/COM_CurveBaseOperation.h
M source/blender/compositor/operations/COM_DenoiseOperation.cc
M source/blender/compositor/operations/COM_DenoiseOperation.h
M source/blender/compositor/operations/COM_DirectionalBlurOperation.h
M source/blender/compositor/operations/COM_DistanceRGBMatteOperation.h
M source/blender/compositor/operations/COM_GlareBaseOperation.h
M source/blender/compositor/operations/COM_GlareFogGlowOperation.cc
M source/blender/compositor/operations/COM_GlareFogGlowOperation.h
M source/blender/compositor/operations/COM_GlareGhostOperation.cc
M source/blender/compositor/operations/COM_GlareGhostOperation.h
M source/blender/compositor/operations/COM_GlareSimpleStarOperation.cc
M source/blender/compositor/operations/COM_GlareSimpleStarOperation.h
M source/blender/compositor/operations/COM_GlareStreaksOperation.cc
M source/blender/compositor/operations/COM_GlareStreaksOperation.h
M source/blender/compositor/operations/COM_GlareThresholdOperation.h
M source/blender/compositor/operations/COM_MapValueOperation.cc
M source/blender/compositor/operations/COM_MapValueOperation.h
M source/blender/compositor/operations/COM_TonemapOperation.cc
M source/blender/compositor/operations/COM_TonemapOperation.h
M source/blender/compositor/operations/COM_VectorBlurOperation.h
M source/blender/compositor/realtime_compositor/COM_shader_node.hh
M source/blender/compositor/realtime_compositor/intern/shader_node.cc
M source/blender/gpu/GPU_material.h
M source/blender/gpu/intern/gpu_node_graph.c
M source/blender/nodes/composite/nodes/node_composite_alpha_over.cc
M source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc
M source/blender/nodes/composite/nodes/node_composite_bokehimage.cc
M source/blender/nodes/composite/nodes/node_composite_boxmask.cc
M source/blender/nodes/composite/nodes/node_composite_channel_matte.cc
M source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc
M source/blender/nodes/composite/nodes/node_composite_color_matte.cc
M source/blender/nodes/composite/nodes/node_composite_color_spill.cc
M source/blender/nodes/composite/nodes/node_composite_colorbalance.cc
M source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc
M source/blender/nodes/composite/nodes/node_composite_crop.cc
M source/blender/nodes/composite/nodes/node_composite_curves.cc
M source/blender/nodes/composite/nodes/node_composite_diff_matte.cc
M source/blender/nodes/composite/nodes/node_composite_directionalblur.cc
M source/blender/nodes/composite/nodes/node_composite_distance_matte.cc
M source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc
M source/blender/nodes/composite/nodes/node_composite_huecorrect.cc
M source/blender/nodes/composite/nodes/node_composite_map_value.cc
M source/blender/nodes/composite/nodes/node_composite_rgb.cc
M source/blender/nodes/composite/nodes/node_composite_setalpha.cc
M source/blender/nodes/composite/nodes/node_composite_translate.cc
===================================================================
diff --git a/source/blender/compositor/intern/COM_Node.h b/source/blender/compositor/intern/COM_Node.h
index ae910c28342..364f9439366 100644
--- a/source/blender/compositor/intern/COM_Node.h
+++ b/source/blender/compositor/intern/COM_Node.h
@@ -31,7 +31,7 @@ class Node {
/**
* \brief stores the reference to the SDNA bNode struct
*/
- bNode *editor_node_;
+ const bNode *editor_node_;
/**
* \brief Is this node part of the active group
@@ -61,7 +61,7 @@ class Node {
/**
* \brief get the reference to the SDNA bNode struct
*/
- bNode *get_bnode() const
+ const bNode *get_bnode() const
{
return editor_node_;
}
diff --git a/source/blender/compositor/nodes/COM_AlphaOverNode.cc b/source/blender/compositor/nodes/COM_AlphaOverNode.cc
index 5b0f7a1d0e6..8f9f6f07395 100644
--- a/source/blender/compositor/nodes/COM_AlphaOverNode.cc
+++ b/source/blender/compositor/nodes/COM_AlphaOverNode.cc
@@ -14,10 +14,10 @@ void AlphaOverNode::convert_to_operations(NodeConverter &converter,
{
NodeInput *color1Socket = this->get_input_socket(1);
NodeInput *color2Socket = this->get_input_socket(2);
- bNode *editor_node = this->get_bnode();
+ const bNode *editor_node = this->get_bnode();
MixBaseOperation *convert_prog;
- NodeTwoFloats *ntf = (NodeTwoFloats *)editor_node->storage;
+ const NodeTwoFloats *ntf = (const NodeTwoFloats *)editor_node->storage;
if (ntf->x != 0.0f) {
AlphaOverMixedOperation *mix_operation = new AlphaOverMixedOperation();
mix_operation->setX(ntf->x);
diff --git a/source/blender/compositor/nodes/COM_AntiAliasingNode.cc b/source/blender/compositor/nodes/COM_AntiAliasingNode.cc
index e201720c53b..eb71b70d0bb 100644
--- a/source/blender/compositor/nodes/COM_AntiAliasingNode.cc
+++ b/source/blender/compositor/nodes/COM_AntiAliasingNode.cc
@@ -9,8 +9,8 @@ namespace blender::compositor {
void AntiAliasingNode::convert_to_operations(NodeConverter &converter,
const CompositorContext & /*context*/) const
{
- bNode *node = this->get_bnode();
- NodeAntiAliasingData *data = (NodeAntiAliasingData *)node->storage;
+ const bNode *node = this->get_bnode();
+ const NodeAntiAliasingData *data = (const NodeAntiAliasingData *)node->storage;
/* Edge Detection (First Pass) */
SMAAEdgeDetectionOperation *operation1 = nullptr;
diff --git a/source/blender/compositor/nodes/COM_BlurNode.cc b/source/blender/compositor/nodes/COM_BlurNode.cc
index a8148d7abd7..9377cfa783c 100644
--- a/source/blender/compositor/nodes/COM_BlurNode.cc
+++ b/source/blender/compositor/nodes/COM_BlurNode.cc
@@ -22,8 +22,8 @@ BlurNode::BlurNode(bNode *editor_node) : Node(editor_node)
void BlurNode::convert_to_operations(NodeConverter &converter,
const CompositorContext &context) const
{
- bNode *editor_node = this->get_bnode();
- NodeBlurData *data = (NodeBlurData *)editor_node->storage;
+ const bNode *editor_node = this->get_bnode();
+ const NodeBlurData *data = (const NodeBlurData *)editor_node->storage;
NodeInput *input_size_socket = this->get_input_socket(1);
bool connected_size_socket = input_size_socket->is_linked();
diff --git a/source/blender/compositor/nodes/COM_BokehBlurNode.cc b/source/blender/compositor/nodes/COM_BokehBlurNode.cc
index 31258ddb56a..ebdc82b0d19 100644
--- a/source/blender/compositor/nodes/COM_BokehBlurNode.cc
+++ b/source/blender/compositor/nodes/COM_BokehBlurNode.cc
@@ -15,7 +15,7 @@ BokehBlurNode::BokehBlurNode(bNode *editor_node) : Node(editor_node)
void BokehBlurNode::convert_to_operations(NodeConverter &converter,
const CompositorContext &context) const
{
- bNode *b_node = this->get_bnode();
+ const bNode *b_node = this->get_bnode();
NodeInput *input_size_socket = this->get_input_socket(2);
diff --git a/source/blender/compositor/nodes/COM_BokehImageNode.cc b/source/blender/compositor/nodes/COM_BokehImageNode.cc
index 6bc56aa5184..f25ac47fef9 100644
--- a/source/blender/compositor/nodes/COM_BokehImageNode.cc
+++ b/source/blender/compositor/nodes/COM_BokehImageNode.cc
@@ -15,7 +15,7 @@ void BokehImageNode::convert_to_operations(NodeConverter &converter,
const CompositorContext & /*context*/) const
{
BokehImageOperation *operation = new BokehImageOperation();
- operation->set_data((NodeBokehImage *)this->get_bnode()->storage);
+ operation->set_data((const NodeBokehImage *)this->get_bnode()->storage);
converter.add_operation(operation);
converter.map_output_socket(get_output_socket(0), operation->get_output_socket(0));
diff --git a/source/blender/compositor/nodes/COM_BoxMaskNode.cc b/source/blender/compositor/nodes/COM_BoxMaskNode.cc
index 41717804dba..c1a1b72d063 100644
--- a/source/blender/compositor/nodes/COM_BoxMaskNode.cc
+++ b/source/blender/compositor/nodes/COM_BoxMaskNode.cc
@@ -22,7 +22,7 @@ void BoxMaskNode::convert_to_operations(NodeConverter &converter,
BoxMaskOperation *operation;
operation = new BoxMaskOperation();
- operation->set_data((NodeBoxMask *)this->get_bnode()->storage);
+ operation->set_data((const NodeBoxMask *)this->get_bnode()->storage);
operation->set_mask_type(this->get_bnode()->custom1);
converter.add_operation(operation);
diff --git a/source/blender/compositor/nodes/COM_BrightnessNode.cc b/source/blender/compositor/nodes/COM_BrightnessNode.cc
index 88efd541fe9..a7877ca9378 100644
--- a/source/blender/compositor/nodes/COM_BrightnessNode.cc
+++ b/source/blender/compositor/nodes/COM_BrightnessNode.cc
@@ -14,7 +14,7 @@ BrightnessNode::BrightnessNode(bNode *editor_node) : Node(editor_node)
void BrightnessNode::convert_to_operations(NodeConverter &converter,
const CompositorContext & /*context*/) const
{
- bNode *bnode = this->get_bnode();
+ const bNode *bnode = this->get_bnode();
BrightnessOperation *operation = new BrightnessOperation();
operation->set_use_premultiply((bnode->custom1 & 1) != 0);
converter.add_operation(operation);
diff --git a/source/blender/compositor/nodes/COM_ChannelMatteNode.cc b/source/blender/compositor/nodes/COM_ChannelMatteNode.cc
index 7592b5120e6..6a0a28cd171 100644
--- a/source/blender/compositor/nodes/COM_ChannelMatteNode.cc
+++ b/source/blender/compositor/nodes/COM_ChannelMatteNode.cc
@@ -16,7 +16,7 @@ ChannelMatteNode::ChannelMatteNode(bNode *editor_node) : Node(editor_node)
void ChannelMatteNode::convert_to_operations(NodeConverter &converter,
const CompositorContext & /*context*/) const
{
- bNode *node = this->get_bnode();
+ const bNode *node = this->get_bnode();
NodeInput *input_socket_image = this->get_input_socket(0);
NodeOutput *output_socket_image = this->get_output_socket(0);
diff --git a/source/blender/compositor/nodes/COM_ChromaMatteNode.cc b/source/blender/compositor/nodes/COM_ChromaMatteNode.cc
index cbc5a06ce11..35bf6210da5 100644
--- a/source/blender/compositor/nodes/COM_ChromaMatteNode.cc
+++ b/source/blender/compositor/nodes/COM_ChromaMatteNode.cc
@@ -16,7 +16,7 @@ ChromaMatteNode::ChromaMatteNode(bNode *editor_node) : Node(editor_node)
void ChromaMatteNode::convert_to_operations(NodeConverter &converter,
const CompositorContext & /*context*/) const
{
- bNode *editorsnode = get_bnode();
+ const bNode *editorsnode = get_bnode();
NodeInput *input_socket_image = this->get_input_socket(0);
NodeInput *input_socket_key = this->get_input_socket(1);
diff --git a/source/blender/compositor/nodes/COM_ColorBalanceNode.cc b/source/blender/compositor/nodes/COM_ColorBalanceNode.cc
index cb009ecc634..f3f5aa4e49b 100644
--- a/source/blender/compositor/nodes/COM_ColorBalanceNode.cc
+++ b/source/blender/compositor/nodes/COM_ColorBalanceNode.cc
@@ -15,7 +15,7 @@ ColorBalanceNode::ColorBalanceNode(bNode *editor_node) : Node(editor_node)
void ColorBalanceNode::convert_to_operations(NodeConverter &converter,
const CompositorContext & /*context*/) const
{
- bNode *node = this->get_bnode();
+ const bNode *node = this->get_bnode();
NodeColorBalance *n = (NodeColorBalance *)node->storage;
NodeInput *input_socket = this->get_input_socket(0);
diff --git a/source/blender/compositor/nodes/COM_ColorCorrectionNode.cc b/source/blender/compositor/nodes/COM_ColorCorrectionNode.cc
index 2497f1d57bc..3e021296fee 100644
--- a/source/blender/compositor/nodes/COM_ColorCorrectionNode.cc
+++ b/source/blender/compositor/nodes/COM_ColorCorrectionNode.cc
@@ -14,7 +14,7 @@ ColorCorrectionNode::ColorCorrectionNode(bNode *editor_node) : Node(editor_node)
void ColorCorrectionNode::convert_to_operations(NodeConverter &converter,
const CompositorContext & /*context*/) const
{
- bNode *editor_node = get_bnode();
+ const bNode *editor_node = get_bnode();
ColorCorrectionOperation *operation = new ColorCorrectionOperation();
operation->set_data((NodeColorCorrection *)editor_node->storage);
diff --git a/source/blender/compositor/nodes/COM_ColorCurveNode.cc b/source/blender/compositor/nodes/COM_ColorCurveNode.cc
index ba81d375846..5275bfcab84 100644
--- a/source/blender/compositor/nodes/COM_ColorCurveNode.cc
+++ b/source/blender/compositor/nodes/COM_ColorCurveNode.cc
@@ -16,7 +16,7 @@ void ColorCurveNode::convert_to_operations(NodeConverter &converter,
{
if (this->get_input_socket(2)->is_linked() || this->get_input_socket(3)->is_linked()) {
ColorCurveOperation *operation = new ColorCurveOperation();
- operation->set_curve_mapping((CurveMapping *)this->get_bnode()->storage);
+ operation->set_curve_mapping((const CurveMapping *)this->get_bnode()->storage);
converter.add_operation(operation);
converter.map_input_socket(get_input_socket(0), operation->get_input_socket(0));
@@ -33,7 +33,7 @@ void ColorCurveNode::convert_to_operations(NodeConverter &converter,
operation->set_black_level(col);
this->get_input_socket(3)->get_editor_value_color(col);
operation->set_white_level(col);
- operation->set_curve_mapping((CurveMapping *)th
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list