first test example with ofShader allowing #pragma includes - check devApps/ShaderIncludeDev/ to see the example. currently only allows includes in shaders loaded as a file
ofShader support for #pragma includes, currenlty working only with shaders loading from files, includes from inside shaders keep the same path logic as ofShader::load and ofShader::setupShaderFromFile, i.e. it uses the OF data path..
ofShader support for #pragma includes, currenlty working only with shaders loading from files, includes from inside shaders keep the same path logic as ofShader::load and ofShader::setupShaderFromFile, i.e. it uses the OF data path..
ofShader support for #pragma includes, currenlty working only with shaders loading from files, includes from inside shaders keep the same path logic as ofShader::load and ofShader::setupShaderFromFile, i.e. it uses the OF data path..
ofShader support for #pragma includes, currenlty working only with shaders loading from files, includes from inside shaders keep the same path logic as ofShader::load and ofShader::setupShaderFromFile, i.e. it uses the OF data path..
ofShader support for #pragma includes is working with setupShaderFromSource and setupShaderFromFile
ofShader support for #pragma includes supports duplicate inclusion
ofShader support for #pragma includes supports duplicate inclusion
Merge pull request #1795 from chparsons/feature-shader-include

Feature shader include
merged ofShader parse for include feature
Merge branch 'master' of github.com:openframeworks/openFrameworks
Merge branch 'master' of github.com:openframeworks/openFrameworks
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofxGui: fix unregister events on destruction. Closes #2594
fixed depth issue with ios assimp example.
Merge pull request #2601 from julapy/ios-assimp-example-fix

fixed depth issue with ios assimp example.
Merge branch 'master' of github.com:openframeworks/openFrameworks
removes hyper-verbose glfw log messages. closes #2468
remove early, unnecessary ESC check
fixes #2549
fixed ofMaterial for opengl ES1

glGetMaterialfv on ES1 must only use GL_FRONT_AND_BACK,
so i've added a TARGET_OPENGLES guard that handles ES1.