diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2021-05-17 17:38:02 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-17 17:38:02 +0200 |
commit | 6c367f8e0d22ae5430d48dbbee9396345933e233 (patch) | |
tree | 6ceafa9ee3010dca7a485e716614628670609f9b /scene/resources | |
parent | 2fcfc83da91ca6c2e4670d3cdf01ee27d65f667b (diff) | |
parent | 97fecd1b69e837a3e3300bb7209ef72131abe599 (diff) |
Merge pull request #48168 from LightningAA/control-to-ctrl-4.0
Diffstat (limited to 'scene/resources')
-rw-r--r-- | scene/resources/visual_shader.cpp | 4 | ||||
-rw-r--r-- | scene/resources/visual_shader.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scene/resources/visual_shader.cpp b/scene/resources/visual_shader.cpp index b810f9562e..da29f2ebd8 100644 --- a/scene/resources/visual_shader.cpp +++ b/scene/resources/visual_shader.cpp @@ -3148,11 +3148,11 @@ int VisualShaderNodeGroupBase::get_free_output_port_id() const { return output_ports.size(); } -void VisualShaderNodeGroupBase::set_control(Control *p_control, int p_index) { +void VisualShaderNodeGroupBase::set_ctrl_pressed(Control *p_control, int p_index) { controls[p_index] = p_control; } -Control *VisualShaderNodeGroupBase::get_control(int p_index) { +Control *VisualShaderNodeGroupBase::is_ctrl_pressed(int p_index) { ERR_FAIL_COND_V(!controls.has(p_index), nullptr); return controls[p_index]; } diff --git a/scene/resources/visual_shader.h b/scene/resources/visual_shader.h index 8af0fc9e44..a0e3bdf166 100644 --- a/scene/resources/visual_shader.h +++ b/scene/resources/visual_shader.h @@ -610,8 +610,8 @@ public: int get_free_input_port_id() const; int get_free_output_port_id() const; - void set_control(Control *p_control, int p_index); - Control *get_control(int p_index); + void set_ctrl_pressed(Control *p_control, int p_index); + Control *is_ctrl_pressed(int p_index); void set_editable(bool p_enabled); bool is_editable() const; |