Skip to content

Commit

Permalink
Merge pull request CedricGuillemet#312 from kimidaisuki22/master
Browse files Browse the repository at this point in the history
fix manipulate lost control when moving out
  • Loading branch information
CedricGuillemet authored Oct 26, 2023
2 parents be3d9cd + 0adb575 commit 090184e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions ImGuizmo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -990,7 +990,7 @@ namespace IMGUIZMO_NAMESPACE
{
return (gContext.mbUsing && (gContext.mActualID == -1 || gContext.mActualID == gContext.mEditingID)) || gContext.mbUsingBounds;
}

bool IsUsingAny()
{
return gContext.mbUsing || gContext.mbUsingBounds;
Expand Down Expand Up @@ -2516,7 +2516,7 @@ namespace IMGUIZMO_NAMESPACE
// behind camera
vec_t camSpacePosition;
camSpacePosition.TransformPoint(makeVect(0.f, 0.f, 0.f), gContext.mMVP);
if (!gContext.mIsOrthographic && camSpacePosition.z < 0.001f)
if (!gContext.mIsOrthographic && camSpacePosition.z < 0.001f && !gContext.mbUsing)
{
return false;
}
Expand Down Expand Up @@ -2955,7 +2955,7 @@ namespace IMGUIZMO_NAMESPACE
interpolationUp = referenceUp;
}
interpolationFrames = 40;

}
isClicking = false;
isDraging = false;
Expand Down

0 comments on commit 090184e

Please sign in to comment.