diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-01-19 22:24:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-19 22:24:23 +0100 |
| commit | 8cc9bb2539f248b53dc3de166dbdaf3c87f7151f (patch) | |
| tree | 88a888da5ddfac0a156d1696138a231a368f9084 /modules/visual_script/visual_script_nodes.cpp | |
| parent | 5358254b6ca752b88138a2b523767093f572ca4c (diff) | |
| parent | a6105c8ea0bdae9d56d1943409d89cc71288306a (diff) | |
| download | redot-engine-8cc9bb2539f248b53dc3de166dbdaf3c87f7151f.tar.gz | |
Merge pull request #35326 from neikeq/issue-30496
Fix ClassDB API portability with some android and editor classes
Diffstat (limited to 'modules/visual_script/visual_script_nodes.cpp')
| -rw-r--r-- | modules/visual_script/visual_script_nodes.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/modules/visual_script/visual_script_nodes.cpp b/modules/visual_script/visual_script_nodes.cpp index 0a9f228b0a..86c1080182 100644 --- a/modules/visual_script/visual_script_nodes.cpp +++ b/modules/visual_script/visual_script_nodes.cpp @@ -2377,10 +2377,7 @@ VisualScriptEngineSingleton::TypeGuess VisualScriptEngineSingleton::guess_output return tg; } -void VisualScriptEngineSingleton::_bind_methods() { - - ClassDB::bind_method(D_METHOD("set_singleton", "name"), &VisualScriptEngineSingleton::set_singleton); - ClassDB::bind_method(D_METHOD("get_singleton"), &VisualScriptEngineSingleton::get_singleton); +void VisualScriptEngineSingleton::_validate_property(PropertyInfo &property) const { String cc; @@ -2397,7 +2394,16 @@ void VisualScriptEngineSingleton::_bind_methods() { cc += E->get().name; } - ADD_PROPERTY(PropertyInfo(Variant::STRING, "constant", PROPERTY_HINT_ENUM, cc), "set_singleton", "get_singleton"); + property.hint = PROPERTY_HINT_ENUM; + property.hint_string = cc; +} + +void VisualScriptEngineSingleton::_bind_methods() { + + ClassDB::bind_method(D_METHOD("set_singleton", "name"), &VisualScriptEngineSingleton::set_singleton); + ClassDB::bind_method(D_METHOD("get_singleton"), &VisualScriptEngineSingleton::get_singleton); + + ADD_PROPERTY(PropertyInfo(Variant::STRING, "constant"), "set_singleton", "get_singleton"); } VisualScriptEngineSingleton::VisualScriptEngineSingleton() { |