diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-09-04 13:23:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-04 13:23:20 +0200 |
| commit | 44e89cb88f7e982d7298e640f0828608bd3c5784 (patch) | |
| tree | 24e19cba4cdfba511011bfc5da60975bfdfbbd9f /scene | |
| parent | 696849f73a9bebc95cecf25256ae7011c912dae3 (diff) | |
| parent | de284f931d75d985a6cffc2da52614334512be76 (diff) | |
Merge pull request #41758 from akien-mga/classref-sync
doc: Sync classref with current source
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/resources/shader.cpp | 2 | ||||
| -rw-r--r-- | scene/resources/visual_shader.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/scene/resources/shader.cpp b/scene/resources/shader.cpp index 4249542567..92f0353abf 100644 --- a/scene/resources/shader.cpp +++ b/scene/resources/shader.cpp @@ -142,8 +142,6 @@ void Shader::_bind_methods() { ClassDB::bind_method(D_METHOD("has_param", "name"), &Shader::has_param); - //ClassDB::bind_method(D_METHOD("get_param_list"),&Shader::get_fragment_code); - ADD_PROPERTY(PropertyInfo(Variant::STRING, "code", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "set_code", "get_code"); BIND_ENUM_CONSTANT(MODE_SPATIAL); diff --git a/scene/resources/visual_shader.cpp b/scene/resources/visual_shader.cpp index 33de24ad14..c774fb4b69 100644 --- a/scene/resources/visual_shader.cpp +++ b/scene/resources/visual_shader.cpp @@ -1577,9 +1577,12 @@ void VisualShader::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "graph_offset", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "set_graph_offset", "get_graph_offset"); ADD_PROPERTY(PropertyInfo(Variant::STRING, "version", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "set_version", "get_version"); + ADD_PROPERTY_DEFAULT("code", ""); // Inherited from Shader, prevents showing default code as override in docs. + BIND_ENUM_CONSTANT(TYPE_VERTEX); BIND_ENUM_CONSTANT(TYPE_FRAGMENT); BIND_ENUM_CONSTANT(TYPE_LIGHT); + BIND_ENUM_CONSTANT(TYPE_COMPUTE); BIND_ENUM_CONSTANT(TYPE_MAX); BIND_CONSTANT(NODE_ID_INVALID); |