Fixes for latest blender version
Moved shaders around preparing for new style bsdf()