diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-10-03 18:04:27 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-10-03 18:04:27 -0400 |
| commit | 4dccf30bf318649c7b371355fd34cde6c143e867 (patch) | |
| tree | 4acbdefe0bb187a817583e835112f4317e11d596 /indra/llprimitive/llmodel.h | |
| parent | bd18f3c097304504c398df02613229a64f7eac81 (diff) | |
| parent | f7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff) | |
merge changes for 3.6.7-release
Diffstat (limited to 'indra/llprimitive/llmodel.h')
| -rwxr-xr-x | indra/llprimitive/llmodel.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h index 1cf528fd9f..aaafc55258 100755 --- a/indra/llprimitive/llmodel.h +++ b/indra/llprimitive/llmodel.h @@ -173,13 +173,15 @@ public: void optimizeVolumeFaces(); void offsetMesh( const LLVector3& pivotPoint ); void getNormalizedScaleTranslation(LLVector3& scale_out, LLVector3& translation_out); - + LLVector3 getTransformedCenter(const LLMatrix4& mat); + //reorder face list based on mMaterialList in this and reference so //order matches that of reference (material ordering touchup) bool matchMaterialOrder(LLModel* ref, int& refFaceCnt, int& modelFaceCnt ); bool isMaterialListSubset( LLModel* ref ); bool needToAddFaces( LLModel* ref, int& refFaceCnt, int& modelFaceCnt ); + std::vector<std::string> mMaterialList; //data used for skin weights |