diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-08-17 13:13:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-17 13:13:08 +0200 |
| commit | 45344c6a025b029ec864a6d9b7a1723fb43f4ab6 (patch) | |
| tree | 6bcd94c65ee3302a465f9d4c3ad1529cb860b540 /scene/resources/theme.h | |
| parent | e1754c0a1336ef12992b6c4e19fef74afa3b14c1 (diff) | |
| parent | 855cfe1559fe489aaaca8d395ba791d4bd2bb40d (diff) | |
Merge pull request #51651 from pycbouh/editor-merge-custom-theme
Add support for partial custom editor themes
Diffstat (limited to 'scene/resources/theme.h')
| -rw-r--r-- | scene/resources/theme.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scene/resources/theme.h b/scene/resources/theme.h index 8a8fc28be1..15f21b91b8 100644 --- a/scene/resources/theme.h +++ b/scene/resources/theme.h @@ -210,8 +210,7 @@ public: void get_type_list(List<StringName> *p_list) const; void get_type_dependencies(const StringName &p_base_type, const StringName &p_type_variant, List<StringName> *p_list); - void copy_default_theme(); - void copy_theme(const Ref<Theme> &p_other); + void merge_with(const Ref<Theme> &p_other); void clear(); Theme(); |