[Bf-blender-cvs] [25bb3669cce] hair_guides: Disable unfinished code.

Lukas Tönne noreply at git.blender.org
Sun Apr 15 12:17:28 CEST 2018


Commit: 25bb3669cce9b0c409544440a23c29370ba86c24
Author: Lukas Tönne
Date:   Sun Apr 15 11:17:07 2018 +0100
Branches: hair_guides
https://developer.blender.org/rB25bb3669cce9b0c409544440a23c29370ba86c24

Disable unfinished code.

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

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

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

diff --git a/source/blender/blenkernel/intern/groom.c b/source/blender/blenkernel/intern/groom.c
index e64fd5ca297..0a63a1aaaf0 100644
--- a/source/blender/blenkernel/intern/groom.c
+++ b/source/blender/blenkernel/intern/groom.c
@@ -538,7 +538,7 @@ static void groom_generate_guide_curves(
 	
 	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], );
 	}
 	
 	BKE_hair_guide_curves_end(hsys);
@@ -560,7 +560,12 @@ void BKE_groom_hair_distribute(Groom *groom, unsigned int seed, int hair_count,
 	BKE_hair_generate_follicles(hsys, scalp, seed, hair_count);
 	
 	unsigned int guide_seed = BLI_ghashutil_combine_hash(seed, BLI_ghashutil_strhash("groom guide curves"));
-	groom_bundle_generate_guide_curves(groom, scalp, guide_seed, guide_curve_count);
+	groom_generate_guide_curves(groom, scalp, guide_seed, guide_curve_count);
+}
+
+void BKE_groom_hair_update_guide_curves(Groom *groom)
+{
+	UNUSED_VARS(groom);
 }



More information about the Bf-blender-cvs mailing list