From 458b3f18df4e64453d25b627019379d7ac0675f3 Mon Sep 17 00:00:00 2001 From: Anna Date: Mon, 29 Jul 2019 18:25:36 -0700 Subject: [PATCH] changes from cr --- libraries/render-utils/src/DeferredLightingEffect.cpp | 3 --- libraries/render-utils/src/ToneMapAndResampleTask.h | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp index d8ccef0064..8d7fc345ac 100644 --- a/libraries/render-utils/src/DeferredLightingEffect.cpp +++ b/libraries/render-utils/src/DeferredLightingEffect.cpp @@ -29,9 +29,6 @@ #include "TextureCache.h" #include "FramebufferCache.h" -#include -#include - namespace ru { using render_utils::slot::texture::Texture; using render_utils::slot::buffer::Buffer; diff --git a/libraries/render-utils/src/ToneMapAndResampleTask.h b/libraries/render-utils/src/ToneMapAndResampleTask.h index d02cb4afda..d2b166392e 100644 --- a/libraries/render-utils/src/ToneMapAndResampleTask.h +++ b/libraries/render-utils/src/ToneMapAndResampleTask.h @@ -30,7 +30,7 @@ enum class ToneCurve { class ToneMappingConfig : public render::Job::Config { Q_OBJECT - Q_PROPERTY(float exposure MEMBER exposure WRITE setExposure); + Q_PROPERTY(float exposure MEMBER exposure WRITE setExposure); Q_PROPERTY(int curve MEMBER curve WRITE setCurve); public: ToneMappingConfig() : render::Job::Config(true) {}