godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-15 13:51:40 +00:00
Code Releases Wiki Activity

Merge pull request #33987 from nekomatata/own-world-environment

Browse Source 
Viewport environment is updated properly when set to own world
This commit is contained in:
Rémi Verschelde
2020-01-06 15:26:52 +01:00
committed by GitHub
parent f5d1177fcb dc13750189
commit ce75a2f33d
3 changed files with 61 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scene/resources/world.cpp
View File

@@ -268,12 +268,17 @@ RID World::get_scenario() const {
}
void World::set_environment(const Ref<Environment> &p_environment) {
if (environment == p_environment) {
return;
}
environment = p_environment;
if (environment.is_valid())
VS::get_singleton()->scenario_set_environment(scenario, environment->get_rid());
else
VS::get_singleton()->scenario_set_environment(scenario, RID());
emit_changed();
}
Ref<Environment> World::get_environment() const {
@@ -282,12 +287,17 @@ Ref<Environment> World::get_environment() const {
}
void World::set_fallback_environment(const Ref<Environment> &p_environment) {
if (fallback_environment == p_environment) {
return;
}
fallback_environment = p_environment;
if (fallback_environment.is_valid())
VS::get_singleton()->scenario_set_fallback_environment(scenario, p_environment->get_rid());
else
VS::get_singleton()->scenario_set_fallback_environment(scenario, RID());
emit_changed();
}
Ref<Environment> World::get_fallback_environment() const {