Fix shader loading #26
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes two issues: - Load the Linux shader assetbundle instead of the OSX version on Linux - The new assetbundle from #24 contain files other than the shaders - both intended (the new .cginc files), and a few unintended ones (in a folder named b9, there are .obj and .mat files). For the former, fix the exception that occured when trying to load those files as shaders. For the latter, the assetbundles should be recompiled without those files.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes two issues:
.cgincfiles), and a few unintended ones (in a folder named b9, there are.objand.matfiles). For the former, fix the exception that occured when trying to load those files as shaders. For the latter, the assetbundles should be recompiled without those files.