[Bf-blender-cvs] [d8db153] strand_nodes: Switch combing tool back to using vertex displacement rather than edge rotation (tentatively).

[Lukas Tönne]

Commit: d8db153767280f9b2b23ef82b3cd576ab0aca989
Author: Lukas Tönne
Date:   Fri Aug 5 11:02:50 2016 +0200
Branches: strand_nodes
https://developer.blender.org/rBd8db153767280f9b2b23ef82b3cd576ab0aca989

Switch combing tool back to using vertex displacement rather than edge rotation (tentatively).

This method is more straightforward and easier to predict when testing constraint solving.

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

M	source/blender/editors/hair/hair_stroke.c

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

diff --git a/source/blender/editors/hair/hair_stroke.c b/source/blender/editors/hair/hair_stroke.c
index 935f5d9..f81a0ed 100644
--- a/source/blender/editors/hair/hair_stroke.c
+++ b/source/blender/editors/hair/hair_stroke.c
@@ -212,7 +212,7 @@ bool hair_test_vertex_inside_lasso(HairViewData *viewdata, const int mcoords[][2
 typedef void (*VertexToolCb)(HairToolData *data, void *userdata, BMVert *v, float factor);
 
 /* apply tool directly to each vertex inside the filter area */
-static int UNUSED_FUNCTION(hair_tool_apply_vertex)(HairToolData *data, VertexToolCb cb, void *userdata)
+static int hair_tool_apply_vertex(HairToolData *data, VertexToolCb cb, void *userdata)
 {
 	BMesh *bm = data->edit->base.bm;
 	Scene *scene = data->scene;
@@ -330,7 +330,7 @@ typedef struct CombData {
 	float power;
 } CombData;
 
-static void UNUSED_FUNCTION(hair_vertex_comb)(HairToolData *data, void *userdata, BMVert *v, float factor)
+static void hair_vertex_comb(HairToolData *data, void *userdata, BMVert *v, float factor)
 {
 	CombData *combdata = userdata;
 	
@@ -479,7 +479,8 @@ bool hair_brush_step(HairToolData *data)
 			else
 				combdata.power = 1.0f - combdata.power;
 			
-			tot = hair_tool_apply_edge(data, hair_edge_comb, &combdata);
+//			tot = hair_tool_apply_edge(data, hair_edge_comb, &combdata);
+			tot = hair_tool_apply_vertex(data, hair_vertex_comb, &combdata);
 			break;
 		}
 		case HAIR_TOOL_CUT: