From 837b321004e0901330c5f131753911f67b734495 Mon Sep 17 00:00:00 2001
From: Sam Gateau <samuel.gateau@gmail.com>
Date: Sat, 17 Nov 2018 10:35:05 -0800
Subject: [PATCH] merging with master

---
 interface/src/graphics/RenderEventHandler.cpp       | 2 +-
 libraries/render-utils/src/AmbientOcclusionEffect.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/interface/src/graphics/RenderEventHandler.cpp b/interface/src/graphics/RenderEventHandler.cpp
index 3ac48b894d..42af3bb9c0 100644
--- a/interface/src/graphics/RenderEventHandler.cpp
+++ b/interface/src/graphics/RenderEventHandler.cpp
@@ -25,7 +25,7 @@ RenderEventHandler::RenderEventHandler(CheckCall checkCall, RenderCall renderCal
     // Transfer to a new thread
     moveToNewNamedThread(this, "RenderThread", [this](QThread* renderThread) {
         hifi::qt::addBlockingForbiddenThread("Render", renderThread);
-        _renderContext->moveToThreadWithContext(renderThread);
+        //_renderContext->moveToThreadWithContext(renderThread);
         _lastTimeRendered.start();
     }, std::bind(&RenderEventHandler::initialize, this), QThread::HighestPriority);
 }
diff --git a/libraries/render-utils/src/AmbientOcclusionEffect.h b/libraries/render-utils/src/AmbientOcclusionEffect.h
index 864aef09e4..af6f6b21a3 100644
--- a/libraries/render-utils/src/AmbientOcclusionEffect.h
+++ b/libraries/render-utils/src/AmbientOcclusionEffect.h
@@ -78,7 +78,6 @@ using AmbientOcclusionFramebufferPointer = std::shared_ptr<AmbientOcclusionFrame
 
 class AmbientOcclusionEffectConfig : public render::GPUJobConfig::Persistent {
     Q_OBJECT
-    Q_PROPERTY(bool enabled MEMBER enabled NOTIFY dirty)
     Q_PROPERTY(bool horizonBased MEMBER horizonBased NOTIFY dirty)
     Q_PROPERTY(bool ditheringEnabled MEMBER ditheringEnabled NOTIFY dirty)
     Q_PROPERTY(bool borderingEnabled MEMBER borderingEnabled NOTIFY dirty)