diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gdscript/gdscript_parser.cpp | 11 | ||||
| -rw-r--r-- | modules/webp/SCsub | 11 |
2 files changed, 13 insertions, 9 deletions
diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp index 599f204184..36ae61e388 100644 --- a/modules/gdscript/gdscript_parser.cpp +++ b/modules/gdscript/gdscript_parser.cpp @@ -1140,6 +1140,7 @@ GDScriptParser::Node *GDScriptParser::_parse_expression(Node *p_parent, bool p_s bool unary = false; bool ternary = false; bool error = false; + bool right_to_left = false; switch (expression[i].op) { @@ -1194,11 +1195,13 @@ GDScriptParser::Node *GDScriptParser::_parse_expression(Node *p_parent, bool p_s case OperatorNode::OP_TERNARY_IF: priority = 14; ternary = true; + right_to_left = true; break; case OperatorNode::OP_TERNARY_ELSE: priority = 14; error = true; - break; // Errors out when found without IF (since IF would consume it) + // Rigth-to-left should be false in this case, otherwise it would always error. + break; case OperatorNode::OP_ASSIGN: priority = 15; break; case OperatorNode::OP_ASSIGN_ADD: priority = 15; break; @@ -1218,13 +1221,13 @@ GDScriptParser::Node *GDScriptParser::_parse_expression(Node *p_parent, bool p_s } } - if (priority < min_priority) { + if (priority < min_priority || (right_to_left && priority == min_priority)) { + // < is used for left to right (default) + // <= is used for right to left if (error) { _set_error("Unexpected operator"); return NULL; } - // < is used for left to right (default) - // <= is used for right to left next_op = i; min_priority = priority; is_unary = unary; diff --git a/modules/webp/SCsub b/modules/webp/SCsub index f9295fed47..ea7af1bf9e 100644 --- a/modules/webp/SCsub +++ b/modules/webp/SCsub @@ -26,9 +26,6 @@ if env['builtin_libwebp']: "dsp/alpha_processing_neon.c", "dsp/alpha_processing_sse2.c", "dsp/alpha_processing_sse41.c", - "dsp/argb.c", - "dsp/argb_mips_dsp_r2.c", - "dsp/argb_sse2.c", "dsp/cost.c", "dsp/cost_mips32.c", "dsp/cost_mips_dsp_r2.c", @@ -36,6 +33,9 @@ if env['builtin_libwebp']: "dsp/cpu.c", "dsp/dec.c", "dsp/dec_clip_tables.c", + "dsp/ssim.c", + "dsp/ssim_sse2.c", + "dsp/yuv_neon.c", "dsp/dec_mips32.c", "dsp/dec_mips_dsp_r2.c", "dsp/dec_msa.c", @@ -84,6 +84,7 @@ if env['builtin_libwebp']: "dsp/yuv_sse2.c", "enc/alpha_enc.c", "enc/analysis_enc.c", + "enc/backward_references_cost_enc.c", "enc/backward_references_enc.c", "enc/config_enc.c", "enc/cost_enc.c", @@ -122,10 +123,10 @@ if env['builtin_libwebp']: "utils/thread_utils.c", "utils/utils.c", ] - thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] + thirdparty_sources = [thirdparty_dir + "src/" + file for file in thirdparty_sources] env_webp.add_source_files(env.modules_sources, thirdparty_sources) - env_webp.Append(CPPPATH=[thirdparty_dir]) + env_webp.Append(CPPPATH=[thirdparty_dir, thirdparty_dir + "src/"]) # Godot source files env_webp.add_source_files(env.modules_sources, "*.cpp") |