History

Merge with master

Sam Gateau committed 11 years ago

Commit d84e2d32 parents b84302a 96fdb3234 files · +640 −711Browse files

Showing the changes to libraries/render-utils/src/RenderDeferredTask.cpp (1 of 34 files). Show all

Unified · Split

libraries/render-utils/src/RenderDeferredTask.cpp+0−3
@@ -111,9 +111,6 @@ RenderDeferredTask::RenderDeferredTask() : Task() { · 110 unmodified lines
111111 _drawHitEffectJobIndex = _jobs.size() -1;
112112
113113
114− _jobs.push_back(Job(new ResetGLState::JobModel()));
115−
116−
117114 // Give ourselves 3 frmaes of timer queries
118115 _timerQueries.push_back(std::make_shared<gpu::Query>());
119116 _timerQueries.push_back(std::make_shared<gpu::Query>());

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t