[Bf-blender-cvs] [a808c5ae65e] temp-compositor-cleanups: Cleanup: Remove `this->` for `m_` prefixed members in Compositor
Manuel Castilla
noreply at git.blender.org
Fri Oct 8 01:35:49 CEST 2021
Commit: a808c5ae65e8a9fd2271274cbba3038846e5ffee
Author: Manuel Castilla
Date: Thu Oct 7 21:14:54 2021 +0200
Branches: temp-compositor-cleanups
https://developer.blender.org/rBa808c5ae65e8a9fd2271274cbba3038846e5ffee
Cleanup: Remove `this->` for `m_` prefixed members in Compositor
The prefix is already explicit.
===================================================================
M source/blender/compositor/intern/COM_CompositorContext.cc
M source/blender/compositor/intern/COM_CompositorContext.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.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_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/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_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_CalculateMeanOperation.cc
M source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cc
M source/blender/compositor/operations/COM_ChangeHSVOperation.cc
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_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_CropOperation.cc
M source/blender/compositor/operations/COM_CropOperation.h
M source/blender/compositor/operations/COM_CurveBaseOperation.cc
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_DisplaceSimpleOperation.cc
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_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_GammaOperation.cc
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_GaussianBokehBlurOperation.cc
M source/blender/compositor/operations/COM_GaussianXBlurOperation.cc
M source/blender/compositor/operations/COM_GaussianYBlurOperation.cc
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_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_NormalizeOperation.cc
M source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cc
M source/blender/compositor/operations/COM_OutputFileOperation.cc
M source/blender/compositor/operations/COM_PixelateOperation.cc
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_PreviewOperation.cc
M source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cc
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_ScaleOperation.cc
M source/blender/compositor/operations/COM_ScaleOperation.h
M source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cc
M source/blender/compositor/operations/COM_SetAlphaMultiplyOperation.cc
M source/blender/compositor/operations/COM_SetAlphaReplaceOperation.cc
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_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_ViewerOperation.cc
M source/blender/compositor/operations/COM_ViewerOperation.h
M source/blender/compositor/operations/COM_WrapOperation.cc
M source/blender/compositor/operations/COM_WriteBufferOperation.cc
M source/blender/compositor/operations/COM_WriteBufferOperation.h
M source/blender/compositor/operations/COM_ZCombineOperation.cc
===================================================================
diff --git a/source/blender/compositor/intern/COM_CompositorContext.cc b/source/blender/compositor/intern/COM_CompositorContext.cc
index 5d8355c181a..81043f1f163 100644
--- a/source/blender/compositor/intern/COM_CompositorContext.cc
+++ b/source/blender/compositor/intern/COM_CompositorContext.cc
@@ -22,14 +22,14 @@ namespace blender::compositor {
CompositorContext::CompositorContext()
{
- this->m_scene = nullptr;
- this->m_rd = nullptr;
- this->m_quality = eCompositorQuality::High;
- this->m_hasActiveOpenCLDevices = false;
- this->m_fastCalculation = false;
- this->m_viewSettings = nullptr;
- this->m_displaySettings = nullptr;
- this->m_bnodetree = nullptr;
+ 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;
}
int CompositorContext::getFramenumber() const
diff --git a/source/blender/compositor/intern/COM_CompositorContext.h b/source/blender/compositor/intern/COM_CompositorContext.h
index 1ae596736ae..835d565fc91 100644
--- a/source/blender/compositor/intern/COM_CompositorContext.h
+++ b/source/blender/compositor/intern/COM_CompositorContext.h
@@ -99,7 +99,7 @@ class CompositorContext {
*/
void setRendering(bool rendering)
{
- this->m_rendering = rendering;
+ m_rendering = rendering;
}
/**
@@ -107,7 +107,7 @@ class CompositorContext {
*/
bool isRendering() const
{
- return this->m_rendering;
+ return m_rendering;
}
/**
@@ -115,7 +115,7 @@ class CompositorContext {
*/
void setRenderData(RenderData *rd)
{
- this->m_rd = rd;
+ m_rd = rd;
}
/**
@@ -123,7 +123,7 @@ class CompositorContext {
*/
void setbNodeTree(bNodeTree *bnodetree)
{
- this->m_bnodetree = bnodetree;
+ m_bnodetree = bnodetree;
}
/**
@@ -131,7 +131,7 @@ class CompositorContext {
*/
const bNodeTree *getbNodeTree() const
{
- return this->m_bnodetree;
+ return m_bnodetree;
}
/**
@@ -139,7 +139,7 @@ class CompositorContext {
*/
const RenderData *getRenderData() const
{
- return this->m_rd;
+ return m_rd;
}
void setScene(Scene *scene)
@@ -156,7 +156,7 @@ class CompositorContext {
*/
void setPreviewHash(bNodeInstanceHash *previews)
{
- this->m_previews = previews;
+ m_previews = previews;
}
/**
@@ -164,7 +164,7 @@ class CompositorContext {
*/
bNodeInstanceHash *getPreviewHash() const
{
- return this->m_previews;
+ return m_previews;
}
/**
@@ -172,7 +172,7 @@ class CompositorContext {
*/
void setViewSettings(const ColorManagedViewSettings *viewSettings)
{
- this->m_viewSettings = viewSettings;
+ m_viewSettings = viewSettings;
}
/**
@@ -180,7 +180,7 @@ class CompositorContext {
*/
const ColorManagedViewSettings *getViewSettings() const
{
- return this->m_viewSettings;
+ return m_viewSettings;
}
/**
@@ -188,7 +188,7 @@ class CompositorContext {
*/
void setDisplaySettings(const ColorManagedDisplaySettings *displaySettings)
{
- this->m_displaySettings = displaySettings;
+ m_displaySettings = displaySettings;
}
/**
@@ -196,7 +196,7 @@ class CompositorContext {
*/
const ColorManagedDisplaySettings *getDisplaySettings() const
{
- return this->m_displaySettings;
+ return m_displaySettings;
}
/**
@@ -204,7 +204,7 @@ class CompositorContext {
*/
void setQuality(eCompositorQuality quality)
{
- this->m_quality = quality;
+ m_quality = quality;
}
/**
@@ -212,7 +212,7 @@ class CompositorContext {
*/
eCompositorQuality getQuality() const
{
- return this->m_quality;
+ return m_quality;
}
/**
@@ -225,7 +225,7 @@ class CompositorContext {
*/
bool getHasActiveOpenCLDevices() const
{
- return this->m_hasActiveOpenCLDevices;
+ return m_hasActiveOpenCLDevices;
}
/**
@@ -233,7 +233,7 @@ class CompositorContext {
*/
void setHasActiveOpenCLDevices(bool hasAvtiveOpenCLDevices)
{
- this->m_hasActiveOpenCLDevices = hasAvtiveOpenCLDevices;
+ m_hasActiveOpenCLDevices = hasAvtiveOpenCLDevices;
}
/** Whether it has a view with a specific name and not the default one. */
@@ -247,7 +247,7 @@ class CompositorContext {
*/
const char *getViewName() const
{
- return this->m_viewName;
+ return m_viewName;
}
/**
@@ -255,7 +255,7 @@ class CompositorContext {
*/
void setViewName(const char *viewName)
{
- this->m_viewName = viewName;
+ m_viewName = viewName;
}
int getChunksize() const
@@ -265,11 +265,11 @@ class CompositorContext {
void setFastCalculation(bool fastCalculation)
{
- this->m_fastCalculation = fastCalculation;
+ m_fastCalculation = fastCalculation;
}
bool isFastCalculation() const
{
- return this->m_fastCalculation;
+ return m_fastCalculation;
}
bool isGroupnodeBufferEnabled() const
{
diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.cc b/source/blender/compositor/intern/COM_ExecutionGroup.cc
index 655bc030dec..8841f44ea48 100644
--- a/source/blender/compositor/intern/COM_ExecutionGroup.cc
+++ b/source/blender/compositor/intern/COM_ExecutionGroup.cc
@@ -56,16 +56,16 @@ std::ostream &operator<<(std::ostream &os, const ExecutionGroupFlags &flags)
ExecutionGroup::ExecutionGroup(int id)
{
m_id = id;
- this->m_bTree = nullptr;
- this->m_height = 0;
- this->m_width = 0;
- this->m_max_read_buffer_offset = 0;
- this->m_x_chunks_len = 0;
- this->m_y_chunks_len = 0;
- this->m_chunks_len = 0;
- this->m_chunks_finished = 0;
- BLI_rcti_init(&this->m_viewerBorder, 0, 0, 0, 0);
- this->m_executionStartTime = 0;
+ m_bTree = nullptr;
+ m_height = 0;
+ m_width = 0;
+ m_max_read_buffer_offset = 0;
+ m_x_chunks_len = 0;
+ m_y_chunks_len = 0;
+ m_chunks_len = 0;
+ m_chunks_finished = 0;
+ BLI_rcti_init(&m_viewerBorder, 0, 0, 0, 0);
+ m_executionStartTime = 0;
}
std::ostream &operator<<(std::ostream &os, const ExecutionGroup &execution_group)
@@ -139,8 +139,8 @@ NodeOperation *ExecutionGroup::getOutputOperation() const
void ExecutionGroup::init_work_packages()
{
m_work_packages.clear();
- if (this->m_chunks_len != 0) {
- m_work_packages.resize(this->m_chunks_len);
+ if (m_chunks_len != 0) {
+ m_work_packages.resize(m_chunks_len);
for (unsigned int index = 0; index < m_chunks_len; index++) {
m_work_packages[index].type = eWorkPackageType::Tile;
m_work_packages[index].state = eWorkPackageState::NotScheduled;
@@ -157,12 +157,12 @@ void ExecutionGroup::init_read_buffer_operations()
for (NodeOperation *operation : m_operations) {
if (operation->get_flags().is_read_buffer_operation) {
ReadBufferOperation *readOperation = static_cast<ReadBufferOperation *>(operation);
- this->m_read_operations.append(readOperation);
+ m_read_operations.append(readOperation);
max_offset = MAX2(max_offset, readOperation->getOffset());
}
}
max_offset++;
- this->m_max_read_buffer_offset = max_offset;
+ m_max_read_buffer_offset = max_offset;
}
void ExecutionGroup::initExecution()
@@ -175,11 +175,11 @@ void ExecutionGroup::initExecution()
void ExecutionGroup::deinitExecution()
{
m_work_packages.clear();
- this->m_chunks_len = 0;
- this->m_x_chunks_len = 0;
- this->m_y_chunks_len = 0;
- this->m_read_operations.clear();
- this->m_bTree = nullptr;
+ m_chunks_len = 0;
+ m_x_chunks_len = 0;
+ m_y_chunks_len = 0;
+ m_read_operations.clear();
+ m_bTree = nullptr;
}
void ExecutionGroup::determineResolution(unsigned int resolution[2])
@@ -188,30 +188,30 @@ void ExecutionGroup::determineResolution(unsigned int resolution[2])
resolution[0] = operation->getWidth();
resolution[1] = operation->getHeight();
this->setResolution(resolution);
- BLI_rcti_init(&this->m_viewerBorder, 0, this->m_width, 0, this->m_height);
+ BLI_rcti_init(&m_viewerBorder, 0, m_width, 0, m_height);
}
void ExecutionGroup::init_number_of_chunks()
{
- if (this->m_flags.single_threaded) {
- this->m_x_chunks_len = 1;
- this->m_y_chunks_len = 1;
- this->m_chunks_len = 1;
+ if (m_flags.single_threaded) {
+ m_x_chunks_len = 1;
+ m_y_chunks_len = 1;
+ m_chunks_len = 1;
}
else {
- const float chunkSizef = this->m_chunkSize;
- const int border_width = BLI_rcti_size_x(&this->m_viewerBorder);
- const int border_height = BLI_rcti_size_y(&this->m_viewerBorder);
- this->m_x_chunks_len = ceil(border_width / chunkSizef);
- this->m_y_chunks_len = ceil(border_height / chunkSizef);
- this->m_chunks_len = this->m_x_chunks_len * this->m_y_chunks_len;
+ const float chunkSizef = m_chunkSize;
+ const int border_width = BLI_rcti_size_x(&m_viewerBorder);
+ const int border_height = BLI_rcti_size_y(&m_viewerBorder);
+ m_x_chunks_len = ceil(border_width / chunkSizef);
+ m_y_chunks_len = ceil(border_height / chunkSizef);
+ m_chunks_len = m_x_chunks_len * m_y_chunks_len;
}
}
blender::Array<unsigned int> ExecutionGroup::get_execution_order() const
{
blender::Array<unsigned int> chunk_order(m_chunks_len);
- for (int chunk_index = 0; chunk_index < this->m_chunks_len; chunk_index++) {
+ for (int chunk_index = 0; chunk_index < m_chunks_len; chunk_index++) {
chunk_order[chunk_index] = chunk_index;
}
@@ -227,8 +227,8 @@ blender::Array<unsigned int> ExecutionGroup::get_execution_order() const
order_type = viewer->getChunkOrder();
}
- const int border_width = BLI_rcti_size_x(&this->m_viewerBorder);
- const int border_height = BLI_rcti_size_y(&this->m_viewerBorder);
+ const int border_width = BLI_rcti_size_x(&m_viewerBorder);
+ const int border_height = BLI_rcti_size_y(&m_viewerBorder);
int index;
switch (order_type) {
case ChunkOrdering::Random: {
@@ -242,16 +242,16 @@ blender::Array<unsigned int> ExecutionGroup::get_execution_order() const
case ChunkOrdering::CenterOut: {
ChunkOrderHotspot hotspot(border_width * centerX, border_height * centerY, 0.0f);
blender::Array<ChunkOrder> chunk_orders(m_chunks_len);
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list