diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-02-20 22:24:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-20 22:24:58 +0100 |
| commit | 8107fc98b6ceae749b3c10e6f0432e904961867b (patch) | |
| tree | 6c0ab829b02aba47ff3dc27b9a14d3c3a0658a3b /scene/resources/theme.cpp | |
| parent | 132e2f458df7a3551a251d68afeccd0362ca6be2 (diff) | |
| parent | 8d51618949d5ea8a94e0f504401e8f852a393968 (diff) | |
Merge pull request #25853 from marxin/fix-25316-wshadow-local
Add -Wshadow=local to warnings and fix reported issues (#25316).
Diffstat (limited to 'scene/resources/theme.cpp')
| -rw-r--r-- | scene/resources/theme.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/resources/theme.cpp b/scene/resources/theme.cpp index 8d1a24dbf8..69258bc834 100644 --- a/scene/resources/theme.cpp +++ b/scene/resources/theme.cpp @@ -621,8 +621,8 @@ void Theme::clear() { void Theme::copy_default_theme() { - Ref<Theme> default_theme = get_default(); - copy_theme(default_theme); + Ref<Theme> default_theme2 = get_default(); + copy_theme(default_theme2); } void Theme::copy_theme(const Ref<Theme> &p_other) { |