diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-20 11:30:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-20 11:30:56 +0100 |
| commit | bd61281a5f515065b05be008dd3d6b73a03f5a7c (patch) | |
| tree | 0add52fc270f808b4b2ad0bf7c970d72338c667e /editor/array_property_edit.cpp | |
| parent | 1a4be2cd8fdd9ba26f016f3e2d83febfe8ae141c (diff) | |
| parent | 69c95f4b4c128a22777af1e155bc24c7033decca (diff) | |
Merge pull request #36368 from reduz/variant-rework
Reworked signal system, added support for Callable and Signal
Diffstat (limited to 'editor/array_property_edit.cpp')
| -rw-r--r-- | editor/array_property_edit.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/editor/array_property_edit.cpp b/editor/array_property_edit.cpp index 8cbc6a8dff..f14b12b132 100644 --- a/editor/array_property_edit.cpp +++ b/editor/array_property_edit.cpp @@ -42,7 +42,7 @@ Variant ArrayPropertyEdit::get_array() const { return Array(); Variant arr = o->get(property); if (!arr.is_array()) { - Variant::CallError ce; + Callable::CallError ce; arr = Variant::construct(default_type, NULL, 0, ce); } return arr; @@ -104,7 +104,7 @@ bool ArrayPropertyEdit::_set(const StringName &p_name, const Variant &p_value) { } else if (newsize > size) { Variant init; - Variant::CallError ce; + Callable::CallError ce; Variant::Type new_type = subtype; if (new_type == Variant::NIL && size) { new_type = arr.get(size - 1).get_type(); @@ -139,7 +139,7 @@ bool ArrayPropertyEdit::_set(const StringName &p_name, const Variant &p_value) { Variant value = arr.get(idx); if (value.get_type() != type && type >= 0 && type < Variant::VARIANT_MAX) { - Variant::CallError ce; + Callable::CallError ce; Variant new_value = Variant::construct(Variant::Type(type), NULL, 0, ce); UndoRedo *ur = EditorNode::get_undo_redo(); |