diff --git a/extern/mantaflow/patches/liquid-performance.patch b/extern/mantaflow/patches/liquid-performance.patch
index 6344c249ac5..a62f69adb1f 100644
--- a/extern/mantaflow/patches/liquid-performance.patch
+++ b/extern/mantaflow/patches/liquid-performance.patch
@@ -16,12 +16,12 @@ index 31e43483b49..9856d84a8b1 100644
 -
      if (tmp(i, j, k) != 0)
        return;
-+    static const Vec3i nb[6] = {Vec3i(i+1, j, k),
-+                                Vec3i(i-1, j, k),
-+                                Vec3i(i, j+1, k),
-+                                Vec3i(i, j-1, k),
-+                                Vec3i(i, j, k+1),
-+                                Vec3i(i, j, k-1)};
++    const Vec3i nb[6] = {Vec3i(i+1, j, k),
++                         Vec3i(i-1, j, k),
++                         Vec3i(i, j+1, k),
++                         Vec3i(i, j-1, k),
++                         Vec3i(i, j, k+1),
++                         Vec3i(i, j, k-1)};
 +    const int dim = (vel.is3D() ? 3 : 2);
  
      // copy from initialized neighbors
@@ -51,12 +51,12 @@ index 31e43483b49..9856d84a8b1 100644
 -
      if (weight(i, j, k)[c] != 0)
        return;
-+    static const Vec3i nb[6] = {Vec3i(i+1, j, k),
-+                                Vec3i(i-1, j, k),
-+                                Vec3i(i, j+1, k),
-+                                Vec3i(i, j-1, k),
-+                                Vec3i(i, j, k+1),
-+                                Vec3i(i, j, k-1)};
++    const Vec3i nb[6] = {Vec3i(i+1, j, k),
++                         Vec3i(i-1, j, k),
++                         Vec3i(i, j+1, k),
++                         Vec3i(i, j-1, k),
++                         Vec3i(i, j, k+1),
++                         Vec3i(i, j, k-1)};
 +    const int dim = (vel.is3D() ? 3 : 2);
  
      // copy from initialized neighbors
diff --git a/extern/mantaflow/preprocessed/fastmarch.cpp b/extern/mantaflow/preprocessed/fastmarch.cpp
index 9856d84a8b1..ca8154fd63c 100644
--- a/extern/mantaflow/preprocessed/fastmarch.cpp
+++ b/extern/mantaflow/preprocessed/fastmarch.cpp
@@ -308,12 +308,12 @@ struct knExtrapolateMACSimple : public KernelBase {
   {
     if (tmp(i, j, k) != 0)
       return;
-    static const Vec3i nb[6] = {Vec3i(i+1, j, k),
-                                Vec3i(i-1, j, k),
-                                Vec3i(i, j+1, k),
-                                Vec3i(i, j-1, k),
-                                Vec3i(i, j, k+1),
-                                Vec3i(i, j, k-1)};
+    const Vec3i nb[6] = {Vec3i(i+1, j, k),
+                         Vec3i(i-1, j, k),
+                         Vec3i(i, j+1, k),
+                         Vec3i(i, j-1, k),
+                         Vec3i(i, j, k+1),
+                         Vec3i(i, j, k-1)};
     const int dim = (vel.is3D() ? 3 : 2);
 
     // copy from initialized neighbors
@@ -715,12 +715,12 @@ struct knExtrapolateMACFromWeight : public KernelBase {
   {
     if (weight(i, j, k)[c] != 0)
       return;
-    static const Vec3i nb[6] = {Vec3i(i+1, j, k),
-                                Vec3i(i-1, j, k),
-                                Vec3i(i, j+1, k),
-                                Vec3i(i, j-1, k),
-                                Vec3i(i, j, k+1),
-                                Vec3i(i, j, k-1)};
+    const Vec3i nb[6] = {Vec3i(i+1, j, k),
+                         Vec3i(i-1, j, k),
+                         Vec3i(i, j+1, k),
+                         Vec3i(i, j-1, k),
+                         Vec3i(i, j, k+1),
+                         Vec3i(i, j, k-1)};
     const int dim = (vel.is3D() ? 3 : 2);
 
     // copy from initialized neighbors