Skip to content

Commit

Permalink
Merge pull request godotengine#93353 from AThousandShips/config_warni…
Browse files Browse the repository at this point in the history
…ng_fix

Fix super call in various `get_configuration_warnings` methods
  • Loading branch information
akien-mga committed Sep 8, 2024
2 parents 73a0f6e + 9dc2313 commit 49b725d
Show file tree
Hide file tree
Showing 34 changed files with 36 additions and 36 deletions.
2 changes: 1 addition & 1 deletion scene/2d/canvas_modulate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ Color CanvasModulate::get_color() const {
}

PackedStringArray CanvasModulate::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = Node2D::get_configuration_warnings();

if (is_in_canvas && is_visible_in_tree()) {
List<Node *> nodes;
Expand Down
2 changes: 1 addition & 1 deletion scene/2d/light_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ Vector2 PointLight2D::get_texture_offset() const {
}

PackedStringArray PointLight2D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = Node2D::get_configuration_warnings();

if (!texture.is_valid()) {
warnings.push_back(RTR("A texture with the shape of the light must be supplied to the \"Texture\" property."));
Expand Down
2 changes: 1 addition & 1 deletion scene/2d/light_occluder_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ int LightOccluder2D::get_occluder_light_mask() const {
}

PackedStringArray LightOccluder2D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = Node2D::get_configuration_warnings();

if (!occluder_polygon.is_valid()) {
warnings.push_back(RTR("An occluder polygon must be set (or drawn) for this occluder to take effect."));
Expand Down
2 changes: 1 addition & 1 deletion scene/2d/navigation_link_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ void NavigationLink2D::set_travel_cost(real_t p_travel_cost) {
}

PackedStringArray NavigationLink2D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = Node2D::get_configuration_warnings();

if (start_position.is_equal_approx(end_position)) {
warnings.push_back(RTR("NavigationLink2D start position should be different than the end position to be useful."));
Expand Down
2 changes: 1 addition & 1 deletion scene/2d/parallax_layer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ void ParallaxLayer::set_base_offset_and_scale(const Point2 &p_offset, real_t p_s
}

PackedStringArray ParallaxLayer::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = Node2D::get_configuration_warnings();

if (!Object::cast_to<ParallaxBackground>(get_parent())) {
warnings.push_back(RTR("ParallaxLayer node only works when set as child of a ParallaxBackground node."));
Expand Down
2 changes: 1 addition & 1 deletion scene/2d/path_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ void PathFollow2D::_validate_property(PropertyInfo &p_property) const {
}

PackedStringArray PathFollow2D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = Node2D::get_configuration_warnings();

if (is_visible_in_tree() && is_inside_tree()) {
if (!Object::cast_to<Path2D>(get_parent())) {
Expand Down
2 changes: 1 addition & 1 deletion scene/2d/physics/collision_object_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ void CollisionObject2D::_update_pickable() {
}

PackedStringArray CollisionObject2D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = Node2D::get_configuration_warnings();

if (shapes.is_empty()) {
warnings.push_back(RTR("This node has no shape, so it can't collide or interact with other objects.\nConsider adding a CollisionShape2D or CollisionPolygon2D as a child to define its shape."));
Expand Down
2 changes: 1 addition & 1 deletion scene/2d/physics/collision_polygon_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ bool CollisionPolygon2D::_edit_is_selected_on_click(const Point2 &p_point, doubl
#endif

PackedStringArray CollisionPolygon2D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = Node2D::get_configuration_warnings();

if (!Object::cast_to<CollisionObject2D>(get_parent())) {
warnings.push_back(RTR("CollisionPolygon2D only serves to provide a collision shape to a CollisionObject2D derived node. Please only use it as a child of Area2D, StaticBody2D, RigidBody2D, CharacterBody2D, etc. to give them a shape."));
Expand Down
2 changes: 1 addition & 1 deletion scene/2d/physics/collision_shape_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ bool CollisionShape2D::_edit_is_selected_on_click(const Point2 &p_point, double
}

PackedStringArray CollisionShape2D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = Node2D::get_configuration_warnings();

CollisionObject2D *col_object = Object::cast_to<CollisionObject2D>(get_parent());
if (col_object == nullptr) {
Expand Down
2 changes: 1 addition & 1 deletion scene/2d/physics/physical_bone_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ void PhysicalBone2D::_find_joint_child() {
}

PackedStringArray PhysicalBone2D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = RigidBody2D::get_configuration_warnings();

if (!parent_skeleton) {
warnings.push_back(RTR("A PhysicalBone2D only works with a Skeleton2D or another PhysicalBone2D as a parent node!"));
Expand Down
2 changes: 1 addition & 1 deletion scene/2d/remote_transform_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ void RemoteTransform2D::force_update_cache() {
}

PackedStringArray RemoteTransform2D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = Node2D::get_configuration_warnings();

if (!has_node(remote_node) || !Object::cast_to<Node2D>(get_node(remote_node))) {
warnings.push_back(RTR("Path property must point to a valid Node2D node to work."));
Expand Down
2 changes: 1 addition & 1 deletion scene/2d/skeleton_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ int Bone2D::get_index_in_skeleton() const {
}

PackedStringArray Bone2D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = Node2D::get_configuration_warnings();
if (!skeleton) {
if (parent_bone) {
warnings.push_back(RTR("This Bone2D chain should end at a Skeleton2D node."));
Expand Down
2 changes: 1 addition & 1 deletion scene/2d/tile_map.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,7 @@ TypedArray<Vector2i> TileMap::get_surrounding_cells(const Vector2i &p_coords) {
}

PackedStringArray TileMap::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = Node2D::get_configuration_warnings();

warnings.push_back(RTR("The TileMap node is deprecated as it is superseded by the use of multiple TileMapLayer nodes.\nTo convert a TileMap to a set of TileMapLayer nodes, open the TileMap bottom panel with this node selected, click the toolbox icon in the top-right corner and choose \"Extract TileMap layers as individual TileMapLayer nodes\"."));

Expand Down
2 changes: 1 addition & 1 deletion scene/3d/decal.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ void Decal::_validate_property(PropertyInfo &p_property) const {
}

PackedStringArray Decal::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = VisualInstance3D::get_configuration_warnings();

if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") {
warnings.push_back(RTR("Decals are only available when using the Forward+ or Mobile rendering backends."));
Expand Down
2 changes: 1 addition & 1 deletion scene/3d/fog_volume.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ AABB FogVolume::get_aabb() const {
}

PackedStringArray FogVolume::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = VisualInstance3D::get_configuration_warnings();

Ref<Environment> environment = get_viewport()->find_world_3d()->get_environment();

Expand Down
2 changes: 1 addition & 1 deletion scene/3d/gpu_particles_collision_3d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ Ref<Image> GPUParticlesCollisionSDF3D::bake() {
}

PackedStringArray GPUParticlesCollisionSDF3D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = GPUParticlesCollision3D::get_configuration_warnings();

if (bake_mask == 0) {
warnings.push_back(RTR("The Bake Mask has no bits enabled, which means baking will not produce any collision for this GPUParticlesCollisionSDF3D.\nTo resolve this, enable at least one bit in the Bake Mask property."));
Expand Down
2 changes: 1 addition & 1 deletion scene/3d/lightmap_gi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1600,7 +1600,7 @@ Ref<CameraAttributes> LightmapGI::get_camera_attributes() const {
}

PackedStringArray LightmapGI::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = VisualInstance3D::get_configuration_warnings();

if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") {
warnings.push_back(RTR("Lightmap can only be baked from a device that supports the RD backends. Lightmap baking may fail."));
Expand Down
2 changes: 1 addition & 1 deletion scene/3d/navigation_link_3d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ void NavigationLink3D::set_travel_cost(real_t p_travel_cost) {
}

PackedStringArray NavigationLink3D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = Node3D::get_configuration_warnings();

if (start_position.is_equal_approx(end_position)) {
warnings.push_back(RTR("NavigationLink3D start position should be different than the end position to be useful."));
Expand Down
2 changes: 1 addition & 1 deletion scene/3d/navigation_region_3d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ bool NavigationRegion3D::is_baking() const {
}

PackedStringArray NavigationRegion3D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = Node3D::get_configuration_warnings();

if (is_visible_in_tree() && is_inside_tree()) {
if (!navigation_mesh.is_valid()) {
Expand Down
2 changes: 1 addition & 1 deletion scene/3d/occluder_instance_3d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@ OccluderInstance3D::BakeError OccluderInstance3D::bake_scene(Node *p_from_node,
}

PackedStringArray OccluderInstance3D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = VisualInstance3D::get_configuration_warnings();

if (!bool(GLOBAL_GET("rendering/occlusion_culling/use_occlusion_culling"))) {
warnings.push_back(RTR("Occlusion culling is disabled in the Project Settings, which means occlusion culling won't be performed in the root viewport.\nTo resolve this, open the Project Settings and enable Rendering > Occlusion Culling > Use Occlusion Culling."));
Expand Down
2 changes: 1 addition & 1 deletion scene/3d/path_3d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ void PathFollow3D::_validate_property(PropertyInfo &p_property) const {
}

PackedStringArray PathFollow3D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = Node3D::get_configuration_warnings();

if (is_visible_in_tree() && is_inside_tree()) {
if (!Object::cast_to<Path3D>(get_parent())) {
Expand Down
2 changes: 1 addition & 1 deletion scene/3d/physics/collision_object_3d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,7 @@ bool CollisionObject3D::get_capture_input_on_drag() const {
}

PackedStringArray CollisionObject3D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = Node3D::get_configuration_warnings();

if (shapes.is_empty()) {
warnings.push_back(RTR("This node has no shape, so it can't collide or interact with other objects.\nConsider adding a CollisionShape3D or CollisionPolygon3D as a child to define its shape."));
Expand Down
2 changes: 1 addition & 1 deletion scene/3d/physics/collision_polygon_3d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ void CollisionPolygon3D::set_margin(real_t p_margin) {
}

PackedStringArray CollisionPolygon3D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = Node3D::get_configuration_warnings();

if (!Object::cast_to<CollisionObject3D>(get_parent())) {
warnings.push_back(RTR("CollisionPolygon3D only serves to provide a collision shape to a CollisionObject3D derived node.\nPlease only use it as a child of Area3D, StaticBody3D, RigidBody3D, CharacterBody3D, etc. to give them a shape."));
Expand Down
2 changes: 1 addition & 1 deletion scene/3d/physics/collision_shape_3d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ void CollisionShape3D::resource_changed(Ref<Resource> res) {
#endif

PackedStringArray CollisionShape3D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = Node3D::get_configuration_warnings();

CollisionObject3D *col_object = Object::cast_to<CollisionObject3D>(get_parent());
if (col_object == nullptr) {
Expand Down
2 changes: 1 addition & 1 deletion scene/3d/physics/vehicle_body_3d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ void VehicleWheel3D::_notification(int p_what) {
}

PackedStringArray VehicleWheel3D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = Node3D::get_configuration_warnings();

if (!Object::cast_to<VehicleBody3D>(get_parent())) {
warnings.push_back(RTR("VehicleWheel3D serves to provide a wheel system to a VehicleBody3D. Please use it as a child of a VehicleBody3D."));
Expand Down
2 changes: 1 addition & 1 deletion scene/3d/remote_transform_3d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ void RemoteTransform3D::force_update_cache() {
}

PackedStringArray RemoteTransform3D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = Node3D::get_configuration_warnings();

if (!has_node(remote_node) || !Object::cast_to<Node3D>(get_node(remote_node))) {
warnings.push_back(RTR("The \"Remote Path\" property must point to a valid Node3D or Node3D-derived node to work."));
Expand Down
2 changes: 1 addition & 1 deletion scene/3d/soft_body_3d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ void SoftBody3D::_bind_methods() {
}

PackedStringArray SoftBody3D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = MeshInstance3D::get_configuration_warnings();

if (mesh.is_null()) {
warnings.push_back(RTR("This body will be ignored until you set a mesh."));
Expand Down
2 changes: 1 addition & 1 deletion scene/3d/visual_instance_3d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ bool GeometryInstance3D::is_ignoring_occlusion_culling() {
}

PackedStringArray GeometryInstance3D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = VisualInstance3D::get_configuration_warnings();

if (!Math::is_zero_approx(visibility_range_end) && visibility_range_end <= visibility_range_begin) {
warnings.push_back(RTR("The GeometryInstance3D visibility range's End distance is set to a non-zero value, but is lower than the Begin distance.\nThis means the GeometryInstance3D will never be visible.\nTo resolve this, set the End distance to 0 or to a value greater than the Begin distance."));
Expand Down
2 changes: 1 addition & 1 deletion scene/3d/voxel_gi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ AABB VoxelGI::get_aabb() const {
}

PackedStringArray VoxelGI::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = VisualInstance3D::get_configuration_warnings();

if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") {
warnings.push_back(RTR("VoxelGI nodes are not supported when using the GL Compatibility backend yet. Support will be added in a future release."));
Expand Down
6 changes: 3 additions & 3 deletions scene/3d/xr_nodes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ void XRCamera3D::_pose_changed(const Ref<XRPose> &p_pose) {
}

PackedStringArray XRCamera3D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = Camera3D::get_configuration_warnings();

if (is_visible() && is_inside_tree()) {
// Warn if the node has a parent which isn't an XROrigin3D!
Expand Down Expand Up @@ -461,7 +461,7 @@ XRNode3D::~XRNode3D() {
}

PackedStringArray XRNode3D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = Node3D::get_configuration_warnings();

if (is_visible() && is_inside_tree()) {
// Warn if the node has a parent which isn't an XROrigin3D!
Expand Down Expand Up @@ -644,7 +644,7 @@ Plane XRAnchor3D::get_plane() const {
Vector<XROrigin3D *> XROrigin3D::origin_nodes;

PackedStringArray XROrigin3D::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = Node3D::get_configuration_warnings();

if (is_visible() && is_inside_tree()) {
bool has_camera = false;
Expand Down
2 changes: 1 addition & 1 deletion scene/animation/animation_tree.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ uint64_t AnimationTree::get_last_process_pass() const {
}

PackedStringArray AnimationTree::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = AnimationMixer::get_configuration_warnings();
if (!root_animation_node.is_valid()) {
warnings.push_back(RTR("No root AnimationNode for the graph is set."));
}
Expand Down
2 changes: 1 addition & 1 deletion scene/gui/control.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ void Control::get_argument_options(const StringName &p_function, int p_idx, List

PackedStringArray Control::get_configuration_warnings() const {
ERR_READ_THREAD_GUARD_V(PackedStringArray());
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = CanvasItem::get_configuration_warnings();

if (data.mouse_filter == MOUSE_FILTER_IGNORE && !data.tooltip.is_empty()) {
warnings.push_back(RTR("The Hint Tooltip won't be displayed as the control's Mouse Filter is set to \"Ignore\". To solve this, set the Mouse Filter to \"Stop\" or \"Pass\"."));
Expand Down
2 changes: 1 addition & 1 deletion scene/gui/range.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include "range.h"

PackedStringArray Range::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = Control::get_configuration_warnings();

if (shared->exp_ratio && shared->min <= 0) {
warnings.push_back(RTR("If \"Exp Edit\" is enabled, \"Min Value\" must be greater than 0."));
Expand Down
2 changes: 1 addition & 1 deletion scene/gui/subviewport_container.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ void SubViewportContainer::remove_child_notify(Node *p_child) {
}

PackedStringArray SubViewportContainer::get_configuration_warnings() const {
PackedStringArray warnings = Node::get_configuration_warnings();
PackedStringArray warnings = Container::get_configuration_warnings();

bool has_viewport = false;
for (int i = 0; i < get_child_count(); i++) {
Expand Down

0 comments on commit 49b725d

Please sign in to comment.