Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -40,8 +40,9 @@ SGraphicsPipelineStateDescription::SGraphicsPipelineStateDescription(
    {
        SSkinningData* pSkinningData = NULL;
        SRenderObjData* pOD = pObj->GetObjData();
-        if (pOD && (pSkinningData = pOD->m_pSkinningData))
+        if (pOD && pOD->m_pSkinningData)
        {
+            pSkinningData = pOD->m_pSkinningData;
            if (pSkinningData->nHWSkinningFlags & eHWS_Skinning_Matrix)
            {
                objectRuntimeMask |= (g_HWSR_MaskBit[HWSR_SKINNING_MATRIX]);