qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-11 07:42:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

[renderer] Check view_model entity is valid

Browse source 
It usually is in quake, but my test scene does not have a view model.
This commit is contained in:
Bill Currie 2022-10-27 12:53:01 +09:00
parent fa057cb121
commit c605e50d52
4 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libs/video/renderer/gl/gl_rmain.c
View file

@ -160,6 +160,9 @@ static void
R_DrawViewModel (void) R_DrawViewModel (void)
{ {
entity_t ent = vr_data.view_model; entity_t ent = vr_data.view_model;
if (!Entity_Valid (ent)) {
return;
}
renderer_t *renderer = Ent_GetComponent (ent.id, scene_renderer, ent.reg); renderer_t *renderer = Ent_GetComponent (ent.id, scene_renderer, ent.reg);
if (vr_data.inhibit_viewmodel if (vr_data.inhibit_viewmodel
|| !r_drawviewmodel || !r_drawviewmodel

3
libs/video/renderer/glsl/glsl_main.c
View file

@ -116,6 +116,9 @@ static void
R_DrawViewModel (void) R_DrawViewModel (void)
{ {
entity_t ent = vr_data.view_model; entity_t ent = vr_data.view_model;
if (!Entity_Valid (ent)) {
return;
}
renderer_t *renderer = Ent_GetComponent (ent.id, scene_renderer, ent.reg); renderer_t *renderer = Ent_GetComponent (ent.id, scene_renderer, ent.reg);
if (vr_data.inhibit_viewmodel if (vr_data.inhibit_viewmodel
|| !r_drawviewmodel || !r_drawviewmodel

3
libs/video/renderer/sw/sw_rmain.c
View file

@ -377,6 +377,9 @@ R_DrawViewModel (void)
return; return;
viewent = vr_data.view_model; viewent = vr_data.view_model;
if (!Entity_Valid (viewent)) {
return;
}
renderer_t *renderer = Ent_GetComponent (viewent.id, scene_renderer, renderer_t *renderer = Ent_GetComponent (viewent.id, scene_renderer,
viewent.reg); viewent.reg);

3
libs/video/renderer/vulkan/vulkan_main.c
View file

@ -108,6 +108,9 @@ static void
Vulkan_DrawViewModel (vulkan_ctx_t *ctx) Vulkan_DrawViewModel (vulkan_ctx_t *ctx)
{ {
entity_t ent = vr_data.view_model; entity_t ent = vr_data.view_model;
if (!Entity_Valid (ent)) {
return;
}
renderer_t *renderer = Ent_GetComponent (ent.id, scene_renderer, ent.reg); renderer_t *renderer = Ent_GetComponent (ent.id, scene_renderer, ent.reg);
if (vr_data.inhibit_viewmodel if (vr_data.inhibit_viewmodel
|| !r_drawviewmodel || !r_drawviewmodel