diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-07-26 15:39:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-26 15:39:59 +0200 |
| commit | 64dc58bfba55c4e5dcdce18bf848abf43332afd0 (patch) | |
| tree | 8e551de7f7418a6244d11c01af323cce5d41fd6f /servers/rendering/shader_language.h | |
| parent | fdb74c7512b33d27a2fda58e64f97e936c9eac7c (diff) | |
| parent | b47b3a9957e8afcbc7421002d6a6e3a273a2b9b0 (diff) | |
Merge pull request #50884 from Chaosus/fix_shader_crash
Prevents shader crashing if varying assigned incorrectly by using compound assignment operators (*=, += etc.)
Diffstat (limited to 'servers/rendering/shader_language.h')
| -rw-r--r-- | servers/rendering/shader_language.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/servers/rendering/shader_language.h b/servers/rendering/shader_language.h index 59c6e19338..c02d6c47ec 100644 --- a/servers/rendering/shader_language.h +++ b/servers/rendering/shader_language.h @@ -766,6 +766,7 @@ public: static String get_datatype_name(DataType p_type); static bool is_token_nonvoid_datatype(TokenType p_type); static bool is_token_operator(TokenType p_type); + static bool is_token_operator_assign(TokenType p_type); static bool convert_constant(ConstantNode *p_constant, DataType p_to_type, ConstantNode::Value *p_value = nullptr); static DataType get_scalar_type(DataType p_type); |