From 28521aa66a5b5fa4a89a4c3e962bd40b79b78fd5 Mon Sep 17 00:00:00 2001 From: samcake Date: Tue, 19 Apr 2016 11:01:41 -0700 Subject: [PATCH] REmoving uneeded changes --- libraries/render/src/render/DrawTask.cpp | 5 ++--- libraries/render/src/render/Task.h | 1 - libraries/shared/src/PerfStat.cpp | 1 - libraries/shared/src/PerfStat.h | 1 - 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/libraries/render/src/render/DrawTask.cpp b/libraries/render/src/render/DrawTask.cpp index 82ebe74663..2f0d81db3f 100755 --- a/libraries/render/src/render/DrawTask.cpp +++ b/libraries/render/src/render/DrawTask.cpp @@ -107,10 +107,9 @@ void render::renderStateSortShapes(const SceneContextPointer& sceneContext, cons args->_pipeline = shapeContext->pickPipeline(args, pipelineKey); for (auto& item : bucket) { item.render(args); - } - } + } + } args->_pipeline = nullptr; - for (auto& item : ownPipelineBucket) { item.render(args); } diff --git a/libraries/render/src/render/Task.h b/libraries/render/src/render/Task.h index a4cfc55c18..300c0efd56 100644 --- a/libraries/render/src/render/Task.h +++ b/libraries/render/src/render/Task.h @@ -267,7 +267,6 @@ public: renderContext->jobConfig = std::static_pointer_cast(_config); if (renderContext->jobConfig->alwaysEnabled || renderContext->jobConfig->enabled) { jobRun(_data, sceneContext, renderContext, _input.get(), _output.edit()); - } renderContext->jobConfig.reset(); } diff --git a/libraries/shared/src/PerfStat.cpp b/libraries/shared/src/PerfStat.cpp index 676d147dd5..615330e13f 100644 --- a/libraries/shared/src/PerfStat.cpp +++ b/libraries/shared/src/PerfStat.cpp @@ -147,4 +147,3 @@ void PerformanceTimer::dumpAllTimerRecords() { << "usecs over" << i.value().getCount() << "calls"; } } - diff --git a/libraries/shared/src/PerfStat.h b/libraries/shared/src/PerfStat.h index 5a66990b16..622eb1cd84 100644 --- a/libraries/shared/src/PerfStat.h +++ b/libraries/shared/src/PerfStat.h @@ -78,7 +78,6 @@ public: PerformanceTimer(const QString& name); ~PerformanceTimer(); - static bool isActive(); static void setActive(bool active);