Commit: b25c12635efc4ca0c7a27365caf18a0b192b8c27
Author: mattoverby
Date: Wed Aug 12 16:13:10 2020 -0500
Branches: soc-2020-soft-body
https://developer.blender.org/rBb25c12635efc4ca0c7a27365caf18a0b192b8c27
fixing windows errors
===================================================================
M
extern/discregrid/discregrid/include/Discregrid/mesh/entity_containers.hpp
M extern/softbody/src/admmpd_bvh.cpp
M extern/softbody/src/admmpd_bvh.h
M extern/softbody/src/svd/Tools.h
===================================================================
diff --git
a/extern/discregrid/discregrid/include/Discregrid/mesh/entity_containers.hpp
b/extern/discregrid/discregrid/include/Discregrid/mesh/entity_containers.hpp
index 81bd4daa00e..67ec0b5719c 100755
--- a/extern/discregrid/discregrid/include/Discregrid/mesh/entity_containers.hpp
+++ b/extern/discregrid/discregrid/include/Discregrid/mesh/entity_containers.hpp
@@ -64,7 +64,7 @@ private:
friend class TriangleMesh;
IncidentFaceContainer(unsigned int v, TriangleMesh const* mesh)
- : m_v(v), m_mesh(mesh) {}
+ : m_mesh(mesh), m_v(v) {}
TriangleMesh const* m_mesh;
unsigned int m_v;
diff --git a/extern/softbody/src/admmpd_bvh.cpp
b/extern/softbody/src/admmpd_bvh.cpp
index 42313efa642..02303ae29b9 100644
--- a/extern/softbody/src/admmpd_bvh.cpp
+++ b/extern/softbody/src/admmpd_bvh.cpp
@@ -283,6 +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);
BLI_assert((int)queue.size()>0);
BLI_assert((int)boxes.size()>0);
BLI_assert(F != nullptr);
@@ -329,6 +330,7 @@ Octree<T,DIM>::Node::Node() :
center(VecType::Zero()),
halfwidth(0)
{
+ constexpr int nchild = std::pow(2,DIM);
for (int i=0; i<nchild; ++i)
children[i] = nullptr;
}
@@ -336,6 +338,7 @@ Octree<T,DIM>::Node::Node() :
template<typename T, int DIM>
Octree<T,DIM>::Node::~Node()
{
+ constexpr int nchild = std::pow(2,DIM);
for (int i=0; i<nchild; ++i)
if (children[i] != nullptr)
delete children[i];
@@ -365,9 +368,9 @@ template class admmpd::TraverserFromFunctionPtrs<double,2>;
template class admmpd::TraverserFromFunctionPtrs<double,3>;
template class admmpd::TraverserFromFunctionPtrs<float,2>;
template class admmpd::TraverserFromFunctionPtrs<float,3>;
-template class admmpd::Octree<double,2>;
+//template class admmpd::Octree<double,2>;
template class admmpd::Octree<double,3>;
-template class admmpd::Octree<float,2>;
+//template class admmpd::Octree<float,2>;
template class admmpd::Octree<float,3>;
} // namespace admmpd
\ No newline at end of file
diff --git a/extern/softbody/src/admmpd_bvh.h b/extern/softbody/src/admmpd_bvh.h
index 56844a056fb..647442bc4d7 100644
--- a/extern/softbody/src/admmpd_bvh.h
+++ b/extern/softbody/src/admmpd_bvh.h
@@ -93,7 +93,6 @@ protected:
typedef Eigen::AlignedBox<T,DIM> AABB;
typedef Eigen::Matrix<T,DIM,1> VecType;
typedef Eigen::Matrix<T,Eigen::Dynamic,Eigen::Dynamic> MatrixXT;
- static const int nchild = std::pow(2,DIM);
public:
// Removes all BVH data
diff --git a/extern/softbody/src/svd/Tools.h b/extern/softbody/src/svd/Tools.h
index d6061e58d59..ee075d8ae0a 100644
--- a/extern/softbody/src/svd/Tools.h
+++ b/extern/softbody/src/svd/Tools.h
@@ -45,12 +45,12 @@ Sample usage:
#ifndef JIXIE_SVD_TOOLS_H
#define JIXIE_SVD_TOOLS_H
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+//#pragma GCC diagnostic push
+//#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#include <Eigen/Dense>
#include <Eigen/Core>
#include <Eigen/SVD>
-#pragma GCC diagnostic pop
+//#pragma GCC diagnostic pop
#include <mmintrin.h>
#include <xmmintrin.h>
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
