cutealien
07f17647d2
Merging r6405 through r6424 from trunk to ogl-es branch
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6425 dfc29bdd-3216-0410-991c-e03cc46cb475
2022-09-22 21:55:03 +00:00
cutealien
01920bf808
Fix compiler error caused by merge.
...
Thanks @ Maksym for report.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6152 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-11-04 23:32:24 +00:00
cutealien
8557a1f7e6
Merging r6140 through r6144 from trunk to ogl-es branch.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6145 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-11-02 22:26:23 +00:00
cutealien
2ae2a551a6
Merging r5975 through r6036 from trunk to ogl-es branch.
...
GLES drivers adapted, but only did make compile-tests.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6038 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-01-03 19:05:16 +00:00