godotengine/godot-visual-script
1
0
Fork 0
mirror of https://github.com/godotengine/godot-visual-script.git synced 2026-01-03 10:09:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #43371 from reduz/variant-setget-refactor

Browse Source 
Refactored Variant setters/getters
This commit is contained in:
Juan Linietsky
2020-11-07 16:34:54 -03:00
committed by GitHub
parent df0e8ecb39 36395b992e
commit 4e3446ee45
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
visual_script_expression.cpp
View File

@@ -1341,7 +1341,7 @@ public:
}
bool valid;
r_ret = base.get_named(index->name, &valid);
r_ret = base.get_named(index->name, valid);
if (!valid) {
r_error_str = "Invalid index '" + String(index->name) + "' for base of type " + Variant::get_type_name(base.get_type()) + ".";
return true;

18
visual_script_func_nodes.cpp
View File

@@ -1449,11 +1449,11 @@ public:
_FORCE_INLINE_ void _process_get(Variant &source, const Variant &p_argument, bool &valid) {
if (index != StringName() && assign_op == VisualScriptPropertySet::ASSIGN_OP_NONE) {
source.set_named(index, p_argument, &valid);
source.set_named(index, p_argument, valid);
} else {
Variant value;
if (index != StringName()) {
value = source.get_named(index, &valid);
value = source.get_named(index, valid);
} else {
value = source;
}
@@ -1497,7 +1497,7 @@ public:
}
if (index != StringName()) {
source.set_named(index, value, &valid);
source.set_named(index, value, valid);
} else {
source = value;
}
@@ -1562,12 +1562,12 @@ public:
bool valid;
if (needs_get) {
Variant value = v.get_named(property, &valid);
Variant value = v.get_named(property, valid);
_process_get(value, *p_inputs[1], valid);
v.set_named(property, value, &valid);
v.set_named(property, value, valid);
} else {
v.set_named(property, *p_inputs[1], &valid);
v.set_named(property, *p_inputs[1], valid);
}
if (!valid) {
@@ -2111,7 +2111,7 @@ public:
*p_outputs[0] = object->get(property, &valid);
if (index != StringName()) {
*p_outputs[0] = p_outputs[0]->get_named(index);
*p_outputs[0] = p_outputs[0]->get_named(index, valid);
}
if (!valid) {
@@ -2140,7 +2140,7 @@ public:
*p_outputs[0] = another->get(property, &valid);
if (index != StringName()) {
*p_outputs[0] = p_outputs[0]->get_named(index);
*p_outputs[0] = p_outputs[0]->get_named(index, valid);
}
if (!valid) {
@@ -2156,7 +2156,7 @@ public:
*p_outputs[0] = v.get(property, &valid);
if (index != StringName()) {
*p_outputs[0] = p_outputs[0]->get_named(index);
*p_outputs[0] = p_outputs[0]->get_named(index, valid);
}
if (!valid) {