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-08-31 19:49:35 +0300
committerHans Goudey <h.goudey@me.com>2022-08-31 20:06:13 +0300
commit91d9f46aecacab60d747b757cf57ecdc1b18913a (patch)
tree85f0adae90cf5adde5bf6763c6c33de15c85f7c3 /source/blender/nodes
parentfae955fdb11e49d8c2fad29da6546038ae7386db (diff)
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
Diffstat (limited to 'source/blender/nodes')
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_alpha_over.cc2
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc4
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_bokehimage.cc4
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_boxmask.cc4
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_channel_matte.cc4
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc4
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_color_matte.cc4
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_color_spill.cc4
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_colorbalance.cc4
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc4
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_crop.cc4
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_curves.cc18
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_diff_matte.cc4
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_directionalblur.cc4
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_distance_matte.cc4
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc4
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_huecorrect.cc6
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_map_value.cc4
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_rgb.cc4
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_setalpha.cc4
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_translate.cc4
21 files changed, 49 insertions, 49 deletions
diff --git a/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc b/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc
index 64c59eb24e3..282d3365fa5 100644
--- a/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc
@@ -86,7 +86,7 @@ class AlphaOverShaderNode : public ShaderNode {
float get_premultiply_factor()
{
- return ((NodeTwoFloats *)bnode().storage)->x;
+ return ((const NodeTwoFloats *)bnode().storage)->x;
}
};
diff --git a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc
index 5aa810b61bb..571415e75d8 100644
--- a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc
@@ -103,9 +103,9 @@ class BilateralBlurOperation : public NodeOperation {
return get_node_bilateral_blur_data().sigma_color;
}
- NodeBilateralBlurData &get_node_bilateral_blur_data()
+ const NodeBilateralBlurData &get_node_bilateral_blur_data()
{
- return *static_cast<NodeBilateralBlurData *>(bnode().storage);
+ return *static_cast<const NodeBilateralBlurData *>(bnode().storage);
}
};
diff --git a/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc b/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc
index 13c3b793148..42dd17230b1 100644
--- a/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc
@@ -86,9 +86,9 @@ class BokehImageOperation : public NodeOperation {
return Domain(int2(512));
}
- NodeBokehImage &get_node_bokeh_image()
+ const NodeBokehImage &get_node_bokeh_image()
{
- return *static_cast<NodeBokehImage *>(bnode().storage);
+ return *static_cast<const NodeBokehImage *>(bnode().storage);
}
/* The exterior angle is the angle between each two consecutive vertices of the regular polygon
diff --git a/source/blender/nodes/composite/nodes/node_composite_boxmask.cc b/source/blender/nodes/composite/nodes/node_composite_boxmask.cc
index 9c7bb6432cb..2b27b382b03 100644
--- a/source/blender/nodes/composite/nodes/node_composite_boxmask.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_boxmask.cc
@@ -123,9 +123,9 @@ class BoxMaskOperation : public NodeOperation {
}
}
- NodeBoxMask &get_node_box_mask()
+ const NodeBoxMask &get_node_box_mask()
{
- return *static_cast<NodeBoxMask *>(bnode().storage);
+ return *static_cast<const NodeBoxMask *>(bnode().storage);
}
float2 get_location()
diff --git a/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc b/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc
index 018632f776c..a588a17d6c1 100644
--- a/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc
@@ -130,9 +130,9 @@ class ChannelMatteShaderNode : public ShaderNode {
return bnode().custom2 - 1;
}
- NodeChroma *get_node_chroma()
+ const NodeChroma *get_node_chroma()
{
- return static_cast<NodeChroma *>(bnode().storage);
+ return static_cast<const NodeChroma *>(bnode().storage);
}
/* Get the index of the channel used to compute the limit value. */
diff --git a/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc b/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc
index cb3648c5680..2ea83340c2b 100644
--- a/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc
@@ -86,9 +86,9 @@ class ChromaMatteShaderNode : public ShaderNode {
GPU_uniform(&falloff));
}
- NodeChroma *get_node_chroma()
+ const NodeChroma *get_node_chroma()
{
- return static_cast<NodeChroma *>(bnode().storage);
+ return static_cast<const NodeChroma *>(bnode().storage);
}
float get_acceptance()
diff --git a/source/blender/nodes/composite/nodes/node_composite_color_matte.cc b/source/blender/nodes/composite/nodes/node_composite_color_matte.cc
index 5e3aaf512e6..ec572c54fd7 100644
--- a/source/blender/nodes/composite/nodes/node_composite_color_matte.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_color_matte.cc
@@ -83,9 +83,9 @@ class ColorMatteShaderNode : public ShaderNode {
GPU_uniform(&value_epsilon));
}
- NodeChroma *get_node_chroma()
+ const NodeChroma *get_node_chroma()
{
- return static_cast<NodeChroma *>(bnode().storage);
+ return static_cast<const NodeChroma *>(bnode().storage);
}
float get_hue_epsilon()
diff --git a/source/blender/nodes/composite/nodes/node_composite_color_spill.cc b/source/blender/nodes/composite/nodes/node_composite_color_spill.cc
index 9744c01a256..1ddf0df8ea7 100644
--- a/source/blender/nodes/composite/nodes/node_composite_color_spill.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_color_spill.cc
@@ -131,9 +131,9 @@ class ColorSpillShaderNode : public ShaderNode {
return (CMPNodeColorSpillLimitAlgorithm)bnode().custom2;
}
- NodeColorspill *get_node_color_spill()
+ const NodeColorspill *get_node_color_spill()
{
- return static_cast<NodeColorspill *>(bnode().storage);
+ return static_cast<const NodeColorspill *>(bnode().storage);
}
void get_spill_scale(float spill_scale[3])
diff --git a/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc b/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc
index 95675169c76..e6e2a310eb4 100644
--- a/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc
@@ -191,9 +191,9 @@ class ColorBalanceShaderNode : public ShaderNode {
return (CMPNodeColorBalanceMethod)bnode().custom1;
}
- NodeColorBalance *get_node_color_balance()
+ const NodeColorBalance *get_node_color_balance()
{
- return static_cast<NodeColorBalance *>(bnode().storage);
+ return static_cast<const NodeColorBalance *>(bnode().storage);
}
};
diff --git a/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc b/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc
index 36e6672ce1c..f6bc3d1fdf2 100644
--- a/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc
@@ -334,9 +334,9 @@ class ColorCorrectionShaderNode : public ShaderNode {
}
}
- NodeColorCorrection *get_node_color_correction()
+ const NodeColorCorrection *get_node_color_correction()
{
- return static_cast<NodeColorCorrection *>(bnode().storage);
+ return static_cast<const NodeColorCorrection *>(bnode().storage);
}
};
diff --git a/source/blender/nodes/composite/nodes/node_composite_crop.cc b/source/blender/nodes/composite/nodes/node_composite_crop.cc
index d7331732fc7..466c842812c 100644
--- a/source/blender/nodes/composite/nodes/node_composite_crop.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_crop.cc
@@ -163,9 +163,9 @@ class CropOperation : public NodeOperation {
return bnode().custom2;
}
- NodeTwoXYs &get_node_two_xys()
+ const NodeTwoXYs &get_node_two_xys()
{
- return *static_cast<NodeTwoXYs *>(bnode().storage);
+ return *static_cast<const NodeTwoXYs *>(bnode().storage);
}
/* Returns true if the operation does nothing and the input can be passed through. */
diff --git a/source/blender/nodes/composite/nodes/node_composite_curves.cc b/source/blender/nodes/composite/nodes/node_composite_curves.cc
index c5d303c576a..bf45e219730 100644
--- a/source/blender/nodes/composite/nodes/node_composite_curves.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_curves.cc
@@ -47,15 +47,15 @@ class TimeCurveOperation : public NodeOperation {
Result &result = get_result("Fac");
result.allocate_single_value();
- CurveMapping *curve_mapping = get_curve_mapping();
+ CurveMapping *curve_mapping = const_cast<CurveMapping *>(get_curve_mapping());
BKE_curvemapping_init(curve_mapping);
const float time = BKE_curvemapping_evaluateF(curve_mapping, 0, compute_normalized_time());
result.set_float_value(clamp_f(time, 0.0f, 1.0f));
}
- CurveMapping *get_curve_mapping()
+ const CurveMapping *get_curve_mapping()
{
- return static_cast<CurveMapping *>(bnode().storage);
+ return static_cast<const CurveMapping *>(bnode().storage);
}
int get_start_time()
@@ -143,7 +143,7 @@ class VectorCurvesShaderNode : public ShaderNode {
GPUNodeStack *inputs = get_inputs_array();
GPUNodeStack *outputs = get_outputs_array();
- CurveMapping *curve_mapping = get_curve_mapping();
+ CurveMapping *curve_mapping = const_cast<CurveMapping *>(get_curve_mapping());
BKE_curvemapping_init(curve_mapping);
float *band_values;
@@ -173,9 +173,9 @@ class VectorCurvesShaderNode : public ShaderNode {
GPU_uniform(end_slopes));
}
- CurveMapping *get_curve_mapping()
+ const CurveMapping *get_curve_mapping()
{
- return static_cast<CurveMapping *>(bnode().storage);
+ return static_cast<const CurveMapping *>(bnode().storage);
}
};
@@ -239,7 +239,7 @@ class RGBCurvesShaderNode : public ShaderNode {
GPUNodeStack *inputs = get_inputs_array();
GPUNodeStack *outputs = get_outputs_array();
- CurveMapping *curve_mapping = get_curve_mapping();
+ CurveMapping *curve_mapping = const_cast<CurveMapping *>(get_curve_mapping());
BKE_curvemapping_init(curve_mapping);
float *band_values;
@@ -311,9 +311,9 @@ class RGBCurvesShaderNode : public ShaderNode {
GPU_uniform(end_slopes));
}
- CurveMapping *get_curve_mapping()
+ const CurveMapping *get_curve_mapping()
{
- return static_cast<CurveMapping *>(bnode().storage);
+ return static_cast<const CurveMapping *>(bnode().storage);
}
};
diff --git a/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc b/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc
index e129dcaa6ef..3c830f1deec 100644
--- a/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc
@@ -71,9 +71,9 @@ class DifferenceMatteShaderNode : public ShaderNode {
GPU_uniform(&falloff));
}
- NodeChroma *get_node_chroma()
+ const NodeChroma *get_node_chroma()
{
- return static_cast<NodeChroma *>(bnode().storage);
+ return static_cast<const NodeChroma *>(bnode().storage);
}
float get_tolerance()
diff --git a/source/blender/nodes/composite/nodes/node_composite_directionalblur.cc b/source/blender/nodes/composite/nodes/node_composite_directionalblur.cc
index 028dd6bfbf0..b662924acec 100644
--- a/source/blender/nodes/composite/nodes/node_composite_directionalblur.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_directionalblur.cc
@@ -181,9 +181,9 @@ class DirectionalBlurOperation : public NodeOperation {
return true;
}
- NodeDBlurData &get_node_directional_blur_data()
+ const NodeDBlurData &get_node_directional_blur_data()
{
- return *static_cast<NodeDBlurData *>(bnode().storage);
+ return *static_cast<const NodeDBlurData *>(bnode().storage);
}
};
diff --git a/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc b/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc
index 9d910b3f409..be73412e027 100644
--- a/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc
@@ -90,9 +90,9 @@ class DistanceMatteShaderNode : public ShaderNode {
GPU_uniform(&falloff));
}
- NodeChroma *get_node_chroma()
+ const NodeChroma *get_node_chroma()
{
- return static_cast<NodeChroma *>(bnode().storage);
+ return static_cast<const NodeChroma *>(bnode().storage);
}
CMPNodeDistanceMatteColorSpace get_color_space()
diff --git a/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc b/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc
index 54dfa00eadd..d9d8a888f24 100644
--- a/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc
@@ -121,9 +121,9 @@ class EllipseMaskOperation : public NodeOperation {
}
}
- NodeEllipseMask &get_node_ellipse_mask()
+ const NodeEllipseMask &get_node_ellipse_mask()
{
- return *static_cast<NodeEllipseMask *>(bnode().storage);
+ return *static_cast<const NodeEllipseMask *>(bnode().storage);
}
float2 get_location()
diff --git a/source/blender/nodes/composite/nodes/node_composite_huecorrect.cc b/source/blender/nodes/composite/nodes/node_composite_huecorrect.cc
index a84420231aa..6333860a19b 100644
--- a/source/blender/nodes/composite/nodes/node_composite_huecorrect.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_huecorrect.cc
@@ -59,7 +59,7 @@ class HueCorrectShaderNode : public ShaderNode {
GPUNodeStack *inputs = get_inputs_array();
GPUNodeStack *outputs = get_outputs_array();
- CurveMapping *curve_mapping = get_curve_mapping();
+ CurveMapping *curve_mapping = const_cast<CurveMapping *>(get_curve_mapping());
BKE_curvemapping_init(curve_mapping);
float *band_values;
@@ -84,9 +84,9 @@ class HueCorrectShaderNode : public ShaderNode {
GPU_uniform(range_dividers));
}
- CurveMapping *get_curve_mapping()
+ const CurveMapping *get_curve_mapping()
{
- return static_cast<CurveMapping *>(bnode().storage);
+ return static_cast<const CurveMapping *>(bnode().storage);
}
};
diff --git a/source/blender/nodes/composite/nodes/node_composite_map_value.cc b/source/blender/nodes/composite/nodes/node_composite_map_value.cc
index ec9b2d56636..2b0aebbede8 100644
--- a/source/blender/nodes/composite/nodes/node_composite_map_value.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_map_value.cc
@@ -87,9 +87,9 @@ class MapValueShaderNode : public ShaderNode {
GPU_uniform(texture_mapping->max));
}
- TexMapping *get_texture_mapping()
+ const TexMapping *get_texture_mapping()
{
- return static_cast<TexMapping *>(bnode().storage);
+ return static_cast<const TexMapping *>(bnode().storage);
}
bool get_use_min()
diff --git a/source/blender/nodes/composite/nodes/node_composite_rgb.cc b/source/blender/nodes/composite/nodes/node_composite_rgb.cc
index 6f3a00af7e3..f107961f301 100644
--- a/source/blender/nodes/composite/nodes/node_composite_rgb.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_rgb.cc
@@ -33,8 +33,8 @@ class RGBOperation : public NodeOperation {
Result &result = get_result("RGBA");
result.allocate_single_value();
- const bNodeSocket *socket = static_cast<bNodeSocket *>(bnode().outputs.first);
- float4 color = float4(static_cast<bNodeSocketValueRGBA *>(socket->default_value)->value);
+ const bNodeSocket *socket = static_cast<const bNodeSocket *>(bnode().outputs.first);
+ float4 color = float4(static_cast<const bNodeSocketValueRGBA *>(socket->default_value)->value);
result.set_color_value(color);
}
diff --git a/source/blender/nodes/composite/nodes/node_composite_setalpha.cc b/source/blender/nodes/composite/nodes/node_composite_setalpha.cc
index 9930125aa70..383b4bcd0ca 100644
--- a/source/blender/nodes/composite/nodes/node_composite_setalpha.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_setalpha.cc
@@ -62,9 +62,9 @@ class SetAlphaShaderNode : public ShaderNode {
GPU_stack_link(material, &bnode(), "node_composite_set_alpha_replace", inputs, outputs);
}
- NodeSetAlpha *get_node_set_alpha()
+ const NodeSetAlpha *get_node_set_alpha()
{
- return static_cast<NodeSetAlpha *>(bnode().storage);
+ return static_cast<const NodeSetAlpha *>(bnode().storage);
}
};
diff --git a/source/blender/nodes/composite/nodes/node_composite_translate.cc b/source/blender/nodes/composite/nodes/node_composite_translate.cc
index fbd53b8310f..dcb67b9be90 100644
--- a/source/blender/nodes/composite/nodes/node_composite_translate.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_translate.cc
@@ -76,9 +76,9 @@ class TranslateOperation : public NodeOperation {
result.get_realization_options().repeat_y = get_repeat_y();
}
- NodeTranslateData &get_node_translate()
+ const NodeTranslateData &get_node_translate()
{
- return *static_cast<NodeTranslateData *>(bnode().storage);
+ return *static_cast<const NodeTranslateData *>(bnode().storage);
}
bool get_use_relative()