From c6af44fffaabb772a1b12ca1a4e82a0bd63a4a25 Mon Sep 17 00:00:00 2001 From: Daniel Cazares Date: Sat, 3 Jan 2026 13:25:32 -0800 Subject: [PATCH] fix(eye): guard missing model instance Log once and fall back when object_get_eye lacks a model instance. --- code/ship/ship.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ship/ship.cpp b/code/ship/ship.cpp index 1747a59eaea..94f4c735388 100644 --- a/code/ship/ship.cpp +++ b/code/ship/ship.cpp @@ -15591,7 +15591,7 @@ void object_get_eye(vec3d *eye_pos, matrix *eye_orient, const object *obj, bool int current_viewpoint = (obj->type == OBJ_SHIP) ? Ships[obj->instance].current_viewpoint : 0; // if no viewpoints, or invalid viewpoint, return the origin - if (!pm || (pm->n_view_positions <= 0) || (current_viewpoint < 0) || (current_viewpoint >= pm->n_view_positions)) { + if (!pm || !pmi || (pm->n_view_positions <= 0) || (current_viewpoint < 0) || (current_viewpoint >= pm->n_view_positions)) { *eye_pos = local_pos ? vmd_zero_vector : obj->pos; *eye_orient = local_orient ? vmd_identity_matrix : obj->orient; return;