diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-04-02 14:41:58 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-04-02 14:56:01 +0200 |
| commit | ea7b497065a615b6fd4e165b331f50613a63a329 (patch) | |
| tree | be20ea6b308f2a989a76042ae4b7448711891f84 /scene/main | |
| parent | 058a0afdeca83145d58a95c426dd01216c397ea9 (diff) | |
Replace more occurrences of NULL with nullptr
Diffstat (limited to 'scene/main')
| -rw-r--r-- | scene/main/canvas_item.cpp | 1 | ||||
| -rw-r--r-- | scene/main/viewport.cpp | 10 |
2 files changed, 0 insertions, 11 deletions
diff --git a/scene/main/canvas_item.cpp b/scene/main/canvas_item.cpp index 6fb5cbacbd..2eacad68c3 100644 --- a/scene/main/canvas_item.cpp +++ b/scene/main/canvas_item.cpp @@ -1469,7 +1469,6 @@ CanvasItem::CanvasItem() : drawing = false; behind = false; block_transform_notify = false; - //viewport=NULL; canvas_layer = nullptr; use_parent_material = false; global_invalid = true; diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 7b860df352..5fcd4bf009 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -2506,16 +2506,6 @@ void Viewport::_gui_hid_control(Control *p_control) { _drop_mouse_focus(); } - /* ??? - if (data.window==p_control) { - window->drag_data=Variant(); - if (window->drag_preview) { - memdelete( window->drag_preview); - window->drag_preview=NULL; - } - } - */ - if (gui.key_focus == p_control) _gui_remove_focus(); if (gui.mouse_over == p_control) |