diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2018-09-13 18:12:58 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-13 18:12:58 -0300 |
| commit | 909c06ee0f0ab5feced1c9c99a725f7a423ff9f8 (patch) | |
| tree | cc86065674317ca4042639b28d01260152cfd97b /servers/visual/shader_language.h | |
| parent | 06c8b5a4ffb0ab6787edf071463f17df522b3e79 (diff) | |
| parent | 3cedec5f754b08d04095d5ebe0cd9532de011268 (diff) | |
Merge pull request #21806 from JFonS/inspector_uniform_defaults
Set uniform default values in inspector
Diffstat (limited to 'servers/visual/shader_language.h')
| -rw-r--r-- | servers/visual/shader_language.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/servers/visual/shader_language.h b/servers/visual/shader_language.h index e8ae099302..08c4d06992 100644 --- a/servers/visual/shader_language.h +++ b/servers/visual/shader_language.h @@ -548,6 +548,7 @@ public: static int get_cardinality(DataType p_type); static bool is_scalar_type(DataType p_type); static bool is_sampler_type(DataType p_type); + static Variant constant_value_to_variant(const Vector<ShaderLanguage::ConstantNode::Value> &p_value, DataType p_type); static void get_keyword_list(List<String> *r_keywords); static void get_builtin_funcs(List<String> *r_keywords); |