check if currentShader exists - prevents segfault
Merge pull request #2483 from jvcleave/bugfix-shader-null-check

check if currentShader exists - prevents segfault
Delete emptyExample.vcxproj.orig

Maybe created on rebasing/merging, not needed.
Merge branch 'master' of https://github.com/openframeworks/openFrameworks.git
Merge pull request #2486 from LeoColomb/patch-1

Delete emptyExample.vcxproj.orig
Merge branch 'master' of https://github.com/openframeworks/openFrameworks.git
Fix for issue 2490.
Merge pull request #2497 from bakercp/hotfix-2490

Fix for issue 2490.
Merge branch 'master' of https://github.com/openframeworks/openFrameworks.git