diff options
| -rw-r--r-- | platform/x11/detect.py | 4 | ||||
| -rw-r--r-- | scene/gui/tree.cpp | 2 | ||||
| -rw-r--r-- | tools/editor/editor_node.h | 2 | ||||
| -rw-r--r-- | tools/editor/editor_plugin.cpp | 1 |
4 files changed, 6 insertions, 3 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 54940866b2..3c50e2cf5b 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -182,7 +182,9 @@ def configure(env): print("PulseAudio development libraries not found, disabling driver") env.Append(CPPFLAGS=['-DX11_ENABLED','-DUNIX_ENABLED','-DGLES2_ENABLED','-DGLES_OVER_GL']) - env.Append(LIBS=['GL', 'GLU', 'pthread', 'z', 'dl']) + env.Append(LIBS=['GL', 'GLU', 'pthread', 'z']) + if (platform.system() == "Linux"): + env.Append(LIBS='dl') #env.Append(CPPFLAGS=['-DMPC_FIXED_POINT']) #host compiler is default.. diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index db14c15db8..581103931e 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -2279,7 +2279,7 @@ void Tree::_input_event(InputEvent p_event) { update(); } - if (pressing_for_editor && popup_edited_item && popup_edited_item->get_cell_mode(popup_edited_item_col)==TreeItem::CELL_MODE_RANGE) { + if (pressing_for_editor && popup_edited_item && (popup_edited_item->get_cell_mode(popup_edited_item_col)==TreeItem::CELL_MODE_RANGE || popup_edited_item->get_cell_mode(popup_edited_item_col)==TreeItem::CELL_MODE_RANGE_EXPRESSION)) { //range drag if (!range_drag_enabled) { diff --git a/tools/editor/editor_node.h b/tools/editor/editor_node.h index 9b0edda75e..f694c65db8 100644 --- a/tools/editor/editor_node.h +++ b/tools/editor/editor_node.h @@ -762,7 +762,7 @@ public: plugins_list = p_plugins_list; } - Vector<EditorPlugin*> get_plugins_list() { + Vector<EditorPlugin*>& get_plugins_list() { return plugins_list; } diff --git a/tools/editor/editor_plugin.cpp b/tools/editor/editor_plugin.cpp index 138e532ce8..01e6b613c0 100644 --- a/tools/editor/editor_plugin.cpp +++ b/tools/editor/editor_plugin.cpp @@ -27,6 +27,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "editor_plugin.h" +#include "scene/3d/camera.h" #include "plugins/canvas_item_editor_plugin.h" #include "plugins/spatial_editor_plugin.h" #include "tools/editor/editor_node.h" |