Add nullptr check in case a mesh has no shader
ClosedPublic
Actions

Authored by Charles Flèche (charlesf) on Apr 4 2022, 1:53 AM.

Details

Reviewers

Brecht Van Lommel (brecht)

Commits

rBb6eb7dae59aa: Fix Cycles missing nullptr check in case mesh has no shader

Summary

While working on https://developer.blender.org/D14537 I don't deal with shaders yet. Turns out cycles was crashing because of a pointer always expected to be non null. This patch adds a nullptr check to prevent a potential crash.

Diff Detail

Repository: rB Blender

Event Timeline

Charles Flèche (charlesf) requested review of this revision.Apr 4 2022, 1:53 AM

Charles Flèche (charlesf) created this revision.

Harbormaster completed remote builds in B21439: Diff 50057.Apr 4 2022, 1:54 AM

Charles Flèche (charlesf) edited the summary of this revision. (Show Details)Apr 4 2022, 1:55 AM

Charles Flèche (charlesf) added projects: Cycles, Render & Cycles.

Thanks, but it should use scene->default_surface instead of leaving tri_shader uninitialized.

This revision now requires changes to proceed.Apr 4 2022, 1:46 PM

Ensure default_surface is applied on tri with no defined shader

Harbormaster completed remote builds in B21480: Diff 50140.Apr 6 2022, 3:47 AM

I wonder if there is a real gain of accessing *shader_ptr rather than shader operator[]. Is so, any reason the smooth buffer is not accessed through a pointer as well ?

No good reason, I'll change the code to work like that.

This revision is now accepted and ready to land.Apr 11 2022, 2:38 PM

Closed by commit rBb6eb7dae59aa: Fix Cycles missing nullptr check in case mesh has no shader (authored by Charles Flèche (charlesf), committed by Brecht Van Lommel (brecht)). · Explain WhyApr 11 2022, 2:39 PM

This revision was automatically updated to reflect the committed changes.

Brecht Van Lommel (brecht) added a commit: rBb6eb7dae59aa: Fix Cycles missing nullptr check in case mesh has no shader.

Revision Contents
Changeset List

Path

Size

intern/

cycles/

scene/

mesh.cpp

12 lines

Diff 50326

View Options

intern/cycles/scene/mesh.cpp

Add nullptr check in case a mesh has no shaderClosedPublicActions