diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-12-03 14:44:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-03 14:44:52 +0100 |
| commit | 9c30c83aeeeb4880fa9c700dbb9e8c09774ad4f3 (patch) | |
| tree | 21115f5864ff2c78107b42e624f892ebd3733089 | |
| parent | 9a0610c1ff17c598b16defa5cd300e7a116fc3bc (diff) | |
| parent | 4c232e4222ff7b1ba27ddd95749cc6f10c76a2d4 (diff) | |
Merge pull request #44011 from KoBeWi/red_roses_minus_blue_violets
Fix subtracting colors and quats
| -rw-r--r-- | core/variant/variant_op.cpp | 2 | ||||
| -rw-r--r-- | modules/gdscript/gdscript_analyzer.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/core/variant/variant_op.cpp b/core/variant/variant_op.cpp index 07b024ecb4..df29ec7b63 100644 --- a/core/variant/variant_op.cpp +++ b/core/variant/variant_op.cpp @@ -1399,6 +1399,8 @@ void Variant::_register_variant_operators() { register_op<OperatorEvaluatorSub<Vector2i, Vector2i, Vector2i>>(Variant::OP_SUBTRACT, Variant::VECTOR2I, Variant::VECTOR2I); register_op<OperatorEvaluatorSub<Vector3, Vector3, Vector3>>(Variant::OP_SUBTRACT, Variant::VECTOR3, Variant::VECTOR3); register_op<OperatorEvaluatorSub<Vector3i, Vector3i, Vector3i>>(Variant::OP_SUBTRACT, Variant::VECTOR3I, Variant::VECTOR3I); + register_op<OperatorEvaluatorSub<Quat, Quat, Quat>>(Variant::OP_SUBTRACT, Variant::QUAT, Variant::QUAT); + register_op<OperatorEvaluatorSub<Color, Color, Color>>(Variant::OP_SUBTRACT, Variant::COLOR, Variant::COLOR); register_op<OperatorEvaluatorMul<int64_t, int64_t, int64_t>>(Variant::OP_MULTIPLY, Variant::INT, Variant::INT); register_op<OperatorEvaluatorMul<double, int64_t, double>>(Variant::OP_MULTIPLY, Variant::INT, Variant::FLOAT); diff --git a/modules/gdscript/gdscript_analyzer.cpp b/modules/gdscript/gdscript_analyzer.cpp index 5a6240f31a..1b76c7f967 100644 --- a/modules/gdscript/gdscript_analyzer.cpp +++ b/modules/gdscript/gdscript_analyzer.cpp @@ -1616,7 +1616,7 @@ void GDScriptAnalyzer::reduce_binary_op(GDScriptParser::BinaryOpNode *p_binary_o if (p_binary_op->reduced_value.get_type() == Variant::STRING) { push_error(vformat(R"(%s in operator %s.)", p_binary_op->reduced_value, Variant::get_operator_name(p_binary_op->variant_op)), p_binary_op); } else { - push_error(vformat(R"(Invalid operands to operator %s, %s and %s.".)", + push_error(vformat(R"(Invalid operands to operator %s, %s and %s.)", Variant::get_operator_name(p_binary_op->variant_op), Variant::get_type_name(p_binary_op->left_operand->reduced_value.get_type()), Variant::get_type_name(p_binary_op->right_operand->reduced_value.get_type())), |