diff --git a/Engine/source/ts/collada/colladaAppMesh.cpp b/Engine/source/ts/collada/colladaAppMesh.cpp index c1420d1cd..a6bb56f04 100644 --- a/Engine/source/ts/collada/colladaAppMesh.cpp +++ b/Engine/source/ts/collada/colladaAppMesh.cpp @@ -152,7 +152,7 @@ private: // Add the input to the right place in the list (somewhere between start and end) for (S32 i = start; i <= end; i++) { - const domInputLocalOffset* localOffset = daeSafeCast(sortedInputs[i]); + localOffset = daeSafeCast(sortedInputs[i]); domUint set = localOffset ? localOffset->getSet() : 0xFFFFFFFF; if (newSet < set) { for (S32 j = i + 1; j <= end; j++) @@ -181,10 +181,10 @@ private: const char* semantic = SourceTypeToSemantic( type ); for (S32 iInput = 0; iInput < vertices->getInput_array().getCount(); iInput++) { - domInputLocal* input = vertices->getInput_array().get(iInput); - if (dStrEqual(input->getSemantic(), semantic)) + domInputLocal* vInput = vertices->getInput_array().get(iInput); + if (dStrEqual(vInput->getSemantic(), semantic)) { - source = daeSafeCast(findInputSource(input)); + source = daeSafeCast(findInputSource(vInput)); break; } } @@ -977,7 +977,7 @@ void ColladaAppMesh::lookupSkinData() bool tooManyWeightsWarning = false; for (S32 iVert = 0; iVert < vertsPerFrame; iVert++) { const domUint* vcount = (domUint*)weights_vcount.getRaw(0); - const domInt* vindices = (domInt*)weights_v.getRaw(0); + vindices = (domInt*)weights_v.getRaw(0); vindices += vindicesOffset[vertTuples[iVert].vertex]; S32 nonZeroWeightCount = 0; diff --git a/Engine/source/ts/collada/colladaImport.cpp b/Engine/source/ts/collada/colladaImport.cpp index 1cc2909b0..ded830d5c 100644 --- a/Engine/source/ts/collada/colladaImport.cpp +++ b/Engine/source/ts/collada/colladaImport.cpp @@ -120,9 +120,9 @@ static void processNode(GuiTreeViewCtrl* tree, domNode* node, S32 parentID, Scen for (S32 i = 0; i < node->getInstance_node_array().getCount(); i++) { domInstance_node* instnode = node->getInstance_node_array()[i]; - domNode* node = daeSafeCast(instnode->getUrl().getElement()); - if (node) - processNode(tree, node, nodeID, stats); + domNode* dNode = daeSafeCast(instnode->getUrl().getElement()); + if (dNode) + processNode(tree, dNode, nodeID, stats); } } diff --git a/Engine/source/ts/collada/colladaUtils.cpp b/Engine/source/ts/collada/colladaUtils.cpp index c9b7872b1..974d2a8ed 100644 --- a/Engine/source/ts/collada/colladaUtils.cpp +++ b/Engine/source/ts/collada/colladaUtils.cpp @@ -266,10 +266,10 @@ void AnimData::parseTargetString(const char* target, S32 fullCount, const char* targetValueCount = 1; } } - else if (const char* p = dStrrchr(target, '.')) { + else if (const char* p2 = dStrrchr(target, '.')) { // Check for named elements for (S32 iElem = 0; elements[iElem][0] != 0; iElem++) { - if (!dStrcmp(p, elements[iElem])) { + if (!dStrcmp(p2, elements[iElem])) { targetValueOffset = iElem; targetValueCount = 1; break; diff --git a/Engine/source/ts/loader/tsShapeLoader.h b/Engine/source/ts/loader/tsShapeLoader.h index 32b462e46..e58496ce7 100644 --- a/Engine/source/ts/loader/tsShapeLoader.h +++ b/Engine/source/ts/loader/tsShapeLoader.h @@ -118,8 +118,6 @@ protected: Vector nodeScaleRotCache; Vector nodeScaleCache; - Point3F shapeOffset; ///< Offset used to translate the shape origin - //-------------------------------------------------------------------------- // Collect the nodes, objects and sequences for the scene