[Bf-blender-cvs] [5b5754d8513] soc-2020-soft-body: fixed windows errors

mattoverby noreply at git.blender.org
Thu Aug 13 07:06:11 CEST 2020


Commit: 5b5754d8513b1c2e37b633958d50fadaf42281ff
Author: mattoverby
Date:   Thu Aug 13 00:06:07 2020 -0500
Branches: soc-2020-soft-body
https://developer.blender.org/rB5b5754d8513b1c2e37b633958d50fadaf42281ff

fixed windows errors

===================================================================

M	extern/softbody/src/admmpd_bvh.cpp

===================================================================

diff --git a/extern/softbody/src/admmpd_bvh.cpp b/extern/softbody/src/admmpd_bvh.cpp
index 02303ae29b9..b9e49a29668 100644
--- a/extern/softbody/src/admmpd_bvh.cpp
+++ b/extern/softbody/src/admmpd_bvh.cpp
@@ -283,7 +283,7 @@ typename Octree<T,DIM>::Node* Octree<T,DIM>::create_children(
     const std::vector<int> &queue,
     const std::vector<AABB> &boxes)
 {
-    constexpr int nchild = std::pow(2,DIM);
+    int nchild = std::pow(2,DIM);
     BLI_assert((int)queue.size()>0);
     BLI_assert((int)boxes.size()>0);
     BLI_assert(F != nullptr);
@@ -330,7 +330,7 @@ Octree<T,DIM>::Node::Node() :
     center(VecType::Zero()),
     halfwidth(0)
 {
-    constexpr int nchild = std::pow(2,DIM);
+    int nchild = std::pow(2,DIM);
 	for (int i=0; i<nchild; ++i)
 		children[i] = nullptr;
 }
@@ -338,7 +338,7 @@ Octree<T,DIM>::Node::Node() :
 template<typename T, int DIM>
 Octree<T,DIM>::Node::~Node()
 {
-    constexpr int nchild = std::pow(2,DIM);
+    int nchild = std::pow(2,DIM);
     for (int i=0; i<nchild; ++i)
 	    if (children[i] != nullptr)
 			delete children[i];



More information about the Bf-blender-cvs mailing list