birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Gems/EMotionFX

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-16 15:56:49 -07:00
parent 2963739288
commit 3060b0c1bb
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/EMotionFX/Source/ActorInstance.cpp
+1 -1
View File
@@ -1115,7 +1115,7 @@ namespace EMotionFX
void ActorInstance::EnableAllNodes() void ActorInstance::EnableAllNodes()
{ {
m_enabledNodes.resize(m_actor->GetNumNodes()); m_enabledNodes.resize(m_actor->GetNumNodes());
std::iota(m_enabledNodes.begin(), m_enabledNodes.end(), 0); std::iota(m_enabledNodes.begin(), m_enabledNodes.end(), uint16(0));
} }
// disable all nodes // disable all nodes
Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphModel.cpp
+6 -6
View File
@@ -562,9 +562,9 @@ namespace EMStudio
ModelItemData modelItemData(graphInstance, animGraphObject); ModelItemData modelItemData(graphInstance, animGraphObject);
AZStd::pair<ModelItemDataSet::const_iterator, ModelItemDataSet::const_iterator> itModelItemData = m_modelItemDataSet.equal_range(&modelItemData); AZStd::pair<ModelItemDataSet::const_iterator, ModelItemDataSet::const_iterator> itModelItemData = m_modelItemDataSet.equal_range(&modelItemData);
for (ModelItemDataSet::const_iterator it = itModelItemData.first; it != itModelItemData.second; ++it) if (itModelItemData.first != itModelItemData.second)
{ {
ModelItemData* modelItemData2 = *it; ModelItemData* modelItemData2 = *itModelItemData.first;
return createIndex(modelItemData2->m_row, 0, modelItemData2); return createIndex(modelItemData2->m_row, 0, modelItemData2);
} }
return QModelIndex(); return QModelIndex();
@@ -590,9 +590,9 @@ namespace EMStudio
// Find the model index // Find the model index
ModelItemData modelItemData(animGraphInstance, animGraphObject); ModelItemData modelItemData(animGraphInstance, animGraphObject);
AZStd::pair<ModelItemDataSet::const_iterator, ModelItemDataSet::const_iterator> itModelItemData = m_modelItemDataSet.equal_range(&modelItemData); AZStd::pair<ModelItemDataSet::const_iterator, ModelItemDataSet::const_iterator> itModelItemData = m_modelItemDataSet.equal_range(&modelItemData);
for (ModelItemDataSet::const_iterator it = itModelItemData.first; it != itModelItemData.second; ++it) if (itModelItemData.first != itModelItemData.second)
{ {
ModelItemData* modelItemData2 = *it; ModelItemData* modelItemData2 = *itModelItemData.first;
return createIndex(modelItemData2->m_row, 0, modelItemData2); return createIndex(modelItemData2->m_row, 0, modelItemData2);
} }
} }
@@ -603,9 +603,9 @@ namespace EMStudio
// Find the model index // Find the model index
ModelItemData modelItemData(nullptr, animGraphObject); ModelItemData modelItemData(nullptr, animGraphObject);
AZStd::pair<ModelItemDataSet::const_iterator, ModelItemDataSet::const_iterator> itModelItemData = m_modelItemDataSet.equal_range(&modelItemData); AZStd::pair<ModelItemDataSet::const_iterator, ModelItemDataSet::const_iterator> itModelItemData = m_modelItemDataSet.equal_range(&modelItemData);
for (ModelItemDataSet::const_iterator it = itModelItemData.first; it != itModelItemData.second; ++it) if (itModelItemData.first != itModelItemData.second)
{ {
ModelItemData* modelItemData2 = *it; ModelItemData* modelItemData2 = *itModelItemData.first;
return createIndex(modelItemData2->m_row, 0, modelItemData2); return createIndex(modelItemData2->m_row, 0, modelItemData2);
} }
} }
Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/PropertyTypes.cpp
+2 -1
View File
@@ -89,8 +89,9 @@ namespace EMotionFX
AzToolsFramework::PropertyTypeRegistrationMessages::Bus::Broadcast(&AzToolsFramework::PropertyTypeRegistrationMessages::RegisterPropertyType, handler); AzToolsFramework::PropertyTypeRegistrationMessages::Bus::Broadcast(&AzToolsFramework::PropertyTypeRegistrationMessages::RegisterPropertyType, handler);
} }
return propertyHandlers; return propertyHandlers;
#endif #else
return AZStd::vector<AzToolsFramework::PropertyHandlerBase*> {}; return AZStd::vector<AzToolsFramework::PropertyHandlerBase*> {};
#endif
} }