diff options
author | Juan Linietsky <reduzio@gmail.com> | 2018-08-10 12:57:20 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-10 12:57:20 -0300 |
commit | c76f444c4ec6971d5797568787b346ffde411c4a (patch) | |
tree | 125ee147aa053cc4299a92772a8a7a313fea8f5d /modules/visual_script/visual_script_nodes.cpp | |
parent | b4006f68b35d4270a0f3555d9baa2d8622bfc1e5 (diff) | |
parent | ba974b8d1e245818d819791bd628e70ec3b92de3 (diff) | |
download | redot-engine-c76f444c4ec6971d5797568787b346ffde411c4a.tar.gz |
Merge pull request #14704 from poke1024/colorconstants
Allow some non-integer built-in constants in gdscript
Diffstat (limited to 'modules/visual_script/visual_script_nodes.cpp')
-rw-r--r-- | modules/visual_script/visual_script_nodes.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/visual_script/visual_script_nodes.cpp b/modules/visual_script/visual_script_nodes.cpp index a6ec36d364..d499512d93 100644 --- a/modules/visual_script/visual_script_nodes.cpp +++ b/modules/visual_script/visual_script_nodes.cpp @@ -1663,7 +1663,7 @@ Variant::Type VisualScriptBasicTypeConstant::get_basic_type() const { class VisualScriptNodeInstanceBasicTypeConstant : public VisualScriptNodeInstance { public: - int value; + Variant value; bool valid; //virtual int get_working_memory_size() const { return 0; } @@ -1682,7 +1682,7 @@ public: VisualScriptNodeInstance *VisualScriptBasicTypeConstant::instance(VisualScriptInstance *p_instance) { VisualScriptNodeInstanceBasicTypeConstant *instance = memnew(VisualScriptNodeInstanceBasicTypeConstant); - instance->value = Variant::get_numeric_constant_value(type, name, &instance->valid); + instance->value = Variant::get_constant_value(type, name, &instance->valid); return instance; } @@ -1691,7 +1691,7 @@ void VisualScriptBasicTypeConstant::_validate_property(PropertyInfo &property) c if (property.name == "constant") { List<StringName> constants; - Variant::get_numeric_constants_for_type(type, &constants); + Variant::get_constants_for_type(type, &constants); if (constants.size() == 0) { property.usage = 0; |