History

Merge pull request #12328 from Atlante45/fix/misc-bugs

Misc bug fixes

John Conklin II committed 8 years ago

Commit d084e582 parents f3918ad 8ebb3e514 files · +27 −32Browse files

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

Unified · Split

libraries/render-utils/src/DeferredLightingEffect.cpp+0−2
@@ -749,8 +749,6 @@ void DefaultLightingSetup::run(const RenderContextPointer& renderContext) { · 748 unmodified lines
749 auto textureCache = DependencyManager::get<TextureCache>();749 auto textureCache = DependencyManager::get<TextureCache>();
750 {750 {
751 PROFILE_RANGE(render, "Process Default Skybox");751 PROFILE_RANGE(render, "Process Default Skybox");
752 auto textureCache = DependencyManager::get<TextureCache>();
753
754 QFileSelector fileSelector;752 QFileSelector fileSelector;
755 fileSelector.setExtraSelectors(FileUtils::getFileSelectors());753 fileSelector.setExtraSelectors(FileUtils::getFileSelectors());
756 auto skyboxUrl = fileSelector.select(PathUtils::resourcesPath() + "images/Default-Sky-9-cubemap.ktx");754 auto skyboxUrl = fileSelector.select(PathUtils::resourcesPath() + "images/Default-Sky-9-cubemap.ktx");

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