History

Merged with 21378

Olivier Prat committed 9 years ago

Commit 018c0482 parents 53ffca7 b1b11ec60 files · +3833 −160Browse files

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

Unified · Split

interface/src/Application.cpp+2−0
@@ -945,6 +945,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 944 unmodified lines
945 // Make sure we don't time out during slow operations at startup945 // Make sure we don't time out during slow operations at startup
946 updateHeartbeat();946 updateHeartbeat();
947 947
948 // Now that OpenGL is initialized, we are sure we have a valid context and can create the various pipeline shaders with success.
949 DependencyManager::get<GeometryCache>()->initializeShapePipelines();
948 950
949 // sessionRunTime will be reset soon by loadSettings. Grab it now to get previous session value.951 // sessionRunTime will be reset soon by loadSettings. Grab it now to get previous session value.
950 // The value will be 0 if the user blew away settings this session, which is both a feature and a bug.952 // The value will be 0 if the user blew away settings this session, which is both a feature and a bug.