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 branch 'develop' of https://github.com/openframeworks/openFrameworks
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
ofxOscSender: send ofParameters only if they are serializable
Merge branch 'master' of github.com:openframeworks/openFrameworks
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofSystemUtils linux: fix dialogs when gst main loop is running
Merge branch 'master' of github.com:openframeworks/openFrameworks
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofxGui: fix unregister events on destruction. Closes #2594
bind defaultShader in setup() for RPi/GLProgrammable

This fixes an issue in the Programmable GL Renderer where RPi would not have the default shader bound when a drawing call was issued in update().

Fixes issue #2593

Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>