Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-02-16 15:50:45 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #98951 from AThousandShips/fix_more_super_call

Browse Source 
Fix a few more super calls in `get_configuration_warnings` methods
This commit is contained in:
Thaddeus Crews 2024-11-12 09:27:33 -06:00
commit 0ad3181d14
No known key found for this signature in database
GPG Key ID: 62181B86FE9E5D84
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scene/2d/light_2d.cpp
View File

@ -418,7 +418,7 @@ Vector2 PointLight2D::get_texture_offset() const {
} }
PackedStringArray PointLight2D::get_configuration_warnings() const { PackedStringArray PointLight2D::get_configuration_warnings() const {
PackedStringArray warnings = Node2D::get_configuration_warnings(); PackedStringArray warnings = Light2D::get_configuration_warnings();
if (!texture.is_valid()) { if (!texture.is_valid()) {
warnings.push_back(RTR("A texture with the shape of the light must be supplied to the \"Texture\" property.")); warnings.push_back(RTR("A texture with the shape of the light must be supplied to the \"Texture\" property."));

2
scene/2d/physics/rigid_body_2d.cpp
View File

@ -641,7 +641,7 @@ void RigidBody2D::_notification(int p_what) {
PackedStringArray RigidBody2D::get_configuration_warnings() const { PackedStringArray RigidBody2D::get_configuration_warnings() const {
Transform2D t = get_transform(); Transform2D t = get_transform();
PackedStringArray warnings = CollisionObject2D::get_configuration_warnings(); PackedStringArray warnings = PhysicsBody2D::get_configuration_warnings();
if (ABS(t.columns[0].length() - 1.0) > 0.05 || ABS(t.columns[1].length() - 1.0) > 0.05) { if (ABS(t.columns[0].length() - 1.0) > 0.05 || ABS(t.columns[1].length() - 1.0) > 0.05) {
warnings.push_back(RTR("Size changes to RigidBody2D will be overridden by the physics engine when running.\nChange the size in children collision shapes instead.")); warnings.push_back(RTR("Size changes to RigidBody2D will be overridden by the physics engine when running.\nChange the size in children collision shapes instead."));

2
scene/3d/physics/rigid_body_3d.cpp
View File

@ -659,7 +659,7 @@ void RigidBody3D::_reload_physics_characteristics() {
} }
PackedStringArray RigidBody3D::get_configuration_warnings() const { PackedStringArray RigidBody3D::get_configuration_warnings() const {
PackedStringArray warnings = CollisionObject3D::get_configuration_warnings(); PackedStringArray warnings = PhysicsBody3D::get_configuration_warnings();
Vector3 scale = get_transform().get_basis().get_scale(); Vector3 scale = get_transform().get_basis().get_scale();
if (ABS(scale.x - 1.0) > 0.05 || ABS(scale.y - 1.0) > 0.05 || ABS(scale.z - 1.0) > 0.05) { if (ABS(scale.x - 1.0) > 0.05 || ABS(scale.y - 1.0) > 0.05 || ABS(scale.z - 1.0) > 0.05) {

14
scene/main/missing_node.cpp
View File

@ -84,17 +84,17 @@ bool MissingNode::is_recording_properties() const {
PackedStringArray MissingNode::get_configuration_warnings() const { PackedStringArray MissingNode::get_configuration_warnings() const {
// The mere existence of this node is warning. // The mere existence of this node is warning.
PackedStringArray ret; PackedStringArray warnings = Node::get_configuration_warnings();
if (!original_scene.is_empty()) { if (!original_scene.is_empty()) {
ret.push_back(vformat(RTR("This node was an instance of scene '%s', which was no longer available when this scene was loaded."), original_scene)); warnings.push_back(vformat(RTR("This node was an instance of scene '%s', which was no longer available when this scene was loaded."), original_scene));
ret.push_back(vformat(RTR("Saving current scene will discard instance and all its properties, including editable children edits (if existing)."))); warnings.push_back(vformat(RTR("Saving current scene will discard instance and all its properties, including editable children edits (if existing).")));
} else if (!original_class.is_empty()) { } else if (!original_class.is_empty()) {
ret.push_back(vformat(RTR("This node was saved as class type '%s', which was no longer available when this scene was loaded."), original_class)); warnings.push_back(vformat(RTR("This node was saved as class type '%s', which was no longer available when this scene was loaded."), original_class));
ret.push_back(RTR("Data from the original node is kept as a placeholder until this type of node is available again. It can hence be safely re-saved without risk of data loss.")); warnings.push_back(RTR("Data from the original node is kept as a placeholder until this type of node is available again. It can hence be safely re-saved without risk of data loss."));
} else { } else {
ret.push_back(RTR("Unrecognized missing node. Check scene dependency errors for details.")); warnings.push_back(RTR("Unrecognized missing node. Check scene dependency errors for details."));
} }
return ret; return warnings;
} }
void MissingNode::_bind_methods() { void MissingNode::_bind_methods() {