Integrating github/staging through commit ab87ed9

Code/Sandbox/Editor/Util/AffineParts.cpp

@@ -594,7 +594,8 @@ Quatern snuggle(Quatern q, HVect* k)
         mag[2] = (double)q.y * q.z + (double)q.x * q.w;
         for (i = 0; i < 3; i++)
         {
-            if (neg[i] = (mag[i] < 0.0))
+            neg[i] = (mag[i] < 0.0);
+            if (neg[i])
             {
                 mag[i] = -mag[i];
             }
@@ -670,7 +671,8 @@ Quatern snuggle(Quatern q, HVect* k)
         for (i = 0; i < 4; i++)
         {
             pa[i] = 0.0;
-            if (neg[i] = (qa[i] < 0.0))
+            neg[i] = (qa[i] < 0.0);
+            if (neg[i])
             {
                 qa[i] = -qa[i];
             }

Code/Sandbox/Editor/Util/ImageGif.cpp

@@ -315,9 +315,11 @@ bool CImageGif::Load(const QString& fileName, CImageEx& outImage)
         }
         }
 
-        while ((ch = NEXTBYTE))
+        ch = NEXTBYTE;
+        while (ch)
         {
             ptr += ch;
+            ch = NEXTBYTE;
         }
     }
 

Code/Sandbox/Editor/Util/Image_DXTC.cpp

@@ -266,9 +266,6 @@ bool CImage_DXTC::Load(const char* filename, CImageEx& outImage, bool* pQualityL
 
     BYTE* pDecompBytes;
 
-    // Does texture have mipmaps?
-    bool bMipTexture = pImage->mfGet_numMips() > 1;
-
     ETEX_Format eFormat = pImage->mfGetFormat();
     int imageFlags = pImage->mfGet_Flags();
 
@@ -298,9 +295,6 @@ bool CImage_DXTC::Load(const char* filename, CImageEx& outImage, bool* pQualityL
 
     int nHorizontalFaces(1);
     int nVerticalFaces(1);
-    int nNumFaces(1);
-    int nMipMapsSize(0);
-    int nMipMapCount(numMips);
     int nTargetPitch(imageWidth * 4);
     int nTargetPageSize(nTargetPitch * imageHeight);
 

Code/Sandbox/Editor/Util/MemoryBlock.cpp

@@ -174,7 +174,10 @@ void CMemoryBlock::Uncompress(CMemoryBlock& toBlock) const
     toBlock.Allocate(m_uncompressedSize);
     toBlock.m_uncompressedSize = 0;
     unsigned long destSize = m_uncompressedSize;
-    int result = uncompress((unsigned char*)toBlock.GetBuffer(), &destSize, (unsigned char*)GetBuffer(), GetSize());
+#if !defined(NDEBUG)
+    int result =
+#endif
+        uncompress((unsigned char*)toBlock.GetBuffer(), &destSize, (unsigned char*)GetBuffer(), GetSize());
     assert(result == Z_OK);
     assert(destSize == m_uncompressedSize);
 }

Code/Sandbox/Editor/Util/PathUtil.cpp

@@ -98,7 +98,6 @@ namespace Path
         const char*             szSourceDirectory(strSourceDirectory.c_str());
         const char*             pchCurrentPosition(szSourceDirectory);
         const char*             pchLastPosition(szSourceDirectory);
-        const char*             pchAuxPosition(szSourceDirectory);
 
         rcstrDirectoryTree.clear();
 

Code/Sandbox/Editor/Util/XmlHistoryManager.cpp

@@ -313,7 +313,10 @@ void CXmlHistoryManager::RecordUndo(IXmlUndoEventHandler* pEventHandler, const c
     assert(pChangedXml);
 
     XmlNodeRef newData = gEnv->pSystem->CreateXmlNode();
-    bool bRes = pEventHandler->SaveToXml(newData);
+#if !defined(NDEBUG)
+    bool bRes =
+#endif
+        pEventHandler->SaveToXml(newData);
     assert(bRes);
 
     TXmlHistotyGroupPtrList activeGroups = m_HistoryInfoMap[ m_CurrentVersion ].ActiveGroups;