fix material resource loader#2268
Merged
slimbuck merged 1 commit intoplaycanvas:masterfrom Jul 10, 2020
Merged
Conversation
mvaligursky
approved these changes
Jul 10, 2020
TheJonRobinson
added a commit
to Mojiworks/playcanvas-engine
that referenced
this pull request
Jul 15, 2020
* mojiworks/pr/sound-stop-typing: (112 commits) fix: SoundComponent.stop's string parameter is optional [RELEASE] v1.32.0 [Fix] Changes to Attribute to location mapping (playcanvas#2292) Deprecate pc.makeArray (playcanvas#2289) [FIX] API ref docs for pc.Mesh#getIndices (playcanvas#2291) fix cubemap filtering on safari (playcanvas#2288) disable ImageBitmap (playcanvas#2286) [Fix] Fix to texture based skinning on Safari (playcanvas#2287) fix cubemap dependent loads (playcanvas#2285) [Fix] Update to Transform Feedback to work with VAOs (playcanvas#2284) Update the anim state graph to support the new data schema (playcanvas#2278) Remove viewer (playcanvas#2282) [FIX] pc.SoundComponent#resume/stop param type (playcanvas#2281) Remove type function (playcanvas#2273) Remove some shader-related circular dependencies (playcanvas#2274) Glb-parser improvements (playcanvas#2275) Fix glb-parser normals generation (playcanvas#2276) Glb texture coordinate fix (playcanvas#2252) use faces if the asset was previously unloaded (playcanvas#2272) fix material resource loader (playcanvas#2268) ... # Conflicts: # src/scene/graph-node.js
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 #2262
The material handler checks for the presence of the cubemap faces but should instead be checking the asset.loaded flag.
I confirm I have signed the Contributor License Agreement.