Cleanup some unecessary editor/ includes in scene/
Part of #29730, handles false positives.
This commit is contained in:
parent
f410e7a8a9
commit
84d969a42a
@ -29,10 +29,11 @@
|
|||||||
/*************************************************************************/
|
/*************************************************************************/
|
||||||
|
|
||||||
#include "camera_2d.h"
|
#include "camera_2d.h"
|
||||||
|
|
||||||
|
#include "core/engine.h"
|
||||||
#include "core/math/math_funcs.h"
|
#include "core/math/math_funcs.h"
|
||||||
#include "scene/scene_string_names.h"
|
#include "scene/scene_string_names.h"
|
||||||
#include "servers/visual_server.h"
|
#include "servers/visual_server.h"
|
||||||
#include <editor/editor_node.h>
|
|
||||||
|
|
||||||
void Camera2D::_update_scroll() {
|
void Camera2D::_update_scroll() {
|
||||||
|
|
||||||
|
@ -29,23 +29,23 @@
|
|||||||
/*************************************************************************/
|
/*************************************************************************/
|
||||||
|
|
||||||
#include "control.h"
|
#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/message_queue.h"
|
||||||
#include "core/os/keyboard.h"
|
#include "core/os/keyboard.h"
|
||||||
#include "core/os/os.h"
|
#include "core/os/os.h"
|
||||||
#include "core/print_string.h"
|
#include "core/print_string.h"
|
||||||
|
#include "core/project_settings.h"
|
||||||
#include "scene/gui/label.h"
|
#include "scene/gui/label.h"
|
||||||
#include "scene/gui/panel.h"
|
#include "scene/gui/panel.h"
|
||||||
|
#include "scene/main/canvas_layer.h"
|
||||||
|
#include "scene/main/viewport.h"
|
||||||
#include "scene/scene_string_names.h"
|
#include "scene/scene_string_names.h"
|
||||||
|
#include "servers/visual_server.h"
|
||||||
|
|
||||||
#ifdef TOOLS_ENABLED
|
#ifdef TOOLS_ENABLED
|
||||||
#include "editor/editor_settings.h"
|
#include "editor/editor_settings.h"
|
||||||
#include "editor/plugins/canvas_item_editor_plugin.h"
|
#include "editor/plugins/canvas_item_editor_plugin.h"
|
||||||
#endif
|
#endif
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
Dictionary Control::_edit_get_state() const {
|
Dictionary Control::_edit_get_state() const {
|
||||||
|
|
||||||
|
@ -29,10 +29,17 @@
|
|||||||
/*************************************************************************/
|
/*************************************************************************/
|
||||||
|
|
||||||
#include "gradient_edit.h"
|
#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 SPACING (3 * EDSCALE)
|
||||||
|
#define POINT_WIDTH (8 * EDSCALE)
|
||||||
|
#else
|
||||||
|
#define SPACING 3
|
||||||
|
#define POINT_WIDTH 8
|
||||||
|
#endif
|
||||||
|
|
||||||
GradientEdit::GradientEdit() {
|
GradientEdit::GradientEdit() {
|
||||||
grabbed = -1;
|
grabbed = -1;
|
||||||
|
@ -36,8 +36,6 @@
|
|||||||
#include "scene/resources/default_theme/theme_data.h"
|
#include "scene/resources/default_theme/theme_data.h"
|
||||||
#include "scene/resources/gradient.h"
|
#include "scene/resources/gradient.h"
|
||||||
|
|
||||||
#define POINT_WIDTH (8 * EDSCALE)
|
|
||||||
|
|
||||||
class GradientEdit : public Control {
|
class GradientEdit : public Control {
|
||||||
|
|
||||||
GDCLASS(GradientEdit, Control);
|
GDCLASS(GradientEdit, Control);
|
||||||
|
@ -39,7 +39,7 @@
|
|||||||
#include "scene/main/viewport.h"
|
#include "scene/main/viewport.h"
|
||||||
|
|
||||||
#ifdef TOOLS_ENABLED
|
#ifdef TOOLS_ENABLED
|
||||||
#include "editor/editor_node.h"
|
#include "editor/editor_scale.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
Loading…
Reference in New Issue
Block a user