diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-11-22 22:53:57 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-11-22 22:53:57 +0300 |
| commit | db1f0e36163037c94857626be8ca20dd9ae5b168 (patch) | |
| tree | 4cea06b1da54a567746161265a3a2a32e12fa5e6 /source | |
| parent | c402a379a23af71aa5c21566967b75ab5c869e01 (diff) | |
Error out on Windows if driver does not support OpenGL 2.1 with an error
messagebox.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 1 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 5 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 3 | ||||
| -rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_ghost.cpp | 1 |
4 files changed, 0 insertions, 10 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 2662f368c32..4beeaa8bc3f 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -683,7 +683,6 @@ typedef enum eUserpref_UI_Flag2 { USER_KEEP_SESSION = (1 << 0), USER_REGION_OVERLAP = (1 << 1), USER_TRACKPAD_NATURAL = (1 << 2), - USER_OPENGL_NO_WARN_SUPPORT = (1 << 3) } eUserpref_UI_Flag2; /* Auto-Keying mode */ diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 11fb87fe68d..a61f6b909ad 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -3445,11 +3445,6 @@ static void rna_def_userdef_view(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Prompt Quit", "Ask for confirmation when quitting through the window close button"); - prop = RNA_def_property(srna, "use_gl_warn_support", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_negative_sdna(prop, NULL, "uiflag2", USER_OPENGL_NO_WARN_SUPPORT); - RNA_def_property_ui_text(prop, "Warn On Deprecated OpenGL", - "Pop up a warning when an old OpenGL version is detected"); - /* Toolbox click-hold delay */ prop = RNA_def_property(srna, "open_left_mouse_delay", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "tb_leftmouse"); diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 31998df90dd..9bb790cd925 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -404,9 +404,6 @@ static void wm_window_ghostwindow_add(wmWindowManager *wm, const char *title, wm glSettings.flags |= GHOST_glDebugContext; } - if (!(U.uiflag2 & USER_OPENGL_NO_WARN_SUPPORT)) - glSettings.flags |= GHOST_glWarnSupport; - wm_get_screensize(&scr_w, &scr_h); posy = (scr_h - win->posy - win->sizey); diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp index 137f4cd6bc8..eee53b775a9 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp @@ -457,7 +457,6 @@ int main(int argc, char** argv) initglobals(); - U.gameflags |= USER_DISABLE_VBO; // We load our own G.main, so free the one that initglobals() gives us BKE_main_free(G.main); G.main = NULL; |