asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #35625 from Chaosus/vs_missing_prop

Browse source 
Added missing property "size" to VisualShaderNodeGroupBase
This commit is contained in:
Yuri Roubinsky 2020-01-27 20:42:23 +03:00 committed by GitHub
commit 485180ee00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
doc/classes/VisualShaderNodeGroupBase.xml
View file

@ -87,12 +87,6 @@
<description> <description>
</description> </description>
</method> </method>
<method name="get_size" qualifiers="const">
<return type="Vector2">
</return>
<description>
</description>
</method>
<method name="has_input_port" qualifiers="const"> <method name="has_input_port" qualifiers="const">
<return type="bool"> <return type="bool">
</return> </return>
@ -199,18 +193,12 @@
<description> <description>
</description> </description>
</method> </method>
<method name="set_size">
<return type="void">
</return>
<argument index="0" name="size" type="Vector2">
</argument>
<description>
</description>
</method>
</methods> </methods>
<members> <members>
<member name="editable" type="bool" setter="set_editable" getter="is_editable" default="false"> <member name="editable" type="bool" setter="set_editable" getter="is_editable" default="false">
</member> </member>
<member name="size" type="Vector2" setter="set_size" getter="get_size" default="Vector2( 0, 0 )">
</member>
</members> </members>
<constants> <constants>
</constants> </constants>

1
scene/resources/visual_shader.cpp
View file

@ -2509,6 +2509,7 @@ void VisualShaderNodeGroupBase::_bind_methods() {
ClassDB::bind_method(D_METHOD("is_editable"), &VisualShaderNodeGroupBase::is_editable); ClassDB::bind_method(D_METHOD("is_editable"), &VisualShaderNodeGroupBase::is_editable);
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "editable"), "set_editable", "is_editable"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "editable"), "set_editable", "is_editable");
ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "size"), "set_size", "get_size");
} }
String VisualShaderNodeGroupBase::generate_code(Shader::Mode p_mode, VisualShader::Type p_type, int p_id, const String *p_input_vars, const String *p_output_vars, bool p_for_preview) const { String VisualShaderNodeGroupBase::generate_code(Shader::Mode p_mode, VisualShader::Type p_type, int p_id, const String *p_input_vars, const String *p_output_vars, bool p_for_preview) const {