diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-28 22:11:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-28 22:11:09 +0200 |
| commit | 398d5bfb3f3e4fc3dc51dd1f756f0e087280c5d7 (patch) | |
| tree | ae18f33ac47a413e0f2fe0f3e05c03910206a2c7 | |
| parent | d664469ec72337c2ec31c2e0d5a3d82c30305b7c (diff) | |
| parent | 609ef89362a14d2a887fee3f4bc12f01543d2dcc (diff) | |
Merge pull request #10733 from tagcup/gltf_ao_metallic_chan
Fix the channels gltf importer uses for metallic and AO textures.
| -rw-r--r-- | editor/import/editor_scene_importer_gltf.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/editor/import/editor_scene_importer_gltf.cpp b/editor/import/editor_scene_importer_gltf.cpp index 1c42bcef8a..2f03e72851 100644 --- a/editor/import/editor_scene_importer_gltf.cpp +++ b/editor/import/editor_scene_importer_gltf.cpp @@ -1216,7 +1216,7 @@ Error EditorSceneImporterGLTF::_parse_materials(GLTFState &state) { if (bct.has("index")) { Ref<Texture> t = _get_texture(state, bct["index"]); material->set_texture(SpatialMaterial::TEXTURE_METALLIC, t); - material->set_metallic_texture_channel(SpatialMaterial::TEXTURE_CHANNEL_RED); + material->set_metallic_texture_channel(SpatialMaterial::TEXTURE_CHANNEL_BLUE); material->set_texture(SpatialMaterial::TEXTURE_ROUGHNESS, t); material->set_roughness_texture_channel(SpatialMaterial::TEXTURE_CHANNEL_GREEN); if (!mr.has("metallicFactor")) { @@ -1243,6 +1243,7 @@ Error EditorSceneImporterGLTF::_parse_materials(GLTFState &state) { Dictionary bct = d["occlusionTexture"]; if (bct.has("index")) { material->set_texture(SpatialMaterial::TEXTURE_AMBIENT_OCCLUSION, _get_texture(state, bct["index"])); + material->set_ao_texture_channel(SpatialMaterial::TEXTURE_CHANNEL_RED); material->set_feature(SpatialMaterial::FEATURE_AMBIENT_OCCLUSION, true); } } |