[Bf-blender-cvs] [91fee7f5f10] soc-2020-soft-body: windows fixes

[mattoverby]

Commit: 91fee7f5f10f9d29b26b6b62b99897c203a1c148
Author: mattoverby
Date:   Wed Aug 12 18:25:24 2020 -0500
Branches: soc-2020-soft-body
https://developer.blender.org/rB91fee7f5f10f9d29b26b6b62b99897c203a1c148

windows fixes

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

M	extern/softbody/src/admmpd_collision.cpp
M	extern/softbody/src/admmpd_mesh.cpp
M	extern/softbody/src/admmpd_solver.cpp

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

diff --git a/extern/softbody/src/admmpd_collision.cpp b/extern/softbody/src/admmpd_collision.cpp
index 9e63ab70575..bda89edc28b 100644
--- a/extern/softbody/src/admmpd_collision.cpp
+++ b/extern/softbody/src/admmpd_collision.cpp
@@ -255,15 +255,15 @@ int EmbeddedMeshCollision::detect(
 
 	std::vector<std::vector<Eigen::Vector2i> > per_thread_results;
 	DetectThreadData thread_data = {
-		.mesh = mesh,
-		.options = options,
-		.data = data,
-		.collision = this,
-		.obsdata = &obsdata,
-		.x0 = x0,
-		.x1 = x1,
-		.per_vertex_pairs = &per_vertex_pairs,
-		.per_thread_results = &per_thread_results
+		mesh,
+		options,
+		data,
+		this,
+		&obsdata,
+		x0,
+		x1,
+		&per_vertex_pairs,
+		&per_thread_results
 	};
 
 	// The pooling is a little unusual here.
@@ -632,4 +632,4 @@ void EmbeddedMeshCollision::linearize(
 
 } // end jacobian
 
-} // namespace admmpd
\ No newline at end of file
+} // namespace admmpd
diff --git a/extern/softbody/src/admmpd_mesh.cpp b/extern/softbody/src/admmpd_mesh.cpp
index 075f21d7f18..89395282a16 100644
--- a/extern/softbody/src/admmpd_mesh.cpp
+++ b/extern/softbody/src/admmpd_mesh.cpp
@@ -330,12 +330,12 @@ bool EmbeddedMesh::compute_embedding()
 	tree.init(tet_aabbs);
 
 	FindTetThreadData thread_data = {
-		.tree = &tree,
-		.emb_mesh = this,
-		.lat_V0 = &lat_V0,
-		.lat_T = &lat_T,
-		.emb_barys = &emb_barys,
-		.emb_v_to_tet = &emb_v_to_tet
+		&tree,
+		this,
+		&lat_V0,
+		&lat_T,
+		&emb_barys,
+		&emb_v_to_tet
 	};
 	TaskParallelSettings settings;
 	BLI_parallel_range_settings_defaults(&settings);
diff --git a/extern/softbody/src/admmpd_solver.cpp b/extern/softbody/src/admmpd_solver.cpp
index 8a35da1e6b7..5058ef10f9f 100644
--- a/extern/softbody/src/admmpd_solver.cpp
+++ b/extern/softbody/src/admmpd_solver.cpp
@@ -256,7 +256,7 @@ void Solver::solve_local_step(
 	data->Dx.noalias() = data->D * data->x;
 	int ne = data->indices.size();
 	BLI_assert(ne > 0);
-  	LocalStepThreadData thread_data = {.options=options, .data=data};
+  	LocalStepThreadData thread_data = {options, data};
 	TaskParallelSettings settings;
 	BLI_parallel_range_settings_defaults(&settings);
 	BLI_task_parallel_range(0, ne, &thread_data, parallel_zu_update, &settings);