Apply partial patch from jensverwiebe to tribox3_d.cc
Merge branch 'master' into merge_IrradianceCache