Merge branch 'main' into PlayerController
This commit is contained in:
commit
9eb5399f7b
|
@ -158,8 +158,11 @@ namespace SHADE
|
||||||
if (SHEditorUI::CollapsingHeader("Existing Animation Clips"))
|
if (SHEditorUI::CollapsingHeader("Existing Animation Clips"))
|
||||||
{
|
{
|
||||||
ImGui::Indent();
|
ImGui::Indent();
|
||||||
|
int i = 0;
|
||||||
for (auto animClip : childAnimClips)
|
for (auto animClip : childAnimClips)
|
||||||
{
|
{
|
||||||
|
ImGui::PushID(i++);
|
||||||
|
|
||||||
bool changed = false;
|
bool changed = false;
|
||||||
std::optional<std::string> animClipName = SHResourceManager::GetAssetName<SHAnimationClip>(animClip);
|
std::optional<std::string> animClipName = SHResourceManager::GetAssetName<SHAnimationClip>(animClip);
|
||||||
|
|
||||||
|
@ -197,6 +200,8 @@ namespace SHADE
|
||||||
SHAssetManager::SaveAsset(assetId.value());
|
SHAssetManager::SaveAsset(assetId.value());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ImGui::PopID();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Extra separator if there is more than one
|
// Extra separator if there is more than one
|
||||||
|
|
Loading…
Reference in New Issue