Fixed imgui error caused by merge
This commit is contained in:
parent
15bbf6892f
commit
a691d2ff28
|
@ -387,7 +387,7 @@ namespace SHADE
|
|||
else if (shape->GetType() == SHCollisionShape::Type::CAPSULE)
|
||||
{
|
||||
|
||||
//}
|
||||
}
|
||||
|
||||
{
|
||||
SHEditorWidgets::CheckBox("Is Trigger", [shape] { return shape->IsTrigger(); }, [shape](bool value) { shape->SetIsTrigger(value); });
|
||||
|
@ -448,12 +448,10 @@ namespace SHADE
|
|||
ImGui::EndMenu();
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
DrawContextMenu(component);
|
||||
}
|
||||
|
||||
ImGui::PopID();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue