No reason to change that...
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
More debugging of the FBXReader in order to understand how to interpret the material fields
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
hack a separate emissive information in the g-buffer
hack a separate emissive information in the g-buffer
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
fixing the bug when lighmaps are diasppearing in the <apartment>, i don;t understand why
Merge pull request #3873 from samcake/tot

Fix lighmaps for VC demo 12/1/2014