godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Allow some non-integer built-in constants in gdscript

Browse Source
This commit is contained in:
Bernhard Liebl
2017-12-15 16:43:27 +01:00
parent 4e4702e386
commit ba974b8d1e
8 changed files with 104 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/visual_script/visual_script_nodes.cpp
View File

@@ -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;