redstrate/prism
Archived
1
Fork 0
Code Activity

Fix cutscene editor compilation

Browse source
This commit is contained in:
Joshua Goins 2022-02-18 09:56:48 -05:00
parent eb9951fc8d
commit 0283cebcb8
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/cutsceneeditor/src/cutsceneeditor.cpp
View file

@ -317,7 +317,7 @@ void CutsceneEditor::drawUI() {
ImGui::SetNextItemWidth(50.0f); ImGui::SetNextItemWidth(50.0f);
const char* preview_value = "None"; const char* preview_value = "None";
if(currentChannel->target != NullObject && currentShot->scene->has<Data>(currentChannel->target)) if(currentChannel->target != prism::NullObject && currentShot->scene->has<Data>(currentChannel->target))
preview_value = currentShot->scene->get(currentChannel->target).name.c_str(); preview_value = currentShot->scene->get(currentChannel->target).name.c_str();
if(ImGui::BeginCombo("Target", preview_value)) { if(ImGui::BeginCombo("Target", preview_value)) {
@ -333,7 +333,7 @@ void CutsceneEditor::drawUI() {
for(auto& bone : currentShot->scene->get<Renderable>(object).mesh->bones) { for(auto& bone : currentShot->scene->get<Renderable>(object).mesh->bones) {
if(ImGui::Selectable(bone.name.c_str())) { if(ImGui::Selectable(bone.name.c_str())) {
currentChannel->bone = &bone; currentChannel->bone = &bone;
currentChannel->target = NullObject; currentChannel->target = prism::NullObject;
} }
} }