diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-07-29 20:59:51 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-07-29 20:59:51 +0400 |
| commit | c41e1e434ab9defa35178ad8886d81b60d889e9a (patch) | |
| tree | 89cc6a948b408865e475ccb1f8c2cf98edac76bc /source/blender/ikplugin | |
| parent | 93ff6f6dff73cf24e591dd2678ee601495714dc7 (diff) | |
code cleanup: replace MIN2/MAX2 with minf/maxf
Diffstat (limited to 'source/blender/ikplugin')
| -rw-r--r-- | source/blender/ikplugin/intern/itasc_plugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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) |