diff options
| author | hurikhan <m4r10.5ch14ck@gmail.com> | 2015-01-11 08:06:31 +0800 |
|---|---|---|
| committer | hurikhan <m4r10.5ch14ck@gmail.com> | 2015-01-11 08:06:31 +0800 |
| commit | 291d7992ceae487a63dc2d6eb1ee2da7312017c5 (patch) | |
| tree | 6bd0489107fa33477ccc7e7553c79d3001fe433a /platform/android/globals/global_defaults.cpp | |
| parent | a8e3c5c0b7fb202bcceb06b9373b5b6a4ff8f9b8 (diff) | |
| parent | d30f4e52f654a26e14223a6ef9a946cc6282c0db (diff) | |
Merge branch 'master' into x11-fullscreen
Diffstat (limited to 'platform/android/globals/global_defaults.cpp')
| -rw-r--r-- | platform/android/globals/global_defaults.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/android/globals/global_defaults.cpp b/platform/android/globals/global_defaults.cpp index 84a586d22d..824a4e3606 100644 --- a/platform/android/globals/global_defaults.cpp +++ b/platform/android/globals/global_defaults.cpp @@ -10,5 +10,5 @@ void register_android_global_defaults() { GLOBAL_DEF("display.Android/driver","GLES2"); // GLOBAL_DEF("rasterizer.Android/trilinear_mipmap_filter",false); - Globals::get_singleton()->set_custom_property_info("display.Android/driver",PropertyInfo(Variant::STRING,"display.Android/driver",PROPERTY_HINT_ENUM,"GLES1,GLES2")); + Globals::get_singleton()->set_custom_property_info("display.Android/driver",PropertyInfo(Variant::STRING,"display.Android/driver",PROPERTY_HINT_ENUM,"GLES2")); } |