Merge branch 'blender-v2.92-release'

2021-01-22 13:41:35 +01:00
parent 9fbf3075ad 644976548d
commit 7a07ca1f8c
1 changed files with 0 additions and 5 deletions
--- a/source/blender/blenlib/BLI_float2.hh
+++ b/source/blender/blenlib/BLI_float2.hh
@@ -55,11 +55,6 @@ struct float2 {
    return &x;
  }

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