summaryrefslogtreecommitdiff
path: root/editor/import
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2018-04-07 16:19:11 -0300
committerGitHub <noreply@github.com>2018-04-07 16:19:11 -0300
commit829c455a485b38462ef470e76011789665234aa1 (patch)
tree9cf6a59f9ebfbc3d48d1d56f9e0171c9d07b1af9 /editor/import
parent440b7a969042bd1ecd51169f009eef0076cd98c0 (diff)
parent0812468d0508f04a3890054774668391b27759a4 (diff)
Merge pull request #17840 from Dimonasdf/master
Fix Collada material roughness import function
Diffstat (limited to 'editor/import')
-rw-r--r--editor/import/editor_import_collada.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/import/editor_import_collada.cpp b/editor/import/editor_import_collada.cpp
index 863b13cbd7..c1e897a04c 100644
--- a/editor/import/editor_import_collada.cpp
+++ b/editor/import/editor_import_collada.cpp
@@ -480,7 +480,7 @@ Error ColladaImport::_create_material(const String &p_target) {
}
}
- float roughness = Math::sqrt(1.0 - ((Math::log(effect.shininess) / Math::log(2.0)) / 8.0)); //not very right..
+ float roughness = (effect.shininess - 1.0) / 510;
material->set_roughness(roughness);
if (effect.double_sided) {