quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix crash with 'load shaders at startup' (was occuring before ogl init)

Browse Source
This commit is contained in:
Garux 2022-10-28 09:50:44 +03:00
parent b701e17d6b
commit e445a2635a
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
radiant/main.cpp
View File

@ -521,10 +521,6 @@ int main( int argc, char* argv[] ){
{ {
Map_New(); Map_New();
} }
// load up shaders now that we have the map loaded
// eviltypeguy
TextureBrowser_ShowStartupShaders();
remove_local_pid(); remove_local_pid();

2
radiant/texwindow.cpp
View File

@ -1633,6 +1633,8 @@ protected:
void initializeGL() override void initializeGL() override
{ {
glwidget_context_created( *this ); glwidget_context_created( *this );
// show definitely after gl init, otherwise crash
TextureBrowser_ShowStartupShaders();
} }
void resizeGL( int w, int h ) override void resizeGL( int w, int h ) override
{ {

1
radiant/texwindow.h
View File

@ -29,7 +29,6 @@ QWidget* TextureBrowser_constructWindow( QWidget* toplevel );
void TextureBrowser_destroyWindow(); void TextureBrowser_destroyWindow();
void TextureBrowser_ShowStartupShaders();
const char* TextureBrowser_GetSelectedShader(); const char* TextureBrowser_GetSelectedShader();
void TextureBrowser_Construct(); void TextureBrowser_Construct();