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
Add .gitattributes file to better deal with line endings.
ofxOscSender: send ofParameters only if they are serializable
texture cache fix for ofxiOSVideoPlayer

ofTexture now supports using external texture IDs with this method,
setUseExternalTextureID
this PR updates ofxiOSVideoPlayer to work with this new method.
Normalize line endings. Leave external libraries untouched.
Merge branch 'master' into add-gitattributes
Merge pull request #2510 from bilderbuchi/add-gitattributes

Add .gitattributes file
Merge pull request #2558 from julapy/ios-video-texture-cache-fix

texture cache fix for ofxiOSVideoPlayer
ES3 + xcode5 fix for missing GL_STENCIL_INDEX

ES2 and ES3 gl header files no longer include GL_STENCIL_INDEX.
it has now been replaced with GL_STENCIL_INDEX8.
removed semicolon