[Bf-blender-cvs] [cd14565c0d2] hair_guides_grooming: Dummy vertices for hair guides, just to avoid uninitialized data for now.

Lukas Tönne noreply at git.blender.org
Thu May 24 11:33:47 CEST 2018


Commit: cd14565c0d253475f686508f96c32c29e59c7e98
Author: Lukas Tönne
Date:   Wed May 23 12:37:29 2018 +0100
Branches: hair_guides_grooming
https://developer.blender.org/rBcd14565c0d253475f686508f96c32c29e59c7e98

Dummy vertices for hair guides, just to avoid uninitialized data for now.

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

M	source/blender/blenkernel/intern/groom.c

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

diff --git a/source/blender/blenkernel/intern/groom.c b/source/blender/blenkernel/intern/groom.c
index 47b45cdb1c9..11c86b1c458 100644
--- a/source/blender/blenkernel/intern/groom.c
+++ b/source/blender/blenkernel/intern/groom.c
@@ -534,14 +534,27 @@ static void groom_generate_guide_curves(
 		BKE_mesh_sample_free_generator(gen);
 	}
 	
+	const int numverts = 20;
 	BKE_hair_guide_curves_begin(hsys, num_guides);
-	
 	for (int i = 0; i < num_guides; ++i)
 	{
-//		BKE_hair_set_guide_curve(hsys, i, &guide_samples[i], );
+		BKE_hair_set_guide_curve(hsys, i, &guide_samples[i], numverts);
 	}
-	
 	BKE_hair_guide_curves_end(hsys);
+
+	{
+		int idx = 0;
+		for (int i = 0; i < num_guides; ++i)
+		{
+			for (int j = 0; j < numverts; ++j)
+			{
+				float co[3];
+				zero_v3(co);
+				BKE_hair_set_guide_vertex(hsys, idx, 0, co);
+				++idx;
+			}
+		}
+	}
 	
 	MEM_freeN(guide_samples);
 }



More information about the Bf-blender-cvs mailing list