[Bf-blender-cvs] [a19f9454761] hair_guides: Fix mesh sample inner loop for poisson disk generator, returned false always.

[Lukas Tönne]

Commit: a19f94547619fc1a779d61bc24444da1e944fd22
Author: Lukas Tönne
Date:   Fri Nov 17 08:58:49 2017 +0000
Branches: hair_guides
https://developer.blender.org/rBa19f94547619fc1a779d61bc24444da1e944fd22

Fix mesh sample inner loop for poisson disk generator, returned false always.

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

M	source/blender/blenkernel/intern/hair.c
M	source/blender/blenkernel/intern/mesh_sample.c

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

diff --git a/source/blender/blenkernel/intern/hair.c b/source/blender/blenkernel/intern/hair.c
index c2e9bbba0eb..cbb8c2d2711 100644
--- a/source/blender/blenkernel/intern/hair.c
+++ b/source/blender/blenkernel/intern/hair.c
@@ -203,12 +203,13 @@ void BKE_hair_generate_follicles(
 		
 		BKE_mesh_sample_generator_bind(gen, scalp);
 		
+		static const bool use_threads = true;
 		pattern->num_follicles = BKE_mesh_sample_generate_batch_ex(
 		            gen,
 		            &pattern->follicles->mesh_sample,
 		            sizeof(HairFollicle),
 		            max_count,
-		            true);
+		            use_threads);
 		
 		BKE_mesh_sample_free_generator(gen);
 	}
diff --git a/source/blender/blenkernel/intern/mesh_sample.c b/source/blender/blenkernel/intern/mesh_sample.c
index e364c205830..cc673f62774 100644
--- a/source/blender/blenkernel/intern/mesh_sample.c
+++ b/source/blender/blenkernel/intern/mesh_sample.c
@@ -1094,7 +1094,7 @@ static bool generator_poissondisk_make_sample(const MSurfaceSampleGenerator_Pois
 		}
 	}
 	
-	return false;
+	return found_sample;
 }
 
 MeshSampleGenerator *BKE_mesh_sample_gen_surface_poissondisk(unsigned int seed, float mindist, unsigned int max_samples,