[Bf-blender-cvs] [be6965011bf] hair_guides: Use derivedFinal as scalp surface (for the time being).

[Lukas Tönne]

Commit: be6965011bfd82bdba6553020cb4e28927e188d4
Author: Lukas Tönne
Date:   Tue Jan 2 14:18:51 2018 +0000
Branches: hair_guides
https://developer.blender.org/rBbe6965011bfd82bdba6553020cb4e28927e188d4

Use derivedFinal as scalp surface (for the time being).

Eventually DerivedMesh will be deprecated and Mesh used instead,
but until then the surface sampling algorithms use DerivedMesh.

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

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

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

diff --git a/source/blender/blenkernel/intern/groom.c b/source/blender/blenkernel/intern/groom.c
index 79d2958cd06..bb08e31fa72 100644
--- a/source/blender/blenkernel/intern/groom.c
+++ b/source/blender/blenkernel/intern/groom.c
@@ -546,7 +546,5 @@ void BKE_groom_batch_cache_free(Groom *groom)
 
 struct DerivedMesh* BKE_groom_get_scalp(struct Groom *groom)
 {
-	// TODO
-	UNUSED_VARS(groom);
-	return NULL;
+	return groom->scalp_object ? groom->scalp_object->derivedFinal : NULL;
 }