diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-10-22 09:53:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-22 09:53:49 +0200 |
| commit | d05c7da1aa0fa0c58d54dfaeca1e474cdd31a20c (patch) | |
| tree | 858835653bb10caf199ff4848706b83ce2216ba4 /editor/shader_globals_editor.cpp | |
| parent | 3b85f22a6f92523e9e8fe60ce1dc0dad096e6ed4 (diff) | |
| parent | 5d33cd94c86e3face79eec804fa0eb6f0b718da2 (diff) | |
| download | redot-engine-d05c7da1aa0fa0c58d54dfaeca1e474cdd31a20c.tar.gz | |
Merge pull request #42949 from DavidSichma/shaderglobals
Shader globals bugfixes
Diffstat (limited to 'editor/shader_globals_editor.cpp')
| -rw-r--r-- | editor/shader_globals_editor.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/editor/shader_globals_editor.cpp b/editor/shader_globals_editor.cpp index 04fbac3463..915aec6d9a 100644 --- a/editor/shader_globals_editor.cpp +++ b/editor/shader_globals_editor.cpp @@ -284,7 +284,13 @@ static Variant create_var(RS::GlobalVariableType p_type) { return Vector3i(); } case RS::GLOBAL_VAR_TYPE_UVEC4: { - return Rect2i(); + Vector<int> v4; + v4.resize(4); + v4.write[0] = 0; + v4.write[1] = 0; + v4.write[2] = 0; + v4.write[3] = 0; + return v4; } case RS::GLOBAL_VAR_TYPE_FLOAT: { return 0.0; @@ -324,7 +330,7 @@ static Variant create_var(RS::GlobalVariableType p_type) { } case RS::GLOBAL_VAR_TYPE_MAT4: { Vector<real_t> xform; - xform.resize(4); + xform.resize(16); xform.write[0] = 1; xform.write[1] = 0; xform.write[2] = 0; |