Merge pull request #12195 from groud/fix_snapping

Fix snapping with 2D nodes

[ci skip]
This commit is contained in:
Rémi Verschelde
2017-10-20 12:42:35 +02:00
committed by GitHub
24 changed files with 118 additions and 164 deletions
+4 -4
View File
@@ -5691,12 +5691,12 @@ void EditorPluginList::edit(Object *p_object) {
}
}
bool EditorPluginList::forward_gui_input(const Transform2D &p_canvas_xform, const Ref<InputEvent> &p_event) {
bool EditorPluginList::forward_gui_input(const Ref<InputEvent> &p_event) {
bool discard = false;
for (int i = 0; i < plugins_list.size(); i++) {
if (plugins_list[i]->forward_canvas_gui_input(p_canvas_xform, p_event)) {
if (plugins_list[i]->forward_canvas_gui_input(p_event)) {
discard = true;
}
}
@@ -5720,10 +5720,10 @@ bool EditorPluginList::forward_spatial_gui_input(Camera *p_camera, const Ref<Inp
return discard;
}
void EditorPluginList::forward_draw_over_canvas(const Transform2D &p_canvas_xform, Control *p_canvas) {
void EditorPluginList::forward_draw_over_canvas(Control *p_canvas) {
for (int i = 0; i < plugins_list.size(); i++) {
plugins_list[i]->forward_draw_over_canvas(p_canvas_xform, p_canvas);
plugins_list[i]->forward_draw_over_canvas(p_canvas);
}
}