diff options
| author | Yuri Roubinsky <chaosus89@gmail.com> | 2019-08-28 16:39:33 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-28 16:39:33 +0300 |
| commit | 96ea1e6fb073a32aab2bbefb5eec12769a8435ed (patch) | |
| tree | 6e9044c05744b6f65a080238b9f1e85fa0df2bc4 /servers/visual/shader_language.h | |
| parent | b791efdb1642dcbe0a0572072a176ba39d47c9e1 (diff) | |
| parent | 38601dd3e959d09a659b2700cce5e2f2ddbe82a1 (diff) | |
Merge pull request #31600 from Chaosus/shader_func_return_fix
Fix shader crash when users miss the return statement
Diffstat (limited to 'servers/visual/shader_language.h')
| -rw-r--r-- | servers/visual/shader_language.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/servers/visual/shader_language.h b/servers/visual/shader_language.h index b71788513e..6753456323 100644 --- a/servers/visual/shader_language.h +++ b/servers/visual/shader_language.h @@ -750,6 +750,9 @@ private: Error _parse_block(BlockNode *p_block, const Map<StringName, BuiltInInfo> &p_builtin_types, bool p_just_one = false, bool p_can_break = false, bool p_can_continue = false); Error _parse_shader(const Map<StringName, FunctionInfo> &p_functions, const Vector<StringName> &p_render_modes, const Set<String> &p_shader_types); + Error _find_last_flow_op_in_block(BlockNode *p_block, FlowOperation p_op); + Error _find_last_flow_op_in_op(ControlFlowNode *p_flow, FlowOperation p_op); + public: //static void get_keyword_list(ShaderType p_type,List<String> *p_keywords); |