diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2020-12-23 18:24:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-23 18:24:00 +0100 |
| commit | c4c211c3b7608f79457f16bb42ad8839a9cdcf5a (patch) | |
| tree | b623ca5f4ac718466a13cf50659b1486cb6681c9 /core/variant/variant.h | |
| parent | 1e08647195a690d14666443b7691d8406a7e73b7 (diff) | |
| parent | 4b8b8039316493ee3fa77c6bb93f95e109fa68a6 (diff) | |
Merge pull request #44605 from madmiraal/rename-control-margin
Rename Control margin to offset
Diffstat (limited to 'core/variant/variant.h')
| -rw-r--r-- | core/variant/variant.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/variant/variant.h b/core/variant/variant.h index 76c936a7bd..b22488a877 100644 --- a/core/variant/variant.h +++ b/core/variant/variant.h @@ -356,7 +356,7 @@ public: operator Vector<Vector2>() const; // some core type enums to convert to - operator Margin() const; + operator Side() const; operator Orientation() const; operator IP_Address() const; |