Fixed GLTF build errors #1141
Merged
Fixed GLTF build errors #1141
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
|
@HattMarris1 can you test and approve this for me please. Thanks. |
|
Will do |
|
@HattMarris1 do you approve? |
keveleigh
reviewed
Oct 12, 2017
| @@ -38,18 +38,16 @@ public class MotionControllerVisualizer : MonoBehaviour | |||
|
|
|||
| [Tooltip("This material will be used on the loaded glTF controller model. This does not affect the above overrides.")] | |||
| [SerializeField] | |||
| protected UnityEngine.Material GLTFMaterial; | |||
| protected Material GLTFMaterial; | |||
There was a problem hiding this comment.
This will break 2017.2 building when this change is merged back into the dev branch (or when master i updated to work with 2017.2) because there's a Material in the GLTF namespace as well. Likely, renaming it to GLTFMaterial is the best fix.
There was a problem hiding this comment.
I'll look into it and double check. Thanks for the heads up!
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 #1139