This repository has been archived by the owner on Apr 18, 2022. It is now read-only.
fix: TexturePrefab had code that was unreachable, not marked as such.… #1020
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
Moxinilian
approved these changes
Oct 12, 2018
AnneKitsune
approved these changes
Oct 12, 2018
Xaeroxe
approved these changes
Oct 12, 2018
|
Since there's a bug fix included, do you mind adding a changelog entry? :) |
|
I'll get to it tonight yeah |
Rhuagh
force-pushed
the
fix/texture-prefab
branch
from
61c8da5
to
f79b346
Compare
|
bors r=jojolepro,torkleyy |
Merge conflict (retrying...) |
Merge conflict |
|
bors r=jojolepro,torkleyy |
Merge conflict |
|
Changelog fun again.. |
|
Yeah, I'll fix it in a bit |
… AssetPrefab should load files in load_sub_assets
Rhuagh
force-pushed
the
fix/texture-prefab
branch
from
f79b346
to
1b2b815
Compare
|
bors r=jojolepro,torkleyy |
bors bot
added a commit
that referenced
this pull request
Oct 14, 2018
1020: fix: TexturePrefab had code that was unreachable, not marked as such.… r=jojolepro,torkleyy a=Rhuagh And AssetPrefab should load files in load_sub_assets, not in add_to_entity. Fixes #979. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/amethyst/amethyst/1020) <!-- Reviewable:end --> Co-authored-by: Simon Rönnberg <seamonr@gmail.com>
Build succeeded |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
And AssetPrefab should load files in load_sub_assets, not in add_to_entity.
Fixes #979.
This change is