diff options
author | ArrowInAKnee <gatexxl@gmail.com> | 2020-05-14 23:59:27 +0300 |
---|---|---|
committer | ArrowInAKnee <gatexxl@gmail.com> | 2020-05-16 16:07:42 +0300 |
commit | 9fc2b0fddcaeee3085e42512d7df5c39aec1368c (patch) | |
tree | afa029449af8f9b1aba62f34467a9cc62b7b14bc /scene/main/shader_globals_override.cpp | |
parent | 00949f0c5fcc6a4f8382a4a97d5591fd9ec380f8 (diff) |
Update all get_configuration_warning to retrieve warnings from the parent
Diffstat (limited to 'scene/main/shader_globals_override.cpp')
-rw-r--r-- | scene/main/shader_globals_override.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scene/main/shader_globals_override.cpp b/scene/main/shader_globals_override.cpp index 726dcb58de..86c08ca6e9 100644 --- a/scene/main/shader_globals_override.cpp +++ b/scene/main/shader_globals_override.cpp @@ -261,11 +261,16 @@ void ShaderGlobalsOverride::_notification(int p_what) { } String ShaderGlobalsOverride::get_configuration_warning() const { + String warning = Node::get_configuration_warning(); + if (!active) { - return TTR("ShaderGlobalsOverride is not active because another node of the same type is in the scene."); + if (!warning.empty()) { + warning += "\n\n"; + } + warning += TTR("ShaderGlobalsOverride is not active because another node of the same type is in the scene."); } - return String(); + return warning; } void ShaderGlobalsOverride::_bind_methods() { |