split particle rendering and shaders
Merge conflicts and shaders