History

Merge branch 'master' into 21055

David Rowe committed 10 years ago

Commit caf1a932 parents 4818ad2 f84f98f7 files · +240 −49Browse files

Showing the changes to interface/src/Application.cpp (1 of 7 files). Show all

Unified · Split

interface/src/Application.cpp+8−3
@@ -2170,7 +2170,7 @@ bool Application::event(QEvent* event) { · 2169 unmodified lines
2170 // handle custom URL2170 // handle custom URL
2171 if (event->type() == QEvent::FileOpen) {2171 if (event->type() == QEvent::FileOpen) {
2172 2172
2173 QFileOpenEvent* fileEvent = static_cast<QFileOpenEvent*>(event);2173 QFileOpenEvent* fileEvent = static_cast<QFileOpenEvent*>(event);
2174 2174
2175 QUrl url = fileEvent->url();2175 QUrl url = fileEvent->url();
2176 2176
@@ -4361,8 +4361,13 @@ namespace render { · 2184 unmodified lines
4361 auto scene = DependencyManager::get<SceneScriptingInterface>()->getStage();4361 auto scene = DependencyManager::get<SceneScriptingInterface>()->getStage();
4362 auto sceneKeyLight = scene->getKeyLight();4362 auto sceneKeyLight = scene->getKeyLight();
4363 auto defaultSkyboxAmbientTexture = qApp->getDefaultSkyboxAmbientTexture();4363 auto defaultSkyboxAmbientTexture = qApp->getDefaultSkyboxAmbientTexture();
4364 sceneKeyLight->setAmbientSphere(defaultSkyboxAmbientTexture->getIrradiance());4364 if (defaultSkyboxAmbientTexture) {
4365 sceneKeyLight->setAmbientMap(defaultSkyboxAmbientTexture);4365 sceneKeyLight->setAmbientSphere(defaultSkyboxAmbientTexture->getIrradiance());
4366 sceneKeyLight->setAmbientMap(defaultSkyboxAmbientTexture);
4367 } else {
4368 static QString repeatedMessage = LogHandler::getInstance().addRepeatedMessageRegex(
4369 "Failed to get a valid Default Skybox Ambient Texture ? probably because it couldn't be find during initialization step");
4370 }
4366 // fall through: render defaults skybox4371 // fall through: render defaults skybox
4367 } else {4372 } else {
4368 break;4373 break;

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