Showing the changes to interface/src/Application.cpp (1 of 17 files). Show all
Unified · Split
| @@ -4331,13 +4331,6 @@ void Application::update(float deltaTime) { · 4330 unmodified lines | |||
| 4331 | if (nearbyEntitiesAreReadyForPhysics()) { | 4331 | if (nearbyEntitiesAreReadyForPhysics()) { |
| 4332 | _physicsEnabled = true; | 4332 | _physicsEnabled = true; |
| 4333 | getMyAvatar()->updateMotionBehaviorFromMenu(); | 4333 | getMyAvatar()->updateMotionBehaviorFromMenu(); |
| 4334 | } else { | ||
| 4335 | auto characterController = getMyAvatar()->getCharacterController(); | ||
| 4336 | if (characterController) { | ||
| 4337 | // if we have a character controller, disable it here so the avatar doesn't get stuck due to | ||
| 4338 | // a non-loading collision hull. | ||
| 4339 | characterController->setEnabled(false); | ||
| 4340 | } | ||
| 4341 | } | 4334 | } |
| 4342 | } | 4335 | } |
| 4343 | } else if (domainLoadingInProgress) { | 4336 | } else if (domainLoadingInProgress) { |