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:
authorJeroen Bakker <jeroen@blender.org>2021-04-02 17:11:13 +0300
committerJeroen Bakker <jeroen@blender.org>2021-04-02 17:11:13 +0300
commitb6ab1107c20228d441a6d992eb11c639ed2ce1d0 (patch)
treea15f14a3ca58854ca93d5cec315ad754e8ce024d /source/blender/compositor/operations
parent5a491adc17deb59f7c54fa60e5e8344b1daad359 (diff)
Cleanup: Added leading `e` to enum types.
Diffstat (limited to 'source/blender/compositor/operations')
-rw-r--r--source/blender/compositor/operations/COM_CompositorOperation.h4
-rw-r--r--source/blender/compositor/operations/COM_OutputFileOperation.h8
-rw-r--r--source/blender/compositor/operations/COM_PreviewOperation.cc4
-rw-r--r--source/blender/compositor/operations/COM_PreviewOperation.h2
-rw-r--r--source/blender/compositor/operations/COM_QualityStepHelper.cc14
-rw-r--r--source/blender/compositor/operations/COM_QualityStepHelper.h4
-rw-r--r--source/blender/compositor/operations/COM_ViewerOperation.cc6
-rw-r--r--source/blender/compositor/operations/COM_ViewerOperation.h2
8 files changed, 22 insertions, 22 deletions
diff --git a/source/blender/compositor/operations/COM_CompositorOperation.h b/source/blender/compositor/operations/COM_CompositorOperation.h
index 49ed65f01fc..65988c86cc5 100644
--- a/source/blender/compositor/operations/COM_CompositorOperation.h
+++ b/source/blender/compositor/operations/COM_CompositorOperation.h
@@ -111,9 +111,9 @@ class CompositorOperation : public NodeOperation {
}
void initExecution() override;
void deinitExecution() override;
- CompositorPriority getRenderPriority() const override
+ eCompositorPriority getRenderPriority() const override
{
- return CompositorPriority::Medium;
+ return eCompositorPriority::Medium;
}
void determineResolution(unsigned int resolution[2],
unsigned int preferredResolution[2]) override;
diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.h b/source/blender/compositor/operations/COM_OutputFileOperation.h
index 6415891032a..03e4237a1f0 100644
--- a/source/blender/compositor/operations/COM_OutputFileOperation.h
+++ b/source/blender/compositor/operations/COM_OutputFileOperation.h
@@ -66,9 +66,9 @@ class OutputSingleLayerOperation : public NodeOperation {
}
void initExecution() override;
void deinitExecution() override;
- CompositorPriority getRenderPriority() const override
+ eCompositorPriority getRenderPriority() const override
{
- return CompositorPriority::Low;
+ return eCompositorPriority::Low;
}
};
@@ -118,9 +118,9 @@ class OutputOpenExrMultiLayerOperation : public NodeOperation {
}
void initExecution() override;
void deinitExecution() override;
- CompositorPriority getRenderPriority() const override
+ eCompositorPriority getRenderPriority() const override
{
- return CompositorPriority::Low;
+ return eCompositorPriority::Low;
}
};
diff --git a/source/blender/compositor/operations/COM_PreviewOperation.cc b/source/blender/compositor/operations/COM_PreviewOperation.cc
index 9a1990740f4..e7c11613aa3 100644
--- a/source/blender/compositor/operations/COM_PreviewOperation.cc
+++ b/source/blender/compositor/operations/COM_PreviewOperation.cc
@@ -166,9 +166,9 @@ void PreviewOperation::determineResolution(unsigned int resolution[2],
resolution[1] = height;
}
-CompositorPriority PreviewOperation::getRenderPriority() const
+eCompositorPriority PreviewOperation::getRenderPriority() const
{
- return CompositorPriority::Low;
+ return eCompositorPriority::Low;
}
} // namespace blender::compositor
diff --git a/source/blender/compositor/operations/COM_PreviewOperation.h b/source/blender/compositor/operations/COM_PreviewOperation.h
index 5e2b27475a1..0f43f01c5d6 100644
--- a/source/blender/compositor/operations/COM_PreviewOperation.h
+++ b/source/blender/compositor/operations/COM_PreviewOperation.h
@@ -55,7 +55,7 @@ class PreviewOperation : public NodeOperation {
}
void initExecution() override;
void deinitExecution() override;
- CompositorPriority getRenderPriority() const override;
+ eCompositorPriority getRenderPriority() const override;
void executeRegion(rcti *rect, unsigned int tileNumber) override;
void determineResolution(unsigned int resolution[2],
diff --git a/source/blender/compositor/operations/COM_QualityStepHelper.cc b/source/blender/compositor/operations/COM_QualityStepHelper.cc
index 385e0bebca4..e347d278ce4 100644
--- a/source/blender/compositor/operations/COM_QualityStepHelper.cc
+++ b/source/blender/compositor/operations/COM_QualityStepHelper.cc
@@ -22,7 +22,7 @@ namespace blender::compositor {
QualityStepHelper::QualityStepHelper()
{
- this->m_quality = CompositorQuality::High;
+ this->m_quality = eCompositorQuality::High;
this->m_step = 1;
this->m_offsetadd = 4;
}
@@ -32,16 +32,16 @@ void QualityStepHelper::initExecution(QualityHelper helper)
switch (helper) {
case COM_QH_INCREASE:
switch (this->m_quality) {
- case CompositorQuality::High:
+ case eCompositorQuality::High:
default:
this->m_step = 1;
this->m_offsetadd = 1;
break;
- case CompositorQuality::Medium:
+ case eCompositorQuality::Medium:
this->m_step = 2;
this->m_offsetadd = 2;
break;
- case CompositorQuality::Low:
+ case eCompositorQuality::Low:
this->m_step = 3;
this->m_offsetadd = 3;
break;
@@ -49,16 +49,16 @@ void QualityStepHelper::initExecution(QualityHelper helper)
break;
case COM_QH_MULTIPLY:
switch (this->m_quality) {
- case CompositorQuality::High:
+ case eCompositorQuality::High:
default:
this->m_step = 1;
this->m_offsetadd = 4;
break;
- case CompositorQuality::Medium:
+ case eCompositorQuality::Medium:
this->m_step = 2;
this->m_offsetadd = 8;
break;
- case CompositorQuality::Low:
+ case eCompositorQuality::Low:
this->m_step = 4;
this->m_offsetadd = 16;
break;
diff --git a/source/blender/compositor/operations/COM_QualityStepHelper.h b/source/blender/compositor/operations/COM_QualityStepHelper.h
index 79c761e6086..c5f16a58686 100644
--- a/source/blender/compositor/operations/COM_QualityStepHelper.h
+++ b/source/blender/compositor/operations/COM_QualityStepHelper.h
@@ -29,7 +29,7 @@ typedef enum QualityHelper {
class QualityStepHelper {
private:
- CompositorQuality m_quality;
+ eCompositorQuality m_quality;
int m_step;
int m_offsetadd;
@@ -51,7 +51,7 @@ class QualityStepHelper {
public:
QualityStepHelper();
- void setQuality(CompositorQuality quality)
+ void setQuality(eCompositorQuality quality)
{
this->m_quality = quality;
}
diff --git a/source/blender/compositor/operations/COM_ViewerOperation.cc b/source/blender/compositor/operations/COM_ViewerOperation.cc
index 1ae0fe6101f..860f56e23fa 100644
--- a/source/blender/compositor/operations/COM_ViewerOperation.cc
+++ b/source/blender/compositor/operations/COM_ViewerOperation.cc
@@ -209,13 +209,13 @@ void ViewerOperation::updateImage(rcti *rect)
this->updateDraw();
}
-CompositorPriority ViewerOperation::getRenderPriority() const
+eCompositorPriority ViewerOperation::getRenderPriority() const
{
if (this->isActiveViewerOutput()) {
- return CompositorPriority::High;
+ return eCompositorPriority::High;
}
- return CompositorPriority::Low;
+ return eCompositorPriority::Low;
}
} // namespace blender::compositor
diff --git a/source/blender/compositor/operations/COM_ViewerOperation.h b/source/blender/compositor/operations/COM_ViewerOperation.h
index 8406ea41f20..c0f13ff79fc 100644
--- a/source/blender/compositor/operations/COM_ViewerOperation.h
+++ b/source/blender/compositor/operations/COM_ViewerOperation.h
@@ -102,7 +102,7 @@ class ViewerOperation : public NodeOperation {
{
return this->m_chunkOrder;
}
- CompositorPriority getRenderPriority() const override;
+ eCompositorPriority getRenderPriority() const override;
void setUseAlphaInput(bool value)
{
this->m_useAlphaInput = value;