diff options
| author | Rémi Verschelde | 2017-09-17 12:53:48 +0200 |
|---|---|---|
| committer | GitHub | 2017-09-17 12:53:48 +0200 |
| commit | c74bab66aaaef355ef8ac8d7e1a249509fad544e (patch) | |
| tree | acb761bb28562f1f40e0e5736a9c79e91b4b7fb1 /editor/plugins | |
| parent | a1b4e4c607acb09c13bdf1b9609f2d45c4b01e15 (diff) | |
| parent | 072e379ffe7f0d8adc2ac0eb700abfd7c27d8278 (diff) | |
| download | godot-c74bab66aaaef355ef8ac8d7e1a249509fad544e.tar.gz godot-c74bab66aaaef355ef8ac8d7e1a249509fad544e.tar.zst godot-c74bab66aaaef355ef8ac8d7e1a249509fad544e.zip | |
Merge pull request #11274 from Rubonnek/keep-argument-names-consistent
Renamed function arguments to keep them consistent between declaration and implementation
Diffstat (limited to 'editor/plugins')
| -rw-r--r-- | editor/plugins/canvas_item_editor_plugin.h | 2 | ||||
| -rw-r--r-- | editor/plugins/navigation_mesh_editor_plugin.h | 6 | ||||
| -rw-r--r-- | editor/plugins/navigation_mesh_generator.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/editor/plugins/canvas_item_editor_plugin.h b/editor/plugins/canvas_item_editor_plugin.h index e81988668..f61bfc9eb 100644 --- a/editor/plugins/canvas_item_editor_plugin.h +++ b/editor/plugins/canvas_item_editor_plugin.h @@ -317,7 +317,7 @@ class CanvasItemEditor : public VBoxContainer { void _prepare_drag(const Point2 &p_click_pos); DragType _get_anchor_handle_drag_type(const Point2 &p_click, Vector2 &r_point); - float _anchor_snap(float anchor, bool *snapped = NULL, float p_opposite_anchor = -1); + float _anchor_snap(float p_anchor, bool *p_snapped = NULL, float p_opposite_anchor = -1); Vector2 _anchor_to_position(Control *p_control, Vector2 anchor); Vector2 _position_to_anchor(Control *p_control, Vector2 position); diff --git a/editor/plugins/navigation_mesh_editor_plugin.h b/editor/plugins/navigation_mesh_editor_plugin.h index 3009e2add..bac7f608a 100644 --- a/editor/plugins/navigation_mesh_editor_plugin.h +++ b/editor/plugins/navigation_mesh_editor_plugin.h @@ -56,7 +56,7 @@ class NavigationMeshEditor : public Control { protected: void _node_removed(Node *p_node); static void _bind_methods(); - void _notification(int p_what); + void _notification(int p_option); public: void edit(NavigationMeshInstance *p_nav_mesh_instance); @@ -74,8 +74,8 @@ class NavigationMeshEditorPlugin : public EditorPlugin { public: virtual String get_name() const { return "NavigationMesh"; } bool has_main_screen() const { return false; } - virtual void edit(Object *p_node); - virtual bool handles(Object *p_node) const; + virtual void edit(Object *p_object); + virtual bool handles(Object *p_object) const; virtual void make_visible(bool p_visible); NavigationMeshEditorPlugin(EditorNode *p_node); diff --git a/editor/plugins/navigation_mesh_generator.h b/editor/plugins/navigation_mesh_generator.h index 48e7dfe53..0a1c497f8 100644 --- a/editor/plugins/navigation_mesh_generator.h +++ b/editor/plugins/navigation_mesh_generator.h @@ -56,7 +56,7 @@ protected: rcPolyMeshDetail *detail_mesh, Vector<float> &verticies, Vector<int> &indices); public: - static void bake(Ref<NavigationMesh> p_nav_mesh, Node *p_base); + static void bake(Ref<NavigationMesh> p_nav_mesh, Node *p_node); static void clear(Ref<NavigationMesh> p_nav_mesh); }; |