diff options
| author | Eoin O'Neill <eoinoneill1991@gmail.com> | 2019-09-04 16:42:51 -0700 |
|---|---|---|
| committer | Eoin O'Neill <eoinoneill1991@gmail.com> | 2019-09-04 16:42:51 -0700 |
| commit | b85b2da9888b86b2c4e6617bd15e4b3692e87f4d (patch) | |
| tree | 4e3eebf234378820988f5681274024060e07cba5 /scene | |
| parent | e205cbbd06deb02eff579469fa420ac25dc0688f (diff) | |
Bug Fix 31973 Type Hint Error
Fixed a bug introduced in my previous PR involving CharFXTransform not
allowing the use of type hinting. Should now work properly. This should
also help with Godot Mono issues...
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/gui/rich_text_effect.cpp | 2 | ||||
| -rw-r--r-- | scene/register_scene_types.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/scene/gui/rich_text_effect.cpp b/scene/gui/rich_text_effect.cpp index 8d9b8ad1e0..67fa85b832 100644 --- a/scene/gui/rich_text_effect.cpp +++ b/scene/gui/rich_text_effect.cpp @@ -33,7 +33,7 @@ #include "core/script_language.h" void RichTextEffect::_bind_methods() { - BIND_VMETHOD(MethodInfo(Variant::INT, "_process_custom_fx", PropertyInfo(Variant::OBJECT, "char_fx", PROPERTY_HINT_RESOURCE_TYPE, "CustomFXChar"))); + BIND_VMETHOD(MethodInfo(Variant::BOOL, "_process_custom_fx", PropertyInfo(Variant::OBJECT, "char_fx", PROPERTY_HINT_RESOURCE_TYPE, "CharFXTransform"))); } Variant RichTextEffect::get_bbcode() const { diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index d03eb2b49e..e3af521e8c 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -101,6 +101,7 @@ #include "scene/gui/popup_menu.h" #include "scene/gui/progress_bar.h" #include "scene/gui/reference_rect.h" +#include "scene/gui/rich_text_effect.h" #include "scene/gui/rich_text_label.h" #include "scene/gui/scroll_bar.h" #include "scene/gui/scroll_container.h" @@ -344,6 +345,7 @@ void register_scene_types() { ClassDB::register_class<ColorPickerButton>(); ClassDB::register_class<RichTextLabel>(); ClassDB::register_class<RichTextEffect>(); + ClassDB::register_class<CharFXTransform>(); ClassDB::register_class<PopupDialog>(); ClassDB::register_class<WindowDialog>(); ClassDB::register_class<AcceptDialog>(); |