asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #31979 from Eoin-ONeill-Yokai/bugfix-31973

Browse source 
CharFXTransform Type Hint Error
This commit is contained in:
Rémi Verschelde 2019-09-05 09:46:34 +02:00 committed by GitHub
commit 8bcf6ca953
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scene/gui/rich_text_effect.cpp
View file

@ -33,7 +33,7 @@
#include "core/script_language.h" #include "core/script_language.h"
void RichTextEffect::_bind_methods() { 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 { Variant RichTextEffect::get_bbcode() const {

2
scene/register_scene_types.cpp
View file

@ -101,6 +101,7 @@
#include "scene/gui/popup_menu.h" #include "scene/gui/popup_menu.h"
#include "scene/gui/progress_bar.h" #include "scene/gui/progress_bar.h"
#include "scene/gui/reference_rect.h" #include "scene/gui/reference_rect.h"
#include "scene/gui/rich_text_effect.h"
#include "scene/gui/rich_text_label.h" #include "scene/gui/rich_text_label.h"
#include "scene/gui/scroll_bar.h" #include "scene/gui/scroll_bar.h"
#include "scene/gui/scroll_container.h" #include "scene/gui/scroll_container.h"
@ -344,6 +345,7 @@ void register_scene_types() {
ClassDB::register_class<ColorPickerButton>(); ClassDB::register_class<ColorPickerButton>();
ClassDB::register_class<RichTextLabel>(); ClassDB::register_class<RichTextLabel>();
ClassDB::register_class<RichTextEffect>(); ClassDB::register_class<RichTextEffect>();
ClassDB::register_class<CharFXTransform>();
ClassDB::register_class<PopupDialog>(); ClassDB::register_class<PopupDialog>();
ClassDB::register_class<WindowDialog>(); ClassDB::register_class<WindowDialog>();
ClassDB::register_class<AcceptDialog>(); ClassDB::register_class<AcceptDialog>();