diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-11-04 16:41:37 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-11-04 16:41:37 -0500 |
| commit | 3cf938bcec9a4925a4f7d8becb9b89ff559eb2e3 (patch) | |
| tree | 7bc43fab2a959220b527738ab274538fdc63fdb4 /indra/llcharacter | |
| parent | 1a7b2d3d388d12a16fab5e585f06ab0574136f3d (diff) | |
SL-124 WIP - BENTO comments and related cleanup
Diffstat (limited to 'indra/llcharacter')
| -rwxr-xr-x | indra/llcharacter/llbvhloader.cpp | 3 | ||||
| -rwxr-xr-x | indra/llcharacter/lljoint.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/indra/llcharacter/llbvhloader.cpp b/indra/llcharacter/llbvhloader.cpp index 4dedeeab52..b4f0bb9e18 100755 --- a/indra/llcharacter/llbvhloader.cpp +++ b/indra/llcharacter/llbvhloader.cpp @@ -903,8 +903,7 @@ ELoadStatus LLBVHLoader::loadBVHFile(const char *buffer, char* error_text, S32 & return E_ST_NO_CHANNELS; } - // FIXME BENTO do we want to open up motion of non-hip joints or - // not? Already effectively allowed via .anim upload. + // Animating position (via mNumChannels = 6) is only supported for mPelvis. int res = sscanf(line.c_str(), " CHANNELS %d", &joint->mNumChannels); if ( res != 1 ) { diff --git a/indra/llcharacter/lljoint.h b/indra/llcharacter/lljoint.h index 2a8ebed408..8d380cdc82 100755 --- a/indra/llcharacter/lljoint.h +++ b/indra/llcharacter/lljoint.h @@ -40,7 +40,7 @@ #include "xform.h" const S32 LL_CHARACTER_MAX_JOINTS_PER_MESH = 15; -// BENTO JOINT COUNT LIMIT +// BENTO JOINT COUNT LIMIT - need to set this to final skeleton size + 2 const U32 LL_CHARACTER_MAX_JOINTS = 152; // must be divisible by 4! const U32 LL_MAX_JOINTS_PER_MESH_OBJECT = 110; |