summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2018-06-21 08:35:28 +0200
committerGitHub <noreply@github.com>2018-06-21 08:35:28 +0200
commit0254616c37767aadec4bcbd1863313961ed820fb (patch)
tree08015510ea889c137513df8d653e7828eea31f93 /editor
parenta9acdd84b7a6fd074f21d500a64976326f6cbb67 (diff)
parent01b01209a3ec3da4df17b03d401560bb664772c6 (diff)
Merge pull request #19690 from rodolforg/fix-gltf-import-parameters
fix default glTF metallic & roughness factor values
Diffstat (limited to 'editor')
-rw-r--r--editor/import/editor_scene_importer_gltf.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/editor/import/editor_scene_importer_gltf.cpp b/editor/import/editor_scene_importer_gltf.cpp
index 07a4cf5884..777f757bb4 100644
--- a/editor/import/editor_scene_importer_gltf.cpp
+++ b/editor/import/editor_scene_importer_gltf.cpp
@@ -1256,12 +1256,15 @@ Error EditorSceneImporterGLTF::_parse_materials(GLTFState &state) {
}
if (mr.has("metallicFactor")) {
-
material->set_metallic(mr["metallicFactor"]);
+ } else {
+ material->set_metallic(1.0);
}
- if (mr.has("roughnessFactor")) {
+ if (mr.has("roughnessFactor")) {
material->set_roughness(mr["roughnessFactor"]);
+ } else {
+ material->set_roughness(1.0);
}
if (mr.has("metallicRoughnessTexture")) {