diff options
| author | Chris Bradfield <chris@kidscancode.org> | 2017-09-09 20:10:28 -0700 |
|---|---|---|
| committer | Chris Bradfield <chris@kidscancode.org> | 2017-09-09 20:10:28 -0700 |
| commit | 134e24408a3ae6273da5998ee257495eff79eb1a (patch) | |
| tree | 566c3d82ed1925a3d6dcd34c6cb1687328af7f6e /modules/visual_script | |
| parent | f66e9158a8a49d1fb88cd31975a2a492b3aa1d6e (diff) | |
| parent | d1cb73b47a17de830d9474026ffa7b3587cfbc68 (diff) | |
Merge branch 'master' of git://github.com/godotengine/godot into kcc_lightoccluder2d_doc
Diffstat (limited to 'modules/visual_script')
| -rw-r--r-- | modules/visual_script/visual_script.h | 1 | ||||
| -rw-r--r-- | modules/visual_script/visual_script_editor.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/modules/visual_script/visual_script.h b/modules/visual_script/visual_script.h index b2e7a6aa27..297e9e510f 100644 --- a/modules/visual_script/visual_script.h +++ b/modules/visual_script/visual_script.h @@ -571,7 +571,6 @@ public: virtual bool has_named_classes() const; virtual int find_function(const String &p_function, const String &p_code) const; virtual String make_function(const String &p_class, const String &p_name, const PoolStringArray &p_args) const; - virtual Error open_in_external_editor(const Ref<Script> &p_script, int p_line, int p_col) { return ERR_UNAVAILABLE; } virtual void auto_indent_code(String &p_code, int p_from_line, int p_to_line) const; virtual void add_global_constant(const StringName &p_variable, const Variant &p_value); diff --git a/modules/visual_script/visual_script_editor.cpp b/modules/visual_script/visual_script_editor.cpp index 8386687c9f..37bd730d08 100644 --- a/modules/visual_script/visual_script_editor.cpp +++ b/modules/visual_script/visual_script_editor.cpp @@ -523,7 +523,7 @@ void VisualScriptEditor::_update_graph(int p_only_id) { if (Object::cast_to<VisualScriptExpression>(*node)) { Ref<VisualScriptComment> vsc = node; gnode->set_comment(true); - gnode->set_resizeable(true); + gnode->set_resizable(true); gnode->set_custom_minimum_size(vsc->get_size() * EDSCALE); gnode->connect("resize_request", this, "_comment_node_resized", varray(E->get())); } |