]> git.leopard-lacewing.eu Git - cgue_weave.git/commit
Merge branch 'Lighting' of git-cgue@lva.cg.tuwien.ac.at:Weave
authorLockedLunatic <locked.lunatic@aon.at>
Sat, 9 May 2015 23:01:15 +0000 (01:01 +0200)
committerLockedLunatic <locked.lunatic@aon.at>
Sat, 9 May 2015 23:01:15 +0000 (01:01 +0200)
commit2f19ea8b446176723fd5dfc360c056d5441f709a
treea2f4eb98e9b82164431d5fb95b3c5a99c97ee4e8
parent3dd07ee4b66d821ed5489eca68486102b462539a
parentb89c974c7cf173422a8f7a109a024b1ed9d8825d
Merge branch 'Lighting' of git-cgue@lva.cg.tuwien.ac.at:Weave

Conflicts:
shader/lightingTexture_FS.hlsl