diff options
author | Juan Linietsky <reduzio@gmail.com> | 2018-05-17 18:02:16 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2018-05-17 18:03:05 -0300 |
commit | 4b5227ff7755aa19aa57452c49e9466252fcb4a0 (patch) | |
tree | 2adcced443c368d5d2ad2c71e2fae631af1e2411 /scene/3d | |
parent | 3183375135e7e9d7bdab2b318dd74f672ebda27d (diff) |
-Ability to open resources in the same window
-Plenty of fixes and improvements to new inspector
-Fixes that were needed to make inspector work better
Diffstat (limited to 'scene/3d')
-rw-r--r-- | scene/3d/scenario_fx.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scene/3d/scenario_fx.cpp b/scene/3d/scenario_fx.cpp index d5bff676cb..26cbfc0b11 100644 --- a/scene/3d/scenario_fx.cpp +++ b/scene/3d/scenario_fx.cpp @@ -93,9 +93,10 @@ String WorldEnvironment::get_configuration_warning() const { return TTR("Only one WorldEnvironment is allowed per scene (or set of instanced scenes)."); } - if (environment.is_valid() && get_viewport() && !get_viewport()->get_camera() && environment->get_background() != Environment::BG_CANVAS) { - return TTR("This WorldEnvironment is ignored. Either add a Camera (for 3D scenes) or set this environment's Background Mode to Canvas (for 2D scenes)."); - } + // Commenting this warning for now, I think it makes no sense. If anyone can figure out what its supposed to do, feedback welcome. Else it should be deprecated. + //if (environment.is_valid() && get_viewport() && !get_viewport()->get_camera() && environment->get_background() != Environment::BG_CANVAS) { + // return TTR("This WorldEnvironment is ignored. Either add a Camera (for 3D scenes) or set this environment's Background Mode to Canvas (for 2D scenes)."); + //} return String(); } |