[Bf-blender-cvs] [618fcb4] hair_immediate_fixes: Disabled the partial IK strand relaxation for the time being.

Lukas Tönne noreply at git.blender.org
Mon Jan 5 17:57:06 CET 2015

Commit: 618fcb49a9a1ac622690d0a7e87ddded5dc559f0
Author: Lukas Tönne
Date:   Mon Jan 5 17:55:44 2015 +0100
Branches: hair_immediate_fixes

Disabled the partial IK strand relaxation for the time being.

First goal is to reproduce current particle edit tools in the strand
edit mode, then make improvements.


M	source/blender/physics/intern/strands.cpp


diff --git a/source/blender/physics/intern/strands.cpp b/source/blender/physics/intern/strands.cpp
index ad64203..11e729c 100644
--- a/source/blender/physics/intern/strands.cpp
+++ b/source/blender/physics/intern/strands.cpp
@@ -76,7 +76,7 @@ static int strand_count_vertices(BMVert *root)
 	return len;
-static int strands_get_max_length(BMEditStrands *edit)
+static int UNUSED_FUNCTION(strands_get_max_length)(BMEditStrands *edit)
 	BMVert *root;
 	BMIter iter;
@@ -351,7 +351,7 @@ static VectorX strand_angles_to_loc(Object *ob, BMEditStrands *edit, BMVert *roo
 	return result;
-static void strand_apply_ik_result(Object *UNUSED(ob), BMEditStrands *UNUSED(edit), BMVert *root, const VectorX &solution)
+static void UNUSED_FUNCTION(strand_apply_ik_result)(Object *UNUSED(ob), BMEditStrands *UNUSED(edit), BMVert *root, const VectorX &solution)
 	BMVert *v;
 	BMIter iter_strand;
@@ -413,7 +413,7 @@ void BPH_strands_solve_constraints(Object *ob, BMEditStrands *edit, float (*orig
-	if (false) {
+	if (true) {
 	else {

More information about the Bf-blender-cvs mailing list