[Bf-blender-cvs] [12a5a605572] temp-compositor-cleanups: Cleanup: Use `_` suffix for non-public members in Compositor
Manuel Castilla
noreply at git.blender.org
Fri Oct 8 01:35:49 CEST 2021
Commit: 12a5a605572d742335a4978966444d393792cd28
Author: Manuel Castilla
Date: Thu Oct 7 21:36:35 2021 +0200
Branches: temp-compositor-cleanups
https://developer.blender.org/rB12a5a605572d742335a4978966444d393792cd28
Cleanup: Use `_` suffix for non-public members in Compositor
To follow the style guide.
===================================================================
M source/blender/compositor/intern/COM_CPUDevice.cc
M source/blender/compositor/intern/COM_CPUDevice.h
M source/blender/compositor/intern/COM_CompositorContext.cc
M source/blender/compositor/intern/COM_CompositorContext.h
M source/blender/compositor/intern/COM_Debug.cc
M source/blender/compositor/intern/COM_Debug.h
M source/blender/compositor/intern/COM_ExecutionGroup.cc
M source/blender/compositor/intern/COM_ExecutionGroup.h
M source/blender/compositor/intern/COM_ExecutionSystem.cc
M source/blender/compositor/intern/COM_ExecutionSystem.h
M source/blender/compositor/intern/COM_MemoryBuffer.cc
M source/blender/compositor/intern/COM_MemoryBuffer.h
M source/blender/compositor/intern/COM_MemoryProxy.cc
M source/blender/compositor/intern/COM_MemoryProxy.h
M source/blender/compositor/intern/COM_Node.cc
M source/blender/compositor/intern/COM_Node.h
M source/blender/compositor/intern/COM_NodeConverter.cc
M source/blender/compositor/intern/COM_NodeConverter.h
M source/blender/compositor/intern/COM_NodeGraph.cc
M source/blender/compositor/intern/COM_NodeGraph.h
M source/blender/compositor/intern/COM_NodeOperation.cc
M source/blender/compositor/intern/COM_NodeOperation.h
M source/blender/compositor/intern/COM_NodeOperationBuilder.cc
M source/blender/compositor/intern/COM_NodeOperationBuilder.h
M source/blender/compositor/intern/COM_OpenCLDevice.cc
M source/blender/compositor/intern/COM_OpenCLDevice.h
M source/blender/compositor/intern/COM_SingleThreadedOperation.cc
M source/blender/compositor/intern/COM_SingleThreadedOperation.h
M source/blender/compositor/nodes/COM_DilateErodeNode.cc
M source/blender/compositor/nodes/COM_DilateErodeNode.h
M source/blender/compositor/nodes/COM_SocketProxyNode.cc
M source/blender/compositor/nodes/COM_SocketProxyNode.h
M source/blender/compositor/operations/COM_AlphaOverKeyOperation.cc
M source/blender/compositor/operations/COM_AlphaOverMixedOperation.cc
M source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
M source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cc
M source/blender/compositor/operations/COM_AntiAliasOperation.cc
M source/blender/compositor/operations/COM_AntiAliasOperation.h
M source/blender/compositor/operations/COM_BilateralBlurOperation.cc
M source/blender/compositor/operations/COM_BilateralBlurOperation.h
M source/blender/compositor/operations/COM_BlurBaseOperation.cc
M source/blender/compositor/operations/COM_BlurBaseOperation.h
M source/blender/compositor/operations/COM_BokehBlurOperation.cc
M source/blender/compositor/operations/COM_BokehBlurOperation.h
M source/blender/compositor/operations/COM_BokehImageOperation.cc
M source/blender/compositor/operations/COM_BokehImageOperation.h
M source/blender/compositor/operations/COM_BoxMaskOperation.cc
M source/blender/compositor/operations/COM_BoxMaskOperation.h
M source/blender/compositor/operations/COM_BrightnessOperation.cc
M source/blender/compositor/operations/COM_BrightnessOperation.h
M source/blender/compositor/operations/COM_CalculateMeanOperation.cc
M source/blender/compositor/operations/COM_CalculateMeanOperation.h
M source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cc
M source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h
M source/blender/compositor/operations/COM_ChangeHSVOperation.cc
M source/blender/compositor/operations/COM_ChangeHSVOperation.h
M source/blender/compositor/operations/COM_ChannelMatteOperation.cc
M source/blender/compositor/operations/COM_ChannelMatteOperation.h
M source/blender/compositor/operations/COM_ChromaMatteOperation.cc
M source/blender/compositor/operations/COM_ChromaMatteOperation.h
M source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cc
M source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h
M source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cc
M source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h
M source/blender/compositor/operations/COM_ColorCorrectionOperation.cc
M source/blender/compositor/operations/COM_ColorCorrectionOperation.h
M source/blender/compositor/operations/COM_ColorCurveOperation.cc
M source/blender/compositor/operations/COM_ColorCurveOperation.h
M source/blender/compositor/operations/COM_ColorExposureOperation.cc
M source/blender/compositor/operations/COM_ColorExposureOperation.h
M source/blender/compositor/operations/COM_ColorMatteOperation.cc
M source/blender/compositor/operations/COM_ColorMatteOperation.h
M source/blender/compositor/operations/COM_ColorRampOperation.cc
M source/blender/compositor/operations/COM_ColorRampOperation.h
M source/blender/compositor/operations/COM_ColorSpillOperation.cc
M source/blender/compositor/operations/COM_ColorSpillOperation.h
M source/blender/compositor/operations/COM_CompositorOperation.cc
M source/blender/compositor/operations/COM_CompositorOperation.h
M source/blender/compositor/operations/COM_ConvertColorProfileOperation.cc
M source/blender/compositor/operations/COM_ConvertColorProfileOperation.h
M source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cc
M source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
M source/blender/compositor/operations/COM_ConvertOperation.cc
M source/blender/compositor/operations/COM_ConvertOperation.h
M source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cc
M source/blender/compositor/operations/COM_ConvolutionFilterOperation.cc
M source/blender/compositor/operations/COM_ConvolutionFilterOperation.h
M source/blender/compositor/operations/COM_CropOperation.cc
M source/blender/compositor/operations/COM_CropOperation.h
M source/blender/compositor/operations/COM_CryptomatteOperation.cc
M source/blender/compositor/operations/COM_CryptomatteOperation.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_DespeckleOperation.cc
M source/blender/compositor/operations/COM_DespeckleOperation.h
M source/blender/compositor/operations/COM_DifferenceMatteOperation.cc
M source/blender/compositor/operations/COM_DifferenceMatteOperation.h
M source/blender/compositor/operations/COM_DilateErodeOperation.cc
M source/blender/compositor/operations/COM_DilateErodeOperation.h
M source/blender/compositor/operations/COM_DirectionalBlurOperation.cc
M source/blender/compositor/operations/COM_DirectionalBlurOperation.h
M source/blender/compositor/operations/COM_DisplaceOperation.cc
M source/blender/compositor/operations/COM_DisplaceOperation.h
M source/blender/compositor/operations/COM_DisplaceSimpleOperation.cc
M source/blender/compositor/operations/COM_DisplaceSimpleOperation.h
M source/blender/compositor/operations/COM_DistanceRGBMatteOperation.cc
M source/blender/compositor/operations/COM_DistanceRGBMatteOperation.h
M source/blender/compositor/operations/COM_DotproductOperation.cc
M source/blender/compositor/operations/COM_DotproductOperation.h
M source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cc
M source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h
M source/blender/compositor/operations/COM_EllipseMaskOperation.cc
M source/blender/compositor/operations/COM_EllipseMaskOperation.h
M source/blender/compositor/operations/COM_FastGaussianBlurOperation.cc
M source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
M source/blender/compositor/operations/COM_FlipOperation.cc
M source/blender/compositor/operations/COM_FlipOperation.h
M source/blender/compositor/operations/COM_GammaCorrectOperation.cc
M source/blender/compositor/operations/COM_GammaCorrectOperation.h
M source/blender/compositor/operations/COM_GammaOperation.cc
M source/blender/compositor/operations/COM_GammaOperation.h
M source/blender/compositor/operations/COM_GaussianAlphaBlurBaseOperation.cc
M source/blender/compositor/operations/COM_GaussianAlphaBlurBaseOperation.h
M source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cc
M source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cc
M source/blender/compositor/operations/COM_GaussianBlurBaseOperation.cc
M source/blender/compositor/operations/COM_GaussianBlurBaseOperation.h
M source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cc
M source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
M source/blender/compositor/operations/COM_GaussianXBlurOperation.cc
M source/blender/compositor/operations/COM_GaussianXBlurOperation.h
M source/blender/compositor/operations/COM_GaussianYBlurOperation.cc
M source/blender/compositor/operations/COM_GaussianYBlurOperation.h
M source/blender/compositor/operations/COM_GlareBaseOperation.cc
M source/blender/compositor/operations/COM_GlareBaseOperation.h
M source/blender/compositor/operations/COM_GlareThresholdOperation.cc
M source/blender/compositor/operations/COM_GlareThresholdOperation.h
M source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cc
M source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h
M source/blender/compositor/operations/COM_IDMaskOperation.cc
M source/blender/compositor/operations/COM_IDMaskOperation.h
M source/blender/compositor/operations/COM_ImageOperation.cc
M source/blender/compositor/operations/COM_ImageOperation.h
M source/blender/compositor/operations/COM_InpaintOperation.cc
M source/blender/compositor/operations/COM_InpaintOperation.h
M source/blender/compositor/operations/COM_InvertOperation.cc
M source/blender/compositor/operations/COM_InvertOperation.h
M source/blender/compositor/operations/COM_KeyingBlurOperation.cc
M source/blender/compositor/operations/COM_KeyingBlurOperation.h
M source/blender/compositor/operations/COM_KeyingClipOperation.cc
M source/blender/compositor/operations/COM_KeyingClipOperation.h
M source/blender/compositor/operations/COM_KeyingDespillOperation.cc
M source/blender/compositor/operations/COM_KeyingDespillOperation.h
M source/blender/compositor/operations/COM_KeyingOperation.cc
M source/blender/compositor/operations/COM_KeyingOperation.h
M source/blender/compositor/operations/COM_KeyingScreenOperation.cc
M source/blender/compositor/operations/COM_KeyingScreenOperation.h
M source/blender/compositor/operations/COM_LuminanceMatteOperation.cc
M source/blender/compositor/operations/COM_LuminanceMatteOperation.h
M source/blender/compositor/operations/COM_MapRangeOperation.cc
M source/blender/compositor/operations/COM_MapRangeOperation.h
M source/blender/compositor/operations/COM_MapUVOperation.cc
M source/blender/compositor/operations/COM_MapUVOperation.h
M source/blender/compositor/operations/COM_MapValueOperation.cc
M source/blender/compositor/operations/COM_MapValueOperation.h
M source/blender/compositor/operations/COM_MaskOperation.cc
M source/blender/compositor/operations/COM_MaskOperation.h
M source/blender/compositor/operations/COM_MathBaseOperation.cc
M source/blender/compositor/operations/COM_MathBaseOperation.h
M source/blender/compositor/operations/COM_MixOperation.cc
M source/blender/compositor/operations/COM_MixOperation.h
M source/blender/compositor/operations/COM_MovieClipAttributeOperation.cc
M source/blender/compositor/operations/COM_MovieClipAttributeOperation.h
M source/blender/compositor/operations/COM_MovieClipOperation.cc
M source/blender/compositor/operations/COM_MovieClipOperation.h
M source/blender/compositor/operations/COM_MovieDistortionOperation.cc
M source/blender/compositor/operations/COM_MovieDistortionOperation.h
M source/blender/compositor/operations/COM_MultilayerImageOperation.cc
M source/blender/compositor/operations/COM_MultilayerImageOperation.h
M source/blender/compositor/operations/COM_NormalizeOperation.cc
M source/blender/compositor/operations/COM_NormalizeOperation.h
M source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cc
M source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h
M source/blender/compositor/operations/COM_OutputFileOperation.cc
M source/blender/compositor/operations/COM_OutputFileOperation.h
M source/blender/compositor/operations/COM_PixelateOperation.cc
M source/blender/compositor/operations/COM_PixelateOperation.h
M source/blender/compositor/operations/COM_PlaneCornerPinOperation.cc
M source/blender/compositor/operations/COM_PlaneCornerPinOperation.h
M source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cc
M source/blender/compositor/operations/COM_PlaneDistortCommonOperation.h
M source/blender/compositor/operations/COM_PlaneTrackOperation.cc
M source/blender/compositor/operations/COM_PlaneTrackOperation.h
M source/blender/compositor/operations/COM_PosterizeOperation.cc
M source/blender/compositor/operations/COM_PosterizeOperation.h
M source/blender/compositor/operations/COM_PreviewOperation.cc
M source/blender/compositor/operations/COM_PreviewOperation.h
M source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cc
M source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h
M source/blender/compositor/operations/COM_QualityStepHelper.cc
M source/blender/compositor/operations/COM_QualityStepHelper.h
M source/blender/compositor/operations/COM_ReadBufferOperation.cc
M source/blender/compositor/operations/COM_ReadBufferOperation.h
M source/blender/compositor/operations/COM_RenderLayersProg.cc
M source/blender/compositor/operations/COM_RenderLayersProg.h
M source/blender/compositor/operations/COM_RotateOperation.cc
M source/blender/compositor/operations/COM_RotateOperation.h
M source/blender/compositor/operations/COM_SMAAOperation.cc
M source/blender/compositor/operations/COM_SMAAOperation.h
M source/blender/compositor/operations/COM_ScaleOperation.cc
M source/blender/compositor/operations/COM_ScaleOperation.h
M source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cc
M source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h
M source/blender/compositor/operations/COM_SetAlphaMultiplyOperation.cc
M source/blender/compositor/operations/COM_SetAlphaMultiplyOperation.h
M source/blender/compositor/operations/COM_SetAlphaReplaceOperation.cc
M source/blender/compositor/operations/COM_SetAlphaReplaceOperation.h
M source/blender/compositor/operations/COM_SetColorOperation.cc
M source/blender/compositor/operations/COM_SetColorOperation.h
M source/blender/compositor/operations/COM_SetSamplerOperation.cc
M source/blender/compositor/operations/COM_SetSamplerOperation.h
M source/blender/compositor/operations/COM_SetValueOperation.cc
M source/blender/compositor/operations/COM_SetValueOperation.h
M source/blender/compositor/operations/COM_SplitOperation.cc
M source/blender/compositor/operations/COM_SplitOperation.h
M source/blender/compositor/operations/COM_SunBeamsOperation.cc
M source/blender/compositor/operations/COM_SunBeamsOperation.h
M source/blender/compositor/operations/COM_TextureOperation.cc
M source/blender/compositor/operations/COM_TextureOperation.h
M source/blender/compositor/operations/COM_TonemapOperation.cc
M source/blender/compositor/operations/COM_TonemapOperation.h
M source/blender/compositor/operations/COM_TrackPositionOperation.cc
M source/blender/compositor/operations/COM_TrackPositionOperation.h
M source/blender/compositor/operations/COM_TranslateOperation.cc
M source/blender/compositor/operations/COM_TranslateOperation.h
M source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cc
M source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
M source/blender/compositor/operations/COM_VectorBlurOperation.cc
M source/blender/compositor/operations/COM_VectorBlurOperation.h
M source/blender/compositor/operations/COM_VectorCurveOperation.cc
M source/blender/compositor/operations/COM_VectorCurveOperation.h
M source/blender/compositor/operations/COM_ViewerOperation.cc
M source/blender/compositor/operations/COM_ViewerOperation.h
M source/blender/compositor/operations/COM_WrapOperation.cc
M source/blender/compositor/operations/COM_WrapOperation.h
M source/blender/compositor/operations/COM_WriteBufferOperation.cc
M source/blender/compositor/operations/COM_WriteBufferOperation.h
M source/blender/compositor/operations/COM_ZCombineOperation.cc
M source/blender/compositor/operations/COM_ZCombineOperation.h
===================================================================
diff --git a/source/blender/compositor/intern/COM_CPUDevice.cc b/source/blender/compositor/intern/COM_CPUDevice.cc
index dbf813a61b4..89aea47f4a6 100644
--- a/source/blender/compositor/intern/COM_CPUDevice.cc
+++ b/source/blender/compositor/intern/COM_CPUDevice.cc
@@ -23,7 +23,7 @@
namespace blender::compositor {
-CPUDevice::CPUDevice(int thread_id) : m_thread_id(thread_id)
+CPUDevice::CPUDevice(int thread_id) : thread_id_(thread_id)
{
}
diff --git a/source/blender/compositor/intern/COM_CPUDevice.h b/source/blender/compositor/intern/COM_CPUDevice.h
index 99629890b30..b5d1fd1fff1 100644
--- a/source/blender/compositor/intern/COM_CPUDevice.h
+++ b/source/blender/compositor/intern/COM_CPUDevice.h
@@ -39,11 +39,11 @@ class CPUDevice : public Device {
int thread_id()
{
- return m_thread_id;
+ return thread_id_;
}
protected:
- int m_thread_id;
+ int thread_id_;
};
} // namespace blender::compositor
diff --git a/source/blender/compositor/intern/COM_CompositorContext.cc b/source/blender/compositor/intern/COM_CompositorContext.cc
index 81043f1f163..5e2e5ea295b 100644
--- a/source/blender/compositor/intern/COM_CompositorContext.cc
+++ b/source/blender/compositor/intern/COM_CompositorContext.cc
@@ -22,20 +22,20 @@ namespace blender::compositor {
CompositorContext::CompositorContext()
{
- m_scene = nullptr;
- m_rd = nullptr;
- m_quality = eCompositorQuality::High;
- m_hasActiveOpenCLDevices = false;
- m_fastCalculation = false;
- m_viewSettings = nullptr;
- m_displaySettings = nullptr;
- m_bnodetree = nullptr;
+ scene_ = nullptr;
+ rd_ = nullptr;
+ quality_ = eCompositorQuality::High;
+ hasActiveOpenCLDevices_ = false;
+ fastCalculation_ = false;
+ viewSettings_ = nullptr;
+ displaySettings_ = nullptr;
+ bnodetree_ = nullptr;
}
int CompositorContext::getFramenumber() const
{
- BLI_assert(m_rd);
- return m_rd->cfra;
+ BLI_assert(rd_);
+ return rd_->cfra;
}
Size2f CompositorContext::get_render_size() const
@@ -47,8 +47,8 @@ Size2f CompositorContext::get_render_size() const
eExecutionModel CompositorContext::get_execution_model() const
{
if (U.experimental.use_full_frame_compositor) {
- BLI_assert(m_bnodetree != nullptr);
- switch (m_bnodetree->execution_mode) {
+ BLI_assert(bnodetree_ != nullptr);
+ switch (bnodetree_->execution_mode) {
case 1:
return eExecutionModel::FullFrame;
case 0:
diff --git a/source/blender/compositor/intern/COM_CompositorContext.h b/source/blender/compositor/intern/COM_CompositorContext.h
index 835d565fc91..9354551d66a 100644
--- a/source/blender/compositor/intern/COM_CompositorContext.h
+++ b/source/blender/compositor/intern/COM_CompositorContext.h
@@ -38,55 +38,55 @@ class CompositorContext {
* editor) This field is initialized in ExecutionSystem and must only be read from that point
* on. \see ExecutionSystem
*/
- bool m_rendering;
+ bool rendering_;
/**
* \brief The quality of the composite.
* This field is initialized in ExecutionSystem and must only be read from that point on.
* \see ExecutionSystem
*/
- eCompositorQuality m_quality;
+ eCompositorQuality quality_;
- Scene *m_scene;
+ Scene *scene_;
/**
* \brief Reference to the render data that is being composited.
* This field is initialized in ExecutionSystem and must only be read from that point on.
* \see ExecutionSystem
*/
- RenderData *m_rd;
+ RenderData *rd_;
/**
* \brief reference to the bNodeTree
* This field is initialized in ExecutionSystem and must only be read from that point on.
* \see ExecutionSystem
*/
- bNodeTree *m_bnodetree;
+ bNodeTree *bnodetree_;
/**
* \brief Preview image hash table
* This field is initialized in ExecutionSystem and must only be read from that point on.
*/
- bNodeInstanceHash *m_previews;
+ bNodeInstanceHash *previews_;
/**
* \brief does this system have active opencl devices?
*/
- bool m_hasActiveOpenCLDevices;
+ bool hasActiveOpenCLDevices_;
/**
* \brief Skip slow nodes
*/
- bool m_fastCalculation;
+ bool fastCalculation_;
/* \brief color management settings */
- const ColorManagedViewSettings *m_viewSettings;
- const ColorManagedDisplaySettings *m_displaySettings;
+ const ColorManagedViewSettings *viewSettings_;
+ const ColorManagedDisplaySettings *displaySettings_;
/**
* \brief active rendering view name
*/
- const char *m_viewName;
+ const char *viewName_;
public:
/**
@@ -99,7 +99,7 @@ class CompositorContext {
*/
void setRendering(bool rendering)
{
- m_rendering = rendering;
+ rendering_ = rendering;
}
/**
@@ -107,7 +107,7 @@ class CompositorContext {
*/
bool isRendering() const
{
- return m_rendering;
+ return rendering_;
}
/**
@@ -115,7 +115,7 @@ class CompositorContext {
*/
void setRenderData(RenderData *rd)
{
- m_rd = rd;
+ rd_ = rd;
}
/**
@@ -123,7 +123,7 @@ class CompositorContext {
*/
void setbNodeTree(bNodeTree *bnodetree)
{
- m_bnodetree = bnodetree;
+ bnodetree_ = bnodetree;
}
/**
@@ -131,7 +131,7 @@ class CompositorContext {
*/
const bNodeTree *getbNodeTree() const
{
- return m_bnodetree;
+ return bnodetree_;
}
/**
@@ -139,16 +139,16 @@ class CompositorContext {
*/
const RenderData *getRenderData() const
{
- return m_rd;
+ return rd_;
}
void setScene(Scene *scene)
{
- m_scene = scene;
+ scene_ = scene;
}
Scene *getScene() const
{
- return m_scene;
+ return scene_;
}
/**
@@ -156,7 +156,7 @@ class CompositorContext {
*/
void setPreviewHash(bNodeInstanceHash *previews)
{
- m_previews = previews;
+ previews_ = previews;
}
/**
@@ -164,7 +164,7 @@ class CompositorContext {
*/
bNodeInstanceHash *getPreviewHash() const
{
- return m_previews;
+ return previews_;
}
/**
@@ -172,7 +172,7 @@ class CompositorContext {
*/
void setViewSettings(const ColorManagedViewSettings *viewSettings)
{
- m_viewSettings = viewSettings;
+ viewSettings_ = viewSettings;
}
/**
@@ -180,7 +180,7 @@ class CompositorContext {
*/
const ColorManagedViewSettings *getViewSettings() const
{
- return m_viewSettings;
+ return viewSettings_;
}
/**
@@ -188,7 +188,7 @@ class CompositorContext {
*/
void setDisplaySettings(const ColorManagedDisplaySettings *displaySettings)
{
- m_displaySettings = displaySettings;
+ displaySettings_ = displaySettings;
}
/**
@@ -196,7 +196,7 @@ class CompositorContext {
*/
const ColorManagedDisplaySettings *getDisplaySettings() const
{
- return m_displaySettings;
+ return displaySettings_;
}
/**
@@ -204,7 +204,7 @@ class CompositorContext {
*/
void setQuality(eCompositorQuality quality)
{
- m_quality = quality;
+ quality_ = quality;
}
/**
@@ -212,7 +212,7 @@ class CompositorContext {
*/
eCompositorQuality getQuality() const
{
- return m_quality;
+ return quality_;
}
/**
@@ -225,7 +225,7 @@ class CompositorContext {
*/
bool getHasActiveOpenCLDevices() const
{
- return m_hasActiveOpenCLDevices;
+ return hasActiveOpenCLDevices_;
}
/**
@@ -233,13 +233,13 @@ class CompositorContext {
*/
void setHasActiveOpenCLDevices(bool hasAvtiveOpenCLDevices)
{
- m_hasActiveOpenCLDevices = hasAvtiveOpenCLDevices;
+ hasActiveOpenCLDevices_ = hasAvtiveOpenCLDevices;
}
/** Whether it has a view with a specific name and not the default one. */
bool has_explicit_view() const
{
- return m_viewName && m_viewName[0] != '\0';
+ return viewName_ && viewName_[0] != '\0';
}
/**
@@ -247,7 +247,7 @@ class CompositorContext {
*/
const char *getViewName() const
{
- return m_viewName;
+ return viewName_;
}
/**
@@ -255,7 +255,7 @@ class CompositorContext {
*/
void setViewName(const char *viewName)
{
- m_viewName = viewName;
+ viewName_ = viewName;
}
int getChunksize() const
@@ -265,11 +265,11 @@ class CompositorContext {
void setFastCalculation(bool fastCalculation)
{
- m_fastCalculation = fastCalculation;
+ fastCalculation_ = fastCalculation;
}
bool isFastCalculation() const
{
- return m_fastCalculation;
+ return fastCalculation_;
}
bool isGroupnodeBufferEnabled() const
{
@@ -282,7 +282,7 @@ class CompositorContext {
*/
float getRenderPercentageAsFactor() const
{
- return m_rd->size * 0.01f;
+ return rd_->size * 0.01f;
}
Size2f get_render_size() const;
diff --git a/source/blender/compositor/intern/COM_Debug.cc b/source/blender/compositor/intern/COM_Debug.cc
index d0c8311ef6e..023db368ac9 100644
--- a/source/blender/compositor/intern/COM_Debug.cc
+++ b/source/blender/compositor/intern/COM_Debug.cc
@@ -35,12 +35,12 @@ extern "C" {
namespace blender::compositor {
-int DebugInfo::m_file_index = 0;
-DebugInfo::NodeNameMap DebugInfo::m_node_names;
-DebugInfo::OpNameMap DebugInfo::m_op_names;
-std::string DebugInfo::m_current_node_name;
-std::string DebugInfo::m_current_op_name;
-DebugInfo::GroupStateMap DebugInfo::m_group_states;
+int DebugInfo::file_index_ = 0;
+DebugInfo::NodeNameMap DebugInfo::node_names_;
+DebugInfo::OpNameMap DebugInfo::op_names_;
+std::string DebugInfo::current_node_name_;
+std::string DebugInfo::current_op_name_;
+DebugInfo::GroupStateMap DebugInfo::group_states_;
static std::string operation_class_name(const NodeOperation *op)
{
@@ -53,8 +53,8 @@ static std::string operation_class_name(const NodeOperation *op)
std::string DebugInfo::node_name(const Node *node)
{
- NodeNameMap::const_iterator it = m_node_names.find(node);
- if (it != m_node_names.end()) {
+ NodeNameMap::const_iterator it = node_names_.find(node);
+ if (it != node_names_.end()) {
return it->second;
}
return "";
@@ -62,8 +62,8 @@ std::string DebugInfo::node_name(const Node *node)
std::string DebugInfo::operation_name(const NodeOperation *op)
{
- OpNameMap::const_iterator it = m_op_names.find(op);
- if (it != m_op_names.end()) {
+ OpNameMap::const_it
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list