Skip to content

Commit

Permalink
Merge pull request #1174 from ousttrue/fix10/VrmScriptedImporterEdito…
Browse files Browse the repository at this point in the history
…rGUI

[1.0] Vrm-1.0 の Texture 列挙を修正
  • Loading branch information
PoChang007 authored Aug 26, 2021
2 parents 916dbba + 72da28f commit cf0edf2
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public override void OnEnable()

var generator = new Vrm10MaterialDescriptorGenerator();
var materialKeys = m_result.Data.GLTF.materials.Select((x, i) => generator.Get(m_result.Data, i).SubAssetKey);
var textureKeys = new GltfTextureDescriptorGenerator(m_result.Data).Get().GetEnumerable().Select(x => x.SubAssetKey);
var textureKeys = new Vrm10TextureDescriptorGenerator(m_result.Data).Get().GetEnumerable().Select(x => x.SubAssetKey);
m_materialEditor = new RemapEditorMaterial(materialKeys.Concat(textureKeys), GetEditorMap, SetEditorMap);
m_vrmEditor = new RemapEditorVrm(new[] { VRM10Object.SubAssetKey }.Concat(EnumerateExpressinKeys(m_result.Vrm.Expressions)), GetEditorMap, SetEditorMap);
}
Expand Down

0 comments on commit cf0edf2

Please sign in to comment.