Merge remote-tracking branch 'origin/gles3' into gles3-on-master

Various merge conflicts have been fixed manually and some mistakes might have been made - time will tell :)
2017-01-02 21:38:20 +01:00
parent db46a34418 2820b2d82b
commit 3f3f5a5359
287 changed files with 59481 additions and 17904 deletions
--- a/modules/gridmap/config.py
+++ b/modules/gridmap/config.py
@ -1,7 +1,8 @@


 def can_build(platform):
-    return True
+    # FIXME: Disabled temporary for gles3 implementation
+    return False


 def configure(env):