diff options
7 files changed, 15 insertions, 15 deletions
diff --git a/source/blender/compositor/COM_defines.h b/source/blender/compositor/COM_defines.h index a05ba531bc2..014d5a8d8e0 100644 --- a/source/blender/compositor/COM_defines.h +++ b/source/blender/compositor/COM_defines.h @@ -49,14 +49,14 @@ typedef enum CompositorQuality { * \brief Possible priority settings * \ingroup Execution */ -typedef enum CompositorPriority { +enum class CompositorPriority { /** \brief High quality setting */ - COM_PRIORITY_HIGH = 2, + High = 2, /** \brief Medium quality setting */ - COM_PRIORITY_MEDIUM = 1, + Medium = 1, /** \brief Low quality setting */ - COM_PRIORITY_LOW = 0, -} CompositorPriority; + Low = 0, +}; // configurable items diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.cc b/source/blender/compositor/intern/COM_ExecutionSystem.cc index 6691e5feb5f..993aedf7715 100644 --- a/source/blender/compositor/intern/COM_ExecutionSystem.cc +++ b/source/blender/compositor/intern/COM_ExecutionSystem.cc @@ -177,10 +177,10 @@ void ExecutionSystem::execute() WorkScheduler::start(this->m_context); - execute_groups(COM_PRIORITY_HIGH); + execute_groups(CompositorPriority::High); if (!this->getContext().isFastCalculation()) { - execute_groups(COM_PRIORITY_MEDIUM); - execute_groups(COM_PRIORITY_LOW); + execute_groups(CompositorPriority::Medium); + execute_groups(CompositorPriority::Low); } WorkScheduler::finish(); diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h index f26279e2869..7857837a95d 100644 --- a/source/blender/compositor/intern/COM_NodeOperation.h +++ b/source/blender/compositor/intern/COM_NodeOperation.h @@ -326,7 +326,7 @@ class NodeOperation : public SocketReader { */ virtual CompositorPriority getRenderPriority() const { - return COM_PRIORITY_LOW; + return CompositorPriority::Low; } /** diff --git a/source/blender/compositor/operations/COM_CompositorOperation.h b/source/blender/compositor/operations/COM_CompositorOperation.h index 3633bfd511c..63b87563852 100644 --- a/source/blender/compositor/operations/COM_CompositorOperation.h +++ b/source/blender/compositor/operations/COM_CompositorOperation.h @@ -111,7 +111,7 @@ class CompositorOperation : public NodeOperation { void deinitExecution(); CompositorPriority getRenderPriority() const { - return COM_PRIORITY_MEDIUM; + return CompositorPriority::Medium; } void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]); void setUseAlphaInput(bool value) diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.h b/source/blender/compositor/operations/COM_OutputFileOperation.h index 8717683b571..ecc52355824 100644 --- a/source/blender/compositor/operations/COM_OutputFileOperation.h +++ b/source/blender/compositor/operations/COM_OutputFileOperation.h @@ -66,7 +66,7 @@ class OutputSingleLayerOperation : public NodeOperation { void deinitExecution(); CompositorPriority getRenderPriority() const { - return COM_PRIORITY_LOW; + return CompositorPriority::Low; } bool isFileOutputOperation() const @@ -125,7 +125,7 @@ class OutputOpenExrMultiLayerOperation : public NodeOperation { void deinitExecution(); CompositorPriority getRenderPriority() const { - return COM_PRIORITY_LOW; + return CompositorPriority::Low; } bool isFileOutputOperation() const diff --git a/source/blender/compositor/operations/COM_PreviewOperation.cc b/source/blender/compositor/operations/COM_PreviewOperation.cc index 063421f6525..c374524818c 100644 --- a/source/blender/compositor/operations/COM_PreviewOperation.cc +++ b/source/blender/compositor/operations/COM_PreviewOperation.cc @@ -157,5 +157,5 @@ void PreviewOperation::determineResolution(unsigned int resolution[2], CompositorPriority PreviewOperation::getRenderPriority() const { - return COM_PRIORITY_LOW; + return CompositorPriority::Low; } diff --git a/source/blender/compositor/operations/COM_ViewerOperation.cc b/source/blender/compositor/operations/COM_ViewerOperation.cc index 025dde8e866..715b2e56735 100644 --- a/source/blender/compositor/operations/COM_ViewerOperation.cc +++ b/source/blender/compositor/operations/COM_ViewerOperation.cc @@ -197,8 +197,8 @@ void ViewerOperation::updateImage(rcti *rect) CompositorPriority ViewerOperation::getRenderPriority() const { if (this->isActiveViewerOutput()) { - return COM_PRIORITY_HIGH; + return CompositorPriority::High; } - return COM_PRIORITY_LOW; + return CompositorPriority::Low; } |