archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T99997: Calling teleport without waiting for the previous event disables gravity

Browse Source 
During teleport event, gravity is disabled and WalkMethod
is stored in `teleport.navigation_mode` which is used later to reset
the status after execution. Calling teleport events consecutively
will change the initial WalkMethod value. So update it only on the
first call. Also remove `else condition` as it stops the previously running
teleport when the new teleport call fails to find a hit point.

Reviewed by: dfelinto, mano-wii

Differential Revision: https://developer.blender.org/D15574
This commit is contained in:
Pratik Borhade
2022-10-19 18:20:47 +05:30
parent 3ac2f15a04
commit ead3fc4a07
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/space_view3d/view3d_navigate_walk.c
View File

@@ -849,11 +849,15 @@ static void walkEvent(WalkInfo *walk, const wmEvent *event)
if (ret) { if (ret) {
WalkTeleport *teleport = &walk->teleport; WalkTeleport *teleport = &walk->teleport;
/* Store the current navigation mode if we are not already teleporting. */
if (teleport->state == WALK_TELEPORT_STATE_OFF) {
teleport->navigation_mode = walk->navigation_mode;
}
teleport->state = WALK_TELEPORT_STATE_ON; teleport->state = WALK_TELEPORT_STATE_ON;
teleport->initial_time = PIL_check_seconds_timer(); teleport->initial_time = PIL_check_seconds_timer();
teleport->duration = U.walk_navigation.teleport_time; teleport->duration = U.walk_navigation.teleport_time;
teleport->navigation_mode = walk->navigation_mode;
walk_navigation_mode_set(walk, WALK_MODE_FREE); walk_navigation_mode_set(walk, WALK_MODE_FREE);
copy_v3_v3(teleport->origin, walk->rv3d->viewinv[3]); copy_v3_v3(teleport->origin, walk->rv3d->viewinv[3]);
@@ -864,9 +868,7 @@ static void walkEvent(WalkInfo *walk, const wmEvent *event)
sub_v3_v3v3(teleport->direction, loc, teleport->origin); sub_v3_v3v3(teleport->direction, loc, teleport->origin);
} }
else {
walk->teleport.state = WALK_TELEPORT_STATE_OFF;
}
break; break;
} }