From b85b2da9888b86b2c4e6617bd15e4b3692e87f4d Mon Sep 17 00:00:00 2001 From: Eoin O'Neill Date: Wed, 4 Sep 2019 16:42:51 -0700 Subject: [PATCH] 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... --- scene/gui/rich_text_effect.cpp | 2 +- scene/register_scene_types.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/scene/gui/rich_text_effect.cpp b/scene/gui/rich_text_effect.cpp index 8d9b8ad1e0a..67fa85b8321 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 d03eb2b49e6..e3af521e8c1 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(); ClassDB::register_class(); ClassDB::register_class(); + ClassDB::register_class(); ClassDB::register_class(); ClassDB::register_class(); ClassDB::register_class();