From bdedfb3755d54a6b4468a5251c9ddeae2b092d37 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 28 Aug 2020 21:00:04 +0300
Subject: SL-13566 'Use Joint Positions' Option causes collapsed Joints for
 some files

---
 indra/llprimitive/lldaeloader.cpp | 104 +++++++++++++++++++-------------------
 1 file changed, 53 insertions(+), 51 deletions(-)

(limited to 'indra')

diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp
index 3cb58d894e..d2aa3d8dc6 100644
--- a/indra/llprimitive/lldaeloader.cpp
+++ b/indra/llprimitive/lldaeloader.cpp
@@ -1229,7 +1229,7 @@ void LLDAELoader::processDomModel(LLModel* model, DAE* dae, daeElement* root, do
 				for (S32 i = 0; i < childCount; ++i)
 				{
 					domNode* pNode = daeSafeCast<domNode>(children[i]);
-					if ( isNodeAJoint( pNode ) )
+					if (pNode)
 					{
 						processJointNode( pNode, mJointList );
 					}
@@ -1854,59 +1854,61 @@ void LLDAELoader::processJointNode( domNode* pNode, JointTransformMap& jointTran
 	//LL_WARNS()<<"ProcessJointNode# Node:" <<pNode->getName()<<LL_ENDL;
 
 	//1. handle the incoming node - extract out translation via SID or element
+    if (isNodeAJoint(pNode))
+    {
+        LLMatrix4 workingTransform;
 
-	LLMatrix4 workingTransform;
-
-	//Pull out the translate id and store it in the jointTranslations map
-	daeSIDResolver jointResolverA( pNode, "./translate" );
-	domTranslate* pTranslateA = daeSafeCast<domTranslate>( jointResolverA.getElement() );
-	daeSIDResolver jointResolverB( pNode, "./location" );
-	domTranslate* pTranslateB = daeSafeCast<domTranslate>( jointResolverB.getElement() );
+        //Pull out the translate id and store it in the jointTranslations map
+        daeSIDResolver jointResolverA(pNode, "./translate");
+        domTranslate* pTranslateA = daeSafeCast<domTranslate>(jointResolverA.getElement());
+        daeSIDResolver jointResolverB(pNode, "./location");
+        domTranslate* pTranslateB = daeSafeCast<domTranslate>(jointResolverB.getElement());
 
-	//Translation via SID was successful
-	if ( pTranslateA )
-	{
-		extractTranslation( pTranslateA, workingTransform );
-	}
-	else
-	if ( pTranslateB )
-	{
-		extractTranslation( pTranslateB, workingTransform );
-	}
-	else
-	{
-		//Translation via child from element
-		daeElement* pTranslateElement = getChildFromElement( pNode, "translate" );
-		if ( !pTranslateElement || pTranslateElement->typeID() != domTranslate::ID() )
-		{
-			//LL_WARNS()<< "The found element is not a translate node" <<LL_ENDL;
-			daeSIDResolver jointResolver( pNode, "./matrix" );
-			domMatrix* pMatrix = daeSafeCast<domMatrix>( jointResolver.getElement() );
-			if ( pMatrix )
-			{
-				//LL_INFOS()<<"A matrix SID was however found!"<<LL_ENDL;
-				domFloat4x4 domArray = pMatrix->getValue();									
-				for ( int i = 0; i < 4; i++ )
-				{
-					for( int j = 0; j < 4; j++ )
-					{
-						workingTransform.mMatrix[i][j] = domArray[i + j*4];
-					}
-				}
-			}
-			else
-			{
-				LL_WARNS()<< "The found element is not translate or matrix node - most likely a corrupt export!" <<LL_ENDL;
-			}
-		}
-		else
-		{
-			extractTranslationViaElement( pTranslateElement, workingTransform );
-		}
-	}
+        //Translation via SID was successful
+        if (pTranslateA)
+        {
+            extractTranslation(pTranslateA, workingTransform);
+        }
+        else
+            if (pTranslateB)
+            {
+                extractTranslation(pTranslateB, workingTransform);
+            }
+            else
+            {
+                //Translation via child from element
+                daeElement* pTranslateElement = getChildFromElement(pNode, "translate");
+                if (!pTranslateElement || pTranslateElement->typeID() != domTranslate::ID())
+                {
+                    //LL_WARNS()<< "The found element is not a translate node" <<LL_ENDL;
+                    daeSIDResolver jointResolver(pNode, "./matrix");
+                    domMatrix* pMatrix = daeSafeCast<domMatrix>(jointResolver.getElement());
+                    if (pMatrix)
+                    {
+                        //LL_INFOS()<<"A matrix SID was however found!"<<LL_ENDL;
+                        domFloat4x4 domArray = pMatrix->getValue();
+                        for (int i = 0; i < 4; i++)
+                        {
+                            for (int j = 0; j < 4; j++)
+                            {
+                                workingTransform.mMatrix[i][j] = domArray[i + j * 4];
+                            }
+                        }
+                    }
+                    else
+                    {
+                        LL_WARNS() << "The found element is not translate or matrix node - most likely a corrupt export!" << LL_ENDL;
+                    }
+                }
+                else
+                {
+                    extractTranslationViaElement(pTranslateElement, workingTransform);
+                }
+            }
 
-	//Store the working transform relative to the nodes name.
-	jointTransforms[ pNode->getName() ] = workingTransform;
+        //Store the working transform relative to the nodes name.
+        jointTransforms[pNode->getName()] = workingTransform;
+    }
 
 	//2. handle the nodes children
 
-- 
cgit v1.2.3