asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #35176 from clayjohn/csg-crash

Browse source 
Fix light related crashes
This commit is contained in:
Rémi Verschelde 2020-01-16 08:03:56 +01:00 committed by GitHub
commit 3af0400a32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/gles2/rasterizer_scene_gles2.cpp
View file

@ -1169,7 +1169,7 @@ void RasterizerSceneGLES2::_add_geometry_with_material(RasterizerStorageGLES2::G
LightInstance *li = light_instance_owner.getornull(e->instance->light_instances[i]);
if (li->light_index >= render_light_instance_count || render_light_instances[li->light_index] != li) {
if (!li || li->light_index >= render_light_instance_count || render_light_instances[li->light_index] != li) {
continue; // too many or light_index did not correspond to the light instances to be rendered
}

4
drivers/gles3/rasterizer_scene_gles3.cpp
View file

@ -1887,8 +1887,8 @@ void RasterizerSceneGLES3::_setup_light(RenderList::Element *e, const Transform
const RID *lights = e->instance->light_instances.ptr();
for (int i = 0; i < lc; i++) {
LightInstance *li = light_instance_owner.getptr(lights[i]);
if (li->last_pass != render_pass) //not visible
LightInstance *li = light_instance_owner.getornull(lights[i]);
if (!li || li->last_pass != render_pass) //not visible
continue;
if (li && li->light_ptr->type == VS::LIGHT_OMNI) {