Moved ScneeStringNames and PropertyUtils into scene/main.

core/math/a_star.cpp

@@ -32,7 +32,7 @@
 
 #include "core/math/geometry.h"
 #include "core/object/script_language.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 
 int AStar::get_available_point_id() const {
 	if (points.has(last_free_id)) {

editor/editor_inspector.cpp

@@ -62,7 +62,7 @@
 #include "scene/gui/scroll_bar.h"
 #include "scene/main/node.h"
 #include "scene/main/scene_tree.h"
-#include "scene/property_utils.h"
+#include "scene/main/property_utils.h"
 #include "scene/resources/font/font.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/style_box.h"

editor/plugins/animation_tree_editor_plugin.cpp

@@ -37,7 +37,7 @@
 #include "editor/editor_scale.h"
 #include "scene/animation/animation_blend_tree.h"
 #include "scene/animation/animation_player.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 #include "core/object/class_db.h"
 #include "core/error/error_macros.h"
 #include "core/containers/list.h"

editor/plugins/packed_scene_editor_plugin.cpp

@@ -33,7 +33,7 @@
 #include "editor/editor_node.h"
 #include "scene/gui/button.h"
 #include "scene/resources/packed_scene.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 
 void PackedSceneEditor::_on_open_scene_pressed() {
 	// Using deferred call because changing scene updates the Inspector and thus destroys this plugin.

editor/scene_tree_dock.cpp

@@ -91,7 +91,7 @@
 #include "scene/main/node.h"
 #include "scene/main/scene_tree.h"
 #include "scene/main/viewport.h"
-#include "scene/property_utils.h"
+#include "scene/main/property_utils.h"
 #include "scene/animation/animation.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/texture.h"

editor_modules/editor_code_editor/editor_script_editor.cpp

@@ -89,7 +89,7 @@
 #include "scene/main/viewport.h"
 #include "scene/resources/text_file.h"
 #include "scene/resources/texture.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 
 #include "editor_script_editor_quick_open.h"
 #include "editor_script_text_editor.h"

editor_modules/editor_code_editor/script_editor_plugin.cpp

@@ -88,7 +88,7 @@
 #include "scene/main/viewport.h"
 #include "scene/resources/text_file.h"
 #include "scene/resources/texture.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 
 #include "editor_script_editor_quick_open.h"
 #include "editor_script_text_editor.h"

modules/gridmap/grid_map.cpp

@@ -37,7 +37,7 @@
 #include "scene/resources/physics_material.h"
 #include "scene/resources/mesh/primitive_meshes.h"
 #include "scene/resources/mesh/surface_tool.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 #include "servers/navigation_server.h"
 #include "servers/rendering_server.h"
 

modules/paint/nodes/curve_2d/paint_curve_2d.cpp

@@ -32,7 +32,7 @@
 
 #include "core/config/engine.h"
 #include "scene/resources/curve.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/editor_scale.h"

modules/skeleton_2d/nodes/skeleton_2d.cpp

@@ -33,7 +33,7 @@
 #include "../resources/skeleton_modification_2d.h"
 #include "../resources/skeleton_modification_stack_2d.h"
 #include "core/config/engine.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/editor_data.h"

modules/skeleton_3d/nodes/physical_bone.cpp

@@ -38,7 +38,7 @@
 #include "core/config/project_settings.h"
 #include "core/containers/rid.h"
 #include "scene/resources/physics_material.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 #include "skeleton.h"
 
 #ifdef TOOLS_ENABLED

modules/skeleton_3d/nodes/skeleton.cpp

@@ -39,7 +39,7 @@
 #include "core/config/project_settings.h"
 #include "physical_bone.h"
 #include "scene/resources/mesh/surface_tool.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 
 void SkinReference::_skin_changed() {
 	if (skeleton_node) {

scene/2d/animated_sprite.cpp

@@ -32,7 +32,7 @@
 
 #include "core/os/os.h"
 #include "scene/resources/texture.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/editor_settings.h"

scene/2d/area_2d.cpp

@@ -30,7 +30,7 @@
 
 #include "area_2d.h"
 #include "scene/resources/world_3d.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 #include "servers/audio_server.h"
 #include "servers/physics_2d_server.h"
 

scene/2d/camera_2d.cpp

@@ -33,7 +33,7 @@
 #include "core/config/engine.h"
 #include "core/math/math_funcs.h"
 #include "scene/main/viewport.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 #include "servers/rendering_server.h"
 
 void Camera2D::_update_scroll() {

scene/2d/collision_object_2d.cpp

@@ -31,7 +31,7 @@
 #include "collision_object_2d.h"
 
 #include "scene/resources/world_2d.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 #include "servers/physics_2d_server.h"
 
 void CollisionObject2D::_notification(int p_what) {

scene/2d/joints_2d.cpp

@@ -32,7 +32,7 @@
 
 #include "core/config/engine.h"
 #include "physics_body_2d.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 #include "servers/physics_2d_server.h"
 
 void Joint2D::_disconnect_signals() {

scene/2d/path_2d.cpp

@@ -32,7 +32,7 @@
 
 #include "core/config/engine.h"
 #include "scene/resources/curve.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/editor_scale.h"

scene/2d/physics_body_2d.cpp

@@ -39,7 +39,7 @@
 #include "core/config/project_settings.h"
 #include "core/containers/rid.h"
 #include "scene/resources/physics_material.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 #include "servers/physics_2d_server.h"
 
 void PhysicsBody2D::_notification(int p_what) {

scene/2d/remote_transform_2d.cpp

@@ -29,7 +29,7 @@
 /*************************************************************************/
 
 #include "remote_transform_2d.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 
 void RemoteTransform2D::_update_cache() {
 	cache = 0;

scene/2d/sprite.cpp

@@ -33,7 +33,7 @@
 #include "core/os/os.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/texture.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 
 #ifdef TOOLS_ENABLED
 Dictionary Sprite::_edit_get_state() const {

scene/2d/touch_screen_button.cpp

@@ -36,7 +36,7 @@
 #include "scene/resources/bit_map.h"
 #include "scene/resources/shapes_2d/rectangle_shape_2d.h"
 #include "scene/resources/texture.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 
 void TouchScreenButton::set_texture(const Ref<Texture> &p_texture) {
 	if (texture == p_texture) {

scene/2d/visibility_notifier_2d.cpp

@@ -37,7 +37,7 @@
 #include "scene/main/viewport.h"
 #include "scene/main/world.h"
 #include "scene/resources/world_2d.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 
 #ifdef TOOLS_ENABLED
 Rect2 VisibilityNotifier2D::_edit_get_rect() const {

scene/3d/area.cpp

@@ -30,7 +30,7 @@
 
 #include "area.h"
 #include "scene/resources/shapes/shape.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 #include "servers/audio_server.h"
 #include "servers/physics_server.h"
 

scene/3d/collision_object.cpp

@@ -34,7 +34,7 @@
 #include "mesh_instance.h"
 #include "scene/resources/mesh/mesh.h"
 #include "scene/resources/world_3d.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 #include "servers/physics_server.h"
 
 void CollisionObject::_notification(int p_what) {

scene/3d/label_3d.cpp

@@ -33,7 +33,7 @@
 #include "core/core_string_names.h"
 #include "scene/resources/mesh/primitive_meshes.h"
 #include "scene/resources/theme.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 
 void Label3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_horizontal_alignment", "alignment"), &Label3D::set_horizontal_alignment);

scene/3d/mesh_instance.cpp

@@ -36,7 +36,7 @@
 #include "physics_body.h"
 #include "scene/resources/material/material.h"
 #include "scene/resources/mesh/mesh.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 #include "servers/rendering/rendering_server_globals.h"
 
 #include "modules/modules_enabled.gen.h"

scene/3d/path.cpp

@@ -34,7 +34,7 @@
 #include "scene/resources/curve.h"
 #include "scene/resources/mesh/mesh.h"
 #include "scene/resources/world_3d.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 #include "servers/rendering_server.h"
 
 Path::Path() {

scene/3d/physics_body.cpp

@@ -38,7 +38,7 @@
 #include "core/object/method_bind_ext.gen.inc"
 #include "core/object/object.h"
 #include "scene/resources/physics_material.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 //#include "skeleton.h"
 
 #ifdef TOOLS_ENABLED

scene/3d/physics_joint.cpp

@@ -32,7 +32,7 @@
 
 #include "scene/3d/physics_body.h"
 #include "scene/resources/shapes/shape.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 
 void Joint::_disconnect_signals() {
 	Node *node_a = get_node_or_null(a);

scene/3d/sprite_3d.cpp

@@ -32,7 +32,7 @@
 #include "core/core_string_names.h"
 #include "core/math/triangle_mesh.h"
 #include "scene/2d/animated_sprite.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/editor_settings.h"

scene/3d/visibility_notifier.cpp

@@ -37,7 +37,7 @@
 #include "scene/animation/animation_tree.h"
 #include "scene/resources/shapes/shape.h"
 #include "scene/resources/world_3d.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 
 void VisibilityNotifier::_enter_camera(Camera *p_camera) {
 	ERR_FAIL_COND(cameras.has(p_camera));

scene/3d/visual_instance.cpp

@@ -32,7 +32,7 @@
 
 #include "scene/resources/material/material.h"
 #include "scene/resources/world_3d.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 #include "servers/rendering_server.h"
 //#include "skeleton.h"
 

scene/animation/animation.cpp

@@ -29,7 +29,7 @@
 /*************************************************************************/
 
 #include "animation.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 
 #include "core/math/geometry.h"
 

scene/animation/animation_blend_tree.cpp

@@ -31,7 +31,7 @@
 #include "animation_blend_tree.h"
 
 #include "scene/animation/animation_player.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 
 void AnimationNodeAnimation::set_animation(const StringName &p_name) {
 	animation = p_name;

scene/animation/animation_player.cpp

@@ -35,7 +35,7 @@
 #include "scene/main/node_2d.h"
 #include "scene/main/spatial.h"
 #include "scene/animation/animation.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 #include "servers/audio/audio_stream.h"
 
 #ifdef MODULE_SKELETON_3D_ENABLED

scene/animation/animation_tree.cpp

@@ -35,7 +35,7 @@
 #include "core/config/engine.h"
 #include "core/object/method_bind_ext.gen.inc"
 #include "scene/main/spatial.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 #include "servers/audio/audio_stream.h"
 
 #ifdef MODULE_SKELETON_3D_ENABLED

scene/animation/scene_tree_tween.cpp

@@ -33,7 +33,7 @@
 #include "core/object/method_bind_ext.gen.inc"
 #include "scene/animation/tween.h"
 #include "scene/main/node.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 
 void Tweener::set_tween(Ref<SceneTreeTween> p_tween) {
 	tween = p_tween;

scene/gui/base_button.cpp

@@ -33,7 +33,7 @@
 #include "core/input/shortcut.h"
 #include "core/os/keyboard.h"
 #include "scene/main/viewport.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 
 void BaseButton::_unpress_group() {
 	if (!button_group.is_valid()) {

scene/gui/button.cpp

@@ -32,7 +32,7 @@
 
 #include "core/string/translation.h"
 #include "servers/rendering_server.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 
 Size2 Button::get_minimum_size() const {
 	Size2 minsize = get_theme_font("font")->total_size_of_lines(xl_text.split("\n"));

scene/gui/container.cpp

@@ -30,7 +30,7 @@
 
 #include "container.h"
 #include "core/object/message_queue.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 
 void Container::_child_minsize_changed() {
 	//Size2 ms = get_combined_minimum_size();

scene/gui/rich_text_label.cpp

@@ -35,7 +35,7 @@
 #include "core/os/os.h"
 #include "label.h"
 #include "scene/gui/scroll_bar.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/editor_scale.h"

scene/gui/texture_button.cpp

@@ -32,7 +32,7 @@
 
 #include "core/typedefs.h"
 #include "scene/resources/bit_map.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 
 #include <stdlib.h>
 

scene/gui/video_player.cpp

@@ -29,7 +29,7 @@
 /*************************************************************************/
 
 #include "video_player.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 
 #include "core/os/os.h"
 #include "servers/audio_server.h"

scene/main/canvas_item.cpp

@@ -40,7 +40,7 @@
 #include "scene/resources/texture.h"
 #include "scene/resources/world_2d.h"
 #include "scene/resources/world_3d.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 #include "servers/rendering/rendering_server_constants.h"
 #include "servers/rendering/rendering_server_raster.h"
 #include "servers/rendering_server.h"

scene/main/canvas_layer.cpp

@@ -31,7 +31,7 @@
 #include "canvas_layer.h"
 #include "scene/main/canvas_item.h"
 #include "scene/resources/world_2d.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 #include "viewport.h"
 
 void CanvasLayer::set_layer(int p_xform) {

scene/main/control.cpp

@@ -42,7 +42,7 @@
 #include "scene/main/node.h"
 #include "scene/main/timer.h"
 #include "scene/main/viewport.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 #include "servers/rendering_server.h"
 
 #ifdef TOOLS_ENABLED

scene/main/node.cpp

@@ -38,7 +38,7 @@
 #include "process_group.h"
 #include "scene/animation/scene_tree_tween.h"
 #include "scene/resources/packed_scene.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 #include "viewport.h"
 #include "world.h"
 

scene/main/node_2d.cpp

@@ -33,7 +33,7 @@
 #include "core/object/message_queue.h"
 #include "scene/main/control.h"
 #include "scene/main/viewport.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 #include "servers/rendering_server.h"
 
 #ifdef TOOLS_ENABLED

scene/main/scene_tree.cpp

@@ -50,7 +50,7 @@
 #include "scene/resources/material/material.h"
 #include "scene/resources/mesh/mesh.h"
 #include "scene/resources/packed_scene.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 #include "servers/audio_server.h"
 #include "servers/navigation_server.h"
 #include "servers/physics_2d_server.h"

scene/main/spatial.cpp

@@ -36,7 +36,7 @@
 #include "scene/main/scene_tree.h"
 #include "scene/main/world.h"
 #include "scene/resources/world_3d.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 #include "servers/rendering_server_callbacks.h"
 
 /*

scene/main/viewport.cpp

@@ -55,7 +55,7 @@
 #include "scene/resources/mesh/mesh.h"
 #include "scene/resources/world_2d.h"
 #include "scene/resources/world_3d.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 #include "servers/physics_2d_server.h"
 
 void ViewportTexture::setup_local_to_scene() {

scene/register_scene_types.cpp

@@ -183,7 +183,7 @@
 #include "scene/resources/video_stream.h"
 #include "scene/resources/world_2d.h"
 #include "scene/resources/world_3d.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 
 #ifndef _3D_DISABLED
 #include "scene/3d/area.h"

scene/resources/material/material.cpp

@@ -40,7 +40,7 @@
 #include "editor/editor_settings.h"
 #endif
 
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 
 void Material::set_next_pass(const Ref<Material> &p_pass) {
 	for (Ref<Material> pass_child = p_pass; pass_child != nullptr; pass_child = pass_child->get_next_pass()) {

scene/resources/packed_scene.cpp

@@ -40,7 +40,7 @@
 #include "scene/main/control.h"
 #include "core/input/shortcut.h"
 #include "scene/main/instance_placeholder.h"
-#include "scene/property_utils.h"
+#include "scene/main/property_utils.h"
 
 #define PACKED_SCENE_VERSION 2
 

scene/resources/shader.cpp

@@ -30,7 +30,7 @@
 
 #include "shader.h"
 #include "core/os/file_access.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 #include "servers/rendering/shader_language.h"
 #include "servers/rendering_server.h"
 #include "texture.h"

scene/resources/world_3d.cpp

@@ -35,7 +35,7 @@
 #include "core/math/projection.h"
 #include "scene/3d/camera.h"
 #include "scene/3d/visibility_notifier.h"
-#include "scene/scene_string_names.h"
+#include "scene/main/scene_string_names.h"
 #include "servers/navigation_server.h"
 
 struct SpatialIndexer {