[Bf-blender-cvs] [16d631f5f09] hair_guides_grooming: Use DM function for evaluating groom bundle mesh samples.

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


Commit: 16d631f5f094f9877fd3c9b41e5197ba1488d0d3
Author: Lukas Tönne
Date:   Wed May 23 12:36:56 2018 +0100
Branches: hair_guides_grooming
https://developer.blender.org/rB16d631f5f094f9877fd3c9b41e5197ba1488d0d3

Use DM function for evaluating groom bundle mesh samples.

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

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

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

diff --git a/source/blender/blenkernel/intern/groom.c b/source/blender/blenkernel/intern/groom.c
index 3f607916169..47b45cdb1c9 100644
--- a/source/blender/blenkernel/intern/groom.c
+++ b/source/blender/blenkernel/intern/groom.c
@@ -279,7 +279,7 @@ static bool groom_shape_rebuild(GroomBundle *bundle, int numshapeverts, Object *
 	/* last sample is the center position */
 	MeshSample *center_sample = &bundle->scalp_region[numshapeverts];
 	float center_co[3], center_nor[3], center_tang[3], center_binor[3];
-	if (!BKE_mesh_sample_eval(dm, center_sample, center_co, center_nor, center_tang))
+	if (!BKE_mesh_sample_eval_DM(dm, center_sample, center_co, center_nor, center_tang))
 	{
 		result = false;
 		goto cleanup;
@@ -292,7 +292,7 @@ static bool groom_shape_rebuild(GroomBundle *bundle, int numshapeverts, Object *
 	{
 		/* 3D position of the shape vertex origin on the mesh */
 		float co[3], nor[3], tang[3];
-		if (!BKE_mesh_sample_eval(dm, sample, co, nor, tang))
+		if (!BKE_mesh_sample_eval_DM(dm, sample, co, nor, tang))
 		{
 			result = false;
 			goto cleanup;



More information about the Bf-blender-cvs mailing list