maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Cleanup some unecessary editor/ includes in scene/

Browse source 
Part of #29730, handles false positives.
This commit is contained in:
Rémi Verschelde 2019-06-12 22:35:35 +02:00
parent f410e7a8a9
commit 84d969a42a
5 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scene/2d/camera_2d.cpp
View file

@ -29,10 +29,11 @@
/*************************************************************************/
#include "camera_2d.h"
#include "core/engine.h"
#include "core/math/math_funcs.h"
#include "scene/scene_string_names.h"
#include "servers/visual_server.h"
#include <editor/editor_node.h>
void Camera2D::_update_scroll() {

10
scene/gui/control.cpp
View file

@ -29,23 +29,23 @@
/*************************************************************************/
#include "control.h"
#include "core/project_settings.h"
#include "scene/main/canvas_layer.h"
#include "scene/main/viewport.h"
#include "servers/visual_server.h"
#include "core/message_queue.h"
#include "core/os/keyboard.h"
#include "core/os/os.h"
#include "core/print_string.h"
#include "core/project_settings.h"
#include "scene/gui/label.h"
#include "scene/gui/panel.h"
#include "scene/main/canvas_layer.h"
#include "scene/main/viewport.h"
#include "scene/scene_string_names.h"
#include "servers/visual_server.h"
#ifdef TOOLS_ENABLED
#include "editor/editor_settings.h"
#include "editor/plugins/canvas_item_editor_plugin.h"
#endif
#include <stdio.h>
Dictionary Control::_edit_get_state() const {

11
scene/gui/gradient_edit.cpp
View file

@ -29,10 +29,17 @@
/*************************************************************************/
#include "gradient_edit.h"
#include "core/os/keyboard.h"
#include "editor/editor_scale.h"
#include "core/os/keyboard.h"
#ifdef TOOLS_ENABLED
#include "editor/editor_scale.h"
#define SPACING (3 * EDSCALE)
#define POINT_WIDTH (8 * EDSCALE)
#else
#define SPACING 3
#define POINT_WIDTH 8
#endif
GradientEdit::GradientEdit() {
grabbed = -1;

2
scene/gui/gradient_edit.h
View file

@ -36,8 +36,6 @@
#include "scene/resources/default_theme/theme_data.h"
#include "scene/resources/gradient.h"
#define POINT_WIDTH (8 * EDSCALE)
class GradientEdit : public Control {
GDCLASS(GradientEdit, Control);

2
scene/gui/tree.cpp
View file

@ -39,7 +39,7 @@
#include "scene/main/viewport.h"
#ifdef TOOLS_ENABLED
#include "editor/editor_node.h"
#include "editor/editor_scale.h"
#endif
#include <limits.h>