fix crash with 'load shaders at startup' (was occuring before ogl init)
This commit is contained in:
parent
b701e17d6b
commit
e445a2635a
|
|
@ -521,10 +521,6 @@ int main( int argc, char* argv[] ){
|
|||
{
|
||||
Map_New();
|
||||
}
|
||||
// load up shaders now that we have the map loaded
|
||||
// eviltypeguy
|
||||
TextureBrowser_ShowStartupShaders();
|
||||
|
||||
|
||||
remove_local_pid();
|
||||
|
||||
|
|
|
|||
|
|
@ -1633,6 +1633,8 @@ protected:
|
|||
void initializeGL() override
|
||||
{
|
||||
glwidget_context_created( *this );
|
||||
// show definitely after gl init, otherwise crash
|
||||
TextureBrowser_ShowStartupShaders();
|
||||
}
|
||||
void resizeGL( int w, int h ) override
|
||||
{
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@ QWidget* TextureBrowser_constructWindow( QWidget* toplevel );
|
|||
void TextureBrowser_destroyWindow();
|
||||
|
||||
|
||||
void TextureBrowser_ShowStartupShaders();
|
||||
const char* TextureBrowser_GetSelectedShader();
|
||||
|
||||
void TextureBrowser_Construct();
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user