Minor delete unused code and small indent changes
Merge branch 'master' of H:\yafmaster\Core into merge_IrradianceCache
Merge branch 'merge_IrradianceCache' of H:\yafmaster\irradiancecache into merge_IrradianceCache