Skip to content

Commit c5e9fdb

Browse files
Fix Property tooltips not appearing, Fix crash when a rigidbody with the Hulls collision mode collides with something when given no hulls
1 parent 142fa55 commit c5e9fdb

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

src/impl/InlayEditor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1779,7 +1779,7 @@ static void propertyTooltip(const std::string_view& PropName, EntityComponent Co
17791779
if (ForceRenderingTooltip.size() > 0 && PropName != ForceRenderingTooltip)
17801780
return;
17811781

1782-
if ((ImGui::IsItemHovered() && (!ImGui::GetIO().WantCaptureKeyboard || UserInput::ShouldIgnoreUIInputSinking())) || ForceRenderingTooltip.size() > 0)
1782+
if (ImGui::IsItemHovered() || ForceRenderingTooltip.size() > 0)
17831783
{
17841784
std::string PropNameStr = std::string(PropName);
17851785

src/impl/geometry/Gjk.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ static glm::vec3 findFurthestPoint_Hulls(const EcRigidBody* Rb, glm::vec3 Direct
9494
maxPoint = findFurthestPoint_Mesh(Rb, Direction, mesh, &maxDistance, maxPoint);
9595
}
9696

97-
return maxPoint;
97+
return Rb->HullMeshIds.size() > 0 ? maxPoint : glm::vec3();
9898
}
9999

100100
static glm::vec3 findFurthestPoint(const EcRigidBody* Rb, glm::vec3 Direction)

0 commit comments

Comments
 (0)