summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-08-11 10:39:12 +0200
committerGitHub <noreply@github.com>2017-08-11 10:39:12 +0200
commitb47e6c0dba0fb89aabedae204c247c747f99b87b (patch)
treecec33b968a39f592cddfffde94f072d56b05c8ec /scene
parentf67a8d715c7bfd98b0b1422678c8fd5e593a145c (diff)
parent141aac48ffe30b1e27d60ab800e286bc56899b93 (diff)
Merge pull request #10194 from Keetz/update-default-values
Updated default values in SpatialMaterial and Environment
Diffstat (limited to 'scene')
-rw-r--r--scene/resources/environment.cpp2
-rw-r--r--scene/resources/material.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/scene/resources/environment.cpp b/scene/resources/environment.cpp
index 3245c3cf03..c121dae1f1 100644
--- a/scene/resources/environment.cpp
+++ b/scene/resources/environment.cpp
@@ -1140,7 +1140,7 @@ Environment::Environment() {
bg_energy = 1.0;
bg_canvas_max_layer = 0;
ambient_energy = 1.0;
- ambient_sky_contribution = 0;
+ ambient_sky_contribution = 1.0;
tone_mapper = TONE_MAPPER_LINEAR;
tonemap_exposure = 1.0;
diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp
index a88f7cc049..bc23a41ede 100644
--- a/scene/resources/material.cpp
+++ b/scene/resources/material.cpp
@@ -1805,10 +1805,10 @@ SpatialMaterial::SpatialMaterial()
: element(this) {
//initialize to right values
- set_albedo(Color(0.7, 0.7, 0.7, 1.0));
+ set_albedo(Color(1.0, 1.0, 1.0, 1.0));
set_specular(0.5);
set_roughness(0.0);
- set_metallic(0.1);
+ set_metallic(0.0);
set_emission(Color(0, 0, 0));
set_emission_energy(1.0);
set_normal_scale(1);