Skip to content

Commit 2af0aef

Browse files
fix(eye): guard missing model instance (#7180)
1 parent d9a6330 commit 2af0aef

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

code/ship/ship.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15591,7 +15591,7 @@ void object_get_eye(vec3d *eye_pos, matrix *eye_orient, const object *obj, bool
1559115591
int current_viewpoint = (obj->type == OBJ_SHIP) ? Ships[obj->instance].current_viewpoint : 0;
1559215592

1559315593
// if no viewpoints, or invalid viewpoint, return the origin
15594-
if (!pm || (pm->n_view_positions <= 0) || (current_viewpoint < 0) || (current_viewpoint >= pm->n_view_positions)) {
15594+
if (!pm || !pmi || (pm->n_view_positions <= 0) || (current_viewpoint < 0) || (current_viewpoint >= pm->n_view_positions)) {
1559515595
*eye_pos = local_pos ? vmd_zero_vector : obj->pos;
1559615596
*eye_orient = local_orient ? vmd_identity_matrix : obj->orient;
1559715597
return;

0 commit comments

Comments
 (0)