godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-14 13:41:12 +00:00
Code Releases Wiki Activity

Don't compile editor-only function when tools=no

Browse Source
This commit is contained in:
Gilles Roudière
2019-10-21 23:37:07 +02:00
parent 76678b2609
commit b5251eb00f
38 changed files with 126 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scene/gui/control.cpp
View File

@@ -47,6 +47,7 @@
#include "editor/plugins/canvas_item_editor_plugin.h"
#endif
#ifdef TOOLS_ENABLED
Dictionary Control::_edit_get_state() const {
Dictionary s;
@@ -155,6 +156,11 @@ bool Control::_edit_use_pivot() const {
return true;
}
Size2 Control::_edit_get_minimum_size() const {
return get_combined_minimum_size();
}
#endif
void Control::set_custom_minimum_size(const Size2 &p_custom) {
if (p_custom == data.custom_minimum_size)
@@ -193,11 +199,6 @@ Size2 Control::get_combined_minimum_size() const {
return data.minimum_size_cache;
}
Size2 Control::_edit_get_minimum_size() const {
return get_combined_minimum_size();
}
Transform2D Control::_get_internal_transform() const {
Transform2D rot_scale;