oops, compiles on linux
Merge pull request #5274 from ricardoquesada/linux_glview_fixes

oops, compiles on linux
compiles on Windows
Template fixes
Merge pull request #5275 from ricardoquesada/compiles_on_win

Compiles on win