added reset functionality to Camera
Merge branch 'master' into bhagya
Geodes cannot have shaders and materials enabled at the same time.
changes
Merge branch 'master' into bhagya