History

Fixed fading on skinned objects. Added initialiazeShapePipelines on GeometryCache to postpone simple pipeline creation after initializeGL

Olivier Prat committed 9 years ago

Commit 20d4fcb1 parent de143d08 files · +151 −73Browse files

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

Unified · Split

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