From c41e1e434ab9defa35178ad8886d81b60d889e9a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 29 Jul 2012 16:59:51 +0000 Subject: code cleanup: replace MIN2/MAX2 with minf/maxf --- source/blender/ikplugin/intern/itasc_plugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/ikplugin/intern') diff --git a/source/blender/ikplugin/intern/itasc_plugin.cpp b/source/blender/ikplugin/intern/itasc_plugin.cpp index 652b16a7c65..1154605c673 100644 --- a/source/blender/ikplugin/intern/itasc_plugin.cpp +++ b/source/blender/ikplugin/intern/itasc_plugin.cpp @@ -1255,7 +1255,7 @@ static IK_Scene *convert_tree(Scene *blscene, Object *ob, bPoseChannel *pchan) joint += ":TY"; ret = arm->addSegment(joint, parent, KDL::Joint::TransY, rot[ikchan->ndof - 1]); float ikstretch = pchan->ikstretch * pchan->ikstretch; - weight[1] = (1.0 - MIN2(1.0 - ikstretch, 0.99)); + weight[1] = (1.0 - minf(1.0 - ikstretch, 0.99)); weights.push_back(weight[1]); } if (!ret) -- cgit v1.2.3