From 09d30c6aee1c5395b01077e32d1e1cfccff2f9bc Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sat, 7 May 2022 13:28:46 -0700 Subject: [PATCH] colortransformjob: allow overriding ID --- app/render/job/colortransformjob.h | 12 ++++++++++++ app/render/renderer.cpp | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/render/job/colortransformjob.h b/app/render/job/colortransformjob.h index bbc203226..18f48a7cb 100644 --- a/app/render/job/colortransformjob.h +++ b/app/render/job/colortransformjob.h @@ -45,6 +45,17 @@ public: clear_destination_ = true; } + QString id() const + { + if (id_.isEmpty()) { + return processor_->id(); + } else { + return id_; + } + } + + void SetOverrideID(const QString &id) { id_ = id; } + TexturePtr GetInputTexture() const { return input_texture_; } void SetInputTexture(TexturePtr tex) { input_texture_ = tex; } @@ -76,6 +87,7 @@ public: private: ColorProcessorPtr processor_; + QString id_; TexturePtr input_texture_; diff --git a/app/render/renderer.cpp b/app/render/renderer.cpp index 66fb3853b..8d8b16a25 100644 --- a/app/render/renderer.cpp +++ b/app/render/renderer.cpp @@ -99,7 +99,7 @@ bool Renderer::GetColorContext(const ColorTransformJob &color_job, Renderer::Col ColorContext& color_ctx = *ctx; - QString proc_id = color_job.GetColorProcessor()->id(); + QString proc_id = color_job.id(); if (color_cache_.contains(proc_id)) { color_ctx = color_cache_.value(proc_id);