diff options
| author | Yuri Sizov <yuris@humnom.net> | 2021-08-14 02:01:15 +0300 |
|---|---|---|
| committer | Yuri Sizov <yuris@humnom.net> | 2021-08-14 02:03:07 +0300 |
| commit | 855cfe1559fe489aaaca8d395ba791d4bd2bb40d (patch) | |
| tree | 1d2ffa614311f392d5dfbb04fb2e5902cf59e6b0 /scene/resources/theme.h | |
| parent | f32c042f3e14a2de2f2d416ff35b0a3c80785e33 (diff) | |
| download | redot-engine-855cfe1559fe489aaaca8d395ba791d4bd2bb40d.tar.gz | |
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(); |