]> 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:17:06 +0000 (01:17 +0200)
committerLockedLunatic <locked.lunatic@aon.at>
Sat, 9 May 2015 23:17:06 +0000 (01:17 +0200)
commitcd2ec1b86f43f8305cf549e95e1a9c7435de64de
tree328906990fc98e61d006c2f270d42bb67e09864d
parentd68f2f7925fcb03b1f4a6b52ae35768b217dc562
parent58915c4fe4e1b473b962c0ba76944c0e3707afed
Merge branch 'Lighting' of git-cgue@lva.cg.tuwien.ac.at:Weave

Conflicts:
shader/basicTexture_VS.hlsl
shader/lightingTexture_FS.hlsl