diff options
| author | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2012-11-27 05:18:54 +0400 |
|---|---|---|
| committer | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2012-11-27 05:18:54 +0400 |
| commit | ff7c690e4064bbb1d6180668625d7b414000e9ea (patch) | |
| tree | 4ac96ca8ed5a4e6a7ab1104d0271aba02266ace6 /source/blender/makesdna/DNA_action_types.h | |
| parent | 6b65102c20e9bdafd90f55f60c2a2084d873e809 (diff) | |
| parent | 9b32776be349f5e738b449ca1298e65ce1b69d33 (diff) | |
Merge w/ trunk: r52086-r52534 (As with last time, the game engine was not merged)soc-2012-swiss_cheese
Diffstat (limited to 'source/blender/makesdna/DNA_action_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_action_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index d8d1ad78451..f227af78dab 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -372,7 +372,7 @@ typedef enum ePose_Flags { /* bPose->iksolver and bPose->ikparam->iksolver */ typedef enum ePose_IKSolverType { - IKSOLVER_LEGACY = 0, + IKSOLVER_STANDARD = 0, IKSOLVER_ITASC = 1 } ePose_IKSolverType; |