From 0283cebcb8c7be048c4cf1f2f53c36868a6a2978 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Fri, 18 Feb 2022 09:56:48 -0500 Subject: [PATCH] Fix cutscene editor compilation --- tools/cutsceneeditor/src/cutsceneeditor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/cutsceneeditor/src/cutsceneeditor.cpp b/tools/cutsceneeditor/src/cutsceneeditor.cpp index 3c61715..6f09d5e 100755 --- a/tools/cutsceneeditor/src/cutsceneeditor.cpp +++ b/tools/cutsceneeditor/src/cutsceneeditor.cpp @@ -317,7 +317,7 @@ void CutsceneEditor::drawUI() { ImGui::SetNextItemWidth(50.0f); const char* preview_value = "None"; - if(currentChannel->target != NullObject && currentShot->scene->has(currentChannel->target)) + if(currentChannel->target != prism::NullObject && currentShot->scene->has(currentChannel->target)) preview_value = currentShot->scene->get(currentChannel->target).name.c_str(); if(ImGui::BeginCombo("Target", preview_value)) { @@ -333,7 +333,7 @@ void CutsceneEditor::drawUI() { for(auto& bone : currentShot->scene->get(object).mesh->bones) { if(ImGui::Selectable(bone.name.c_str())) { currentChannel->bone = &bone; - currentChannel->target = NullObject; + currentChannel->target = prism::NullObject; } }