[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49369] trunk/blender/source/blender/ ikplugin/intern/itasc_plugin.cpp: Revert last commit, was not the correct one.

Thomas Dinges blender at dingto.org
Sun Jul 29 22:00:00 CEST 2012


Revision: 49369
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49369
Author:   dingto
Date:     2012-07-29 19:59:58 +0000 (Sun, 29 Jul 2012)
Log Message:
-----------
Revert last commit, was not the correct one. Use the value instead of the variable for now, this will compile.

Campbell feel free to fix differently. 

Modified Paths:
--------------
    trunk/blender/source/blender/ikplugin/intern/itasc_plugin.cpp

Modified: trunk/blender/source/blender/ikplugin/intern/itasc_plugin.cpp
===================================================================
--- trunk/blender/source/blender/ikplugin/intern/itasc_plugin.cpp	2012-07-29 19:50:03 UTC (rev 49368)
+++ trunk/blender/source/blender/ikplugin/intern/itasc_plugin.cpp	2012-07-29 19:59:58 UTC (rev 49369)
@@ -66,7 +66,6 @@
 #include "DNA_scene_types.h"
 };
 
-#include "IK_solver.h"
 #include "itasc_plugin.h"
 
 // default parameters
@@ -1257,7 +1256,7 @@
 			ret = arm->addSegment(joint, parent, KDL::Joint::TransY, rot[ikchan->ndof - 1]);
 			const float ikstretch = pchan->ikstretch * pchan->ikstretch;
 			/* why invert twice here? */
-			weight[1] = (1.0 - minf(1.0 - ikstretch, 1.0f - IK_STRETCH_STIFF_EPS));
+			weight[1] = (1.0 - minf(1.0 - ikstretch, 1.0f - 0.001f));
 			weights.push_back(weight[1]);
 		}
 		if (!ret)




More information about the Bf-blender-cvs mailing list