Merge branch 'blender-v2.92-release'

2021-01-22 12:17:44 +01:00
parent ae4a430755 6ac0a3d83c
commit 7f96e6ed7e
1 changed files with 5 additions and 0 deletions
--- a/source/blender/blenlib/BLI_float2.hh
+++ b/source/blender/blenlib/BLI_float2.hh
@@ -55,6 +55,11 @@ struct float2 {
    return &x;
  }

+  operator float3() const
+  {
+    return float3(x, y, 0.0f);
+  }
+
  float length() const
  {
    return len_v2(*this);