diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-08-30 20:08:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-30 20:08:09 +0200 |
| commit | cffec896f9fc4c23cef448468ab50d45d4f04083 (patch) | |
| tree | 7ed0242729ad0125081917dd3e538dd86f85db27 /editor/plugins | |
| parent | bbaf35c4f540033d51ed02c5541b2270da288fd0 (diff) | |
| parent | e2459479dea6a853bc180b182f1817ede4baa611 (diff) | |
Merge pull request #31801 from merumelu/editor-remove-tools-defined-guards
Editor: remove TOOLS_ENABLED guards
Diffstat (limited to 'editor/plugins')
| -rw-r--r-- | editor/plugins/script_text_editor.cpp | 10 | ||||
| -rw-r--r-- | editor/plugins/spatial_editor_plugin.cpp | 8 |
2 files changed, 0 insertions, 18 deletions
diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp index bded590351..edc454ad1c 100644 --- a/editor/plugins/script_text_editor.cpp +++ b/editor/plugins/script_text_editor.cpp @@ -1436,8 +1436,6 @@ bool ScriptTextEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_ return false; } -#ifdef TOOLS_ENABLED - static Node *_find_script_node(Node *p_edited_scene, Node *p_current_node, const Ref<Script> &script) { if (p_edited_scene != p_current_node && p_current_node->get_owner() != p_edited_scene) @@ -1457,14 +1455,6 @@ static Node *_find_script_node(Node *p_edited_scene, Node *p_current_node, const return NULL; } -#else - -static Node *_find_script_node(Node *p_edited_scene, Node *p_current_node, const Ref<Script> &script) { - - return NULL; -} -#endif - void ScriptTextEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) { Dictionary d = p_data; diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp index 85ddcb8b9d..ecc631d045 100644 --- a/editor/plugins/spatial_editor_plugin.cpp +++ b/editor/plugins/spatial_editor_plugin.cpp @@ -74,14 +74,6 @@ #define MIN_FOV 0.01 #define MAX_FOV 179 -#ifdef TOOLS_ENABLED -#define get_global_gizmo_transform get_global_gizmo_transform -#define get_local_gizmo_transform get_local_gizmo_transform -#else -#define get_global_gizmo_transform get_global_transform -#define get_local_gizmo_transform get_transform -#endif - void SpatialEditorViewport::_update_camera(float p_interp_delta) { bool is_orthogonal = camera->get_projection() == Camera::PROJECTION_ORTHOGONAL; |