diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-11-21 22:44:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-21 22:44:14 +0100 |
| commit | 613d374bc571929d601af1eab17079a639fe576f (patch) | |
| tree | 657d86e92254bb1aa8a9af0cddee5f74fdf50493 /modules | |
| parent | 08e6590fd625bc3b592b7398ec2825f3758ab6e8 (diff) | |
| parent | 0cf9597758f3af3afc951d0bf02dee1aeb9a6daf (diff) | |
Merge pull request #12284 from bojidar-bg/allow-subproperty-set
Allow for getting/setting "dotted" properties of objects
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gdnative/gdnative/node_path.cpp | 4 | ||||
| -rw-r--r-- | modules/gdnative/gdnative_api.json | 2 | ||||
| -rw-r--r-- | modules/gdnative/include/gdnative/node_path.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/modules/gdnative/gdnative/node_path.cpp b/modules/gdnative/gdnative/node_path.cpp index 2bd278e050..8dfe151f91 100644 --- a/modules/gdnative/gdnative/node_path.cpp +++ b/modules/gdnative/gdnative/node_path.cpp @@ -91,10 +91,10 @@ godot_string GDAPI godot_node_path_get_subname(const godot_node_path *p_self, co return dest; } -godot_string GDAPI godot_node_path_get_property(const godot_node_path *p_self) { +godot_string GDAPI godot_node_path_get_concatenated_subnames(const godot_node_path *p_self) { godot_string dest; const NodePath *self = (const NodePath *)p_self; - memnew_placement(&dest, String(self->get_property())); + memnew_placement(&dest, String(self->get_concatenated_subnames())); return dest; } diff --git a/modules/gdnative/gdnative_api.json b/modules/gdnative/gdnative_api.json index 0438a196cf..488ed93206 100644 --- a/modules/gdnative/gdnative_api.json +++ b/modules/gdnative/gdnative_api.json @@ -2918,7 +2918,7 @@ ] }, { - "name": "godot_node_path_get_property", + "name": "godot_node_path_get_concatenated_subnames", "return_type": "godot_string", "arguments": [ ["const godot_node_path *", "p_self"] diff --git a/modules/gdnative/include/gdnative/node_path.h b/modules/gdnative/include/gdnative/node_path.h index 42446175d8..b5a59fd325 100644 --- a/modules/gdnative/include/gdnative/node_path.h +++ b/modules/gdnative/include/gdnative/node_path.h @@ -73,7 +73,7 @@ godot_int GDAPI godot_node_path_get_subname_count(const godot_node_path *p_self) godot_string GDAPI godot_node_path_get_subname(const godot_node_path *p_self, const godot_int p_idx); -godot_string GDAPI godot_node_path_get_property(const godot_node_path *p_self); +godot_string GDAPI godot_node_path_get_concatenated_subnames(const godot_node_path *p_self); godot_bool GDAPI godot_node_path_is_empty(const godot_node_path *p_self); |