screencap
merged conflicts
pulled from finished KD tree
changed param for photons
added textures
pulled for perf analysis