summaryrefslogtreecommitdiffstats
path: root/scene/2d/animated_sprite_2d.cpp
diff options
context:
space:
mode:
authorArrowInAKnee <gatexxl@gmail.com>2020-05-14 23:59:27 +0300
committerArrowInAKnee <gatexxl@gmail.com>2020-05-16 16:07:42 +0300
commit9fc2b0fddcaeee3085e42512d7df5c39aec1368c (patch)
treeafa029449af8f9b1aba62f34467a9cc62b7b14bc /scene/2d/animated_sprite_2d.cpp
parent00949f0c5fcc6a4f8382a4a97d5591fd9ec380f8 (diff)
downloadredot-engine-9fc2b0fddcaeee3085e42512d7df5c39aec1368c.tar.gz
Update all get_configuration_warning to retrieve warnings from the parent
Diffstat (limited to 'scene/2d/animated_sprite_2d.cpp')
-rw-r--r--scene/2d/animated_sprite_2d.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/scene/2d/animated_sprite_2d.cpp b/scene/2d/animated_sprite_2d.cpp
index 3268544519..b3370863e1 100644
--- a/scene/2d/animated_sprite_2d.cpp
+++ b/scene/2d/animated_sprite_2d.cpp
@@ -660,11 +660,16 @@ StringName AnimatedSprite2D::get_animation() const {
}
String AnimatedSprite2D::get_configuration_warning() const {
+ String warning = Node2D::get_configuration_warning();
+
if (frames.is_null()) {
- return TTR("A SpriteFrames resource must be created or set in the \"Frames\" property in order for AnimatedSprite to display frames.");
+ if (!warning.empty()) {
+ warning += "\n\n";
+ }
+ warning += TTR("A SpriteFrames resource must be created or set in the \"Frames\" property in order for AnimatedSprite to display frames.");
}
- return String();
+ return warning;
}
void AnimatedSprite2D::set_specular_color(const Color &p_color) {