#2360 Elm props: Use element index in closest result intex calc

This commit is contained in:
Rebecca Cox
2018-01-10 14:14:36 +01:00
parent 65d85b82f7
commit 2ce7e2c3d2
4 changed files with 20 additions and 1 deletions

View File

@@ -175,7 +175,9 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::findOrLoadScalarResult(in
std::vector<RigFemScalarResultFrames*> resultsForEachComponent;
for (auto elem : elementProperties)
{
RigFemScalarResultFrames* currentFrames = m_femPartResults[partIndex]->createScalarResult(resVarAddr);
RigFemResultAddress addressForElement(RIG_ELEMENT, elem.first, "");
RigFemScalarResultFrames* currentFrames = m_femPartResults[partIndex]->createScalarResult(addressForElement);
currentFrames->enableAsSingleFrameResult();
currentFrames->frameData(0).swap(elem.second);
}
@@ -2175,6 +2177,10 @@ RigFemClosestResultIndexCalculator::RigFemClosestResultIndexCalculator(RigFemPar
{
m_resultIndexToClosestResult = -1;
}
else if (resultPosition == RIG_ELEMENT)
{
m_resultIndexToClosestResult = elementIndex;
}
else
{
m_resultIndexToClosestResult = m_closestElementNodeResIdx;