fix shader
Merge remote-tracking branch 'origin/prog' into Graph