Fix10/mtoon export/import #1167
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
Contributor
ousttrue
commented
Aug 24, 2021
ousttrue
commented
- export: null check
- import: texture の割り当て
* try による握りつぶしをやめて Error は失敗させる
Santarh
approved these changes
Aug 24, 2021
| @@ -14,163 +14,155 @@ public static class Vrm10MToonMaterialExporter | |||
|
|
|||
| public static bool TryExportMaterialAsMToon(Material src, ITextureExporter textureExporter, out glTFMaterial dst) | |||
| { | |||
| try | |||
| if (src.shader.name != MToon10Meta.UnityShaderName) | |||
There was a problem hiding this comment.
インデントズレにつき、このファイルの diff はここだけ
| @@ -217,6 +209,10 @@ public static void ExportTextureTransform(glTFTextureInfo textureInfo, Vector2 u | |||
|
|
|||
| public static void ExportTextureTransform(TextureInfo textureInfo, Vector2 unityScale, Vector2 unityOffset) | |||
| { | |||
| if (textureInfo == null) | |||
| { | |||
| return; | |||
| @@ -128,7 +128,7 @@ private static bool TryGetShadingShiftTexture(GltfData data, VRMC_materials_mtoo | |||
|
|
|||
| private static bool TryGetMatcapTexture(GltfData data, VRMC_materials_mtoon mToon, out (SubAssetKey, TextureDescriptor) pair) | |||
| { | |||
| return TryGetSRGBTexture(data, new Vrm10TextureInfo(mToon.ShadingShiftTexture), out pair); | |||
| return TryGetSRGBTexture(data, new Vrm10TextureInfo(mToon.MatcapTexture), out pair); | |||
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.