livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-7937 : Adding dae import support for attachment point names. This patch allows ALL bones including all attachment points to be weighted to mesh and animated. Patch by Magus Freston.

Whirly 2012-10-16 13:44:38 +01:00
parent 6d5bd205c0
commit 3b63bd8f08
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
indra/newview/llfloatermodelpreview.cpp
View File

@ -1394,6 +1394,32 @@ LLModelLoader::LLModelLoader( std::string filename, S32 lod, LLModelPreview* pre
mJointMap["lShin"] = "mKneeLeft";
mJointMap["lFoot"] = "mFootLeft";
// <FS:WF> FIRE-7937 : Patch from Magus Freston - allows ALL bones including all attachment points to be weighted to mesh and animated
mJointMap["Right_Ear"] = "Right Ear";
mJointMap["Left_Ear"] = "Left Ear";
mJointMap["Right_Eyeball"] = "Right Eyeball";
mJointMap["Left_Eyeball"] = "Left Eyeball";
mJointMap["Right_Shoulder"] = "Right Shoulder";
mJointMap["Left_Shoulder"] = "Left Shoulder";
mJointMap["R_Upper_Arm"] = "R Upper Arm";
mJointMap["L_Upper_Arm"] = "L Upper Arm";
mJointMap["R_Forearm"] = "R Forearm";
mJointMap["L_Forearm"] = "L Forearm";
mJointMap["Right_Hand"] = "Right Hand";
mJointMap["Left_Hand"] = "Left Hand";
mJointMap["Right_Pec"] = "Right Pec";
mJointMap["Left_Pec"] = "Left Pec";
mJointMap["Avatar_Center"] = "Avatar Center";
mJointMap["Right_Hip"] = "Right Hip";
mJointMap["Left_Hip"] = "Left Hip";
mJointMap["R_Upper_Leg"] = "R Upper Leg";
mJointMap["L_Upper_Leg"] = "L Upper Leg";
mJointMap["R_Lower_Leg"] = "R Lower Leg";
mJointMap["R_Lower_Leg"] = "R Lower Leg";
mJointMap["Right_Foot"] = "Right Foot";
mJointMap["Left_Foot"] = "Left Foot";
// <FS:WF> FIRE-7937 end
if (mPreview)
{
//only try to load from slm if viewer is configured to do so and this is the