Revert "Revert "Material fixes (PC)""

This reverts commit 57aaf3169b2c4c75d12a9f34f884210d96235e44.
Revert "Revert "Revert "Material fixes (PC)"""

This reverts commit 212dcda4d6221f5f19e4dcebcf158a1392ce5de6.
Revert "Revert "Material fixes (PC)""

This reverts commit 57aaf3169b2c4c75d12a9f34f884210d96235e44.
Revert "test2"

This reverts commit 52188618917d55f68d814a05054b799f503cc3f1.
Revert "test"

This reverts commit a6540e6d8326a5fa8ccf1cae341f98020d12e1ba.
Revert "Adding Shaders, restoring files (OSX)"

This reverts commit 7baa3b38e5a4f297a8c971b42a4271973c13565c.