REmoving uneeded changes

This commit is contained in:
samcake 2016-04-19 11:01:41 -07:00
parent 21b0341e50
commit 28521aa66a
4 changed files with 2 additions and 6 deletions

View file

@ -107,10 +107,9 @@ void render::renderStateSortShapes(const SceneContextPointer& sceneContext, cons
args->_pipeline = shapeContext->pickPipeline(args, pipelineKey); args->_pipeline = shapeContext->pickPipeline(args, pipelineKey);
for (auto& item : bucket) { for (auto& item : bucket) {
item.render(args); item.render(args);
} }
} }
args->_pipeline = nullptr; args->_pipeline = nullptr;
for (auto& item : ownPipelineBucket) { for (auto& item : ownPipelineBucket) {
item.render(args); item.render(args);
} }

View file

@ -267,7 +267,6 @@ public:
renderContext->jobConfig = std::static_pointer_cast<Config>(_config); renderContext->jobConfig = std::static_pointer_cast<Config>(_config);
if (renderContext->jobConfig->alwaysEnabled || renderContext->jobConfig->enabled) { if (renderContext->jobConfig->alwaysEnabled || renderContext->jobConfig->enabled) {
jobRun(_data, sceneContext, renderContext, _input.get<I>(), _output.edit<O>()); jobRun(_data, sceneContext, renderContext, _input.get<I>(), _output.edit<O>());
} }
renderContext->jobConfig.reset(); renderContext->jobConfig.reset();
} }

View file

@ -147,4 +147,3 @@ void PerformanceTimer::dumpAllTimerRecords() {
<< "usecs over" << i.value().getCount() << "calls"; << "usecs over" << i.value().getCount() << "calls";
} }
} }

View file

@ -78,7 +78,6 @@ public:
PerformanceTimer(const QString& name); PerformanceTimer(const QString& name);
~PerformanceTimer(); ~PerformanceTimer();
static bool isActive(); static bool isActive();
static void setActive(bool active); static void setActive(bool active);