From 3b63bd8f08ec75e17ae3def0fb2299be0bc97809 Mon Sep 17 00:00:00 2001 From: Whirly Date: Tue, 16 Oct 2012 13:44:38 +0100 Subject: [PATCH] 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. --- indra/newview/llfloatermodelpreview.cpp | 26 +++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 61f067253a..acd7140049 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -1394,6 +1394,32 @@ LLModelLoader::LLModelLoader( std::string filename, S32 lod, LLModelPreview* pre mJointMap["lShin"] = "mKneeLeft"; mJointMap["lFoot"] = "mFootLeft"; +// 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"; +// FIRE-7937 end + if (mPreview) { //only try to load from slm if viewer is configured to do so and this is the