From 7939d08c6aed01719cc91985edd5473d9c2b4f4a Mon Sep 17 00:00:00 2001 From: Azaezel Date: Mon, 7 Jan 2019 06:22:24 -0600 Subject: [PATCH 1/2] afxRenderHighlightMgr: account for hardware skinning --- Engine/source/afx/afxRenderHighlightMgr.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Engine/source/afx/afxRenderHighlightMgr.cpp b/Engine/source/afx/afxRenderHighlightMgr.cpp index 28e875eb9..0727f9d9b 100644 --- a/Engine/source/afx/afxRenderHighlightMgr.cpp +++ b/Engine/source/afx/afxRenderHighlightMgr.cpp @@ -151,7 +151,13 @@ void afxRenderHighlightMgr::render( SceneRenderState *state ) matrixSet.setProjection(*passRI->projection); mat->setTransforms(matrixSet, state); - mat->setSceneInfo(state, sgData); + // Setup HW skinning transforms if applicable + if (mat->usesHardwareSkinning()) + { + mat->setNodeTransforms(passRI->mNodeTransforms, passRI->mNodeTransformCount); + } + + mat->setSceneInfo(state, sgData); mat->setBuffers(passRI->vertBuff, passRI->primBuff); if ( passRI->prim ) From 6e4ed303f6dce11c878d1cf4b52efa7dd2c0a617 Mon Sep 17 00:00:00 2001 From: Brian Roberts Date: Mon, 7 Jan 2019 11:41:17 -0600 Subject: [PATCH 2/2] Update afxRenderHighlightMgr.cpp --- Engine/source/afx/afxRenderHighlightMgr.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Engine/source/afx/afxRenderHighlightMgr.cpp b/Engine/source/afx/afxRenderHighlightMgr.cpp index 0727f9d9b..22632b1ef 100644 --- a/Engine/source/afx/afxRenderHighlightMgr.cpp +++ b/Engine/source/afx/afxRenderHighlightMgr.cpp @@ -151,13 +151,13 @@ void afxRenderHighlightMgr::render( SceneRenderState *state ) matrixSet.setProjection(*passRI->projection); mat->setTransforms(matrixSet, state); - // Setup HW skinning transforms if applicable - if (mat->usesHardwareSkinning()) - { - mat->setNodeTransforms(passRI->mNodeTransforms, passRI->mNodeTransformCount); - } + // Setup HW skinning transforms if applicable + if (mat->usesHardwareSkinning()) + { + mat->setNodeTransforms(passRI->mNodeTransforms, passRI->mNodeTransformCount); + } - mat->setSceneInfo(state, sgData); + mat->setSceneInfo(state, sgData); mat->setBuffers(passRI->vertBuff, passRI->primBuff); if ( passRI->prim ) @@ -179,4 +179,4 @@ void afxRenderHighlightMgr::render( SceneRenderState *state ) // Make sure the effect is gonna render. getSelectionEffect()->setSkip( false ); -} \ No newline at end of file +}