Fix initialization of the workbench engine when rendering
AbandonedPublic
Actions

Authored by Robert Guetzkow (rjg) on Apr 19 2020, 6:51 PM.

Details

Reviewers

Clément Foucault (fclem)

Maniphest Tasks

T75902: Workbench render crash

Summary

The change introduced in rBa250be980a13d487099873bb5edf9c797b701ca1 causes a crash when rendering an image or animation with the workbench engine as reported in T75902. The cause is that v3d is only set when using viewport rendering, but not when rendering a still image. When v3d is NULL this resulted in a crash due to null pointer dereferencing in the CULL_BACKFACE_ENABLED macro.

The proposed fix is to use wpd when v3d is NULL.

Diff Detail

Repository

rB Blender

Branch

2020-04-19-fix-workbench-init (branched from master)

Build Status

Buildable 7628
Build 7628: arc lint + arc unit

Event Timeline

Robert Guetzkow (rjg) created this revision.Apr 19 2020, 6:51 PM

Harbormaster completed remote builds in B7627: Diff 23876.Apr 19 2020, 6:51 PM

Robert Guetzkow (rjg) requested review of this revision.Apr 19 2020, 6:51 PM

Perhaps a more elegant patch with less repetition would be:

bool cull_backface = v3d ? CULL_BACKFACE_ENABLED(v3d) : CULL_BACKFACE_ENABLED(wpd);
wpd->cull_state = cull_backface ? DRW_STATE_CULL_BACK : 0;

DRYness update

Harbormaster completed remote builds in B7628: Diff 23877.Apr 19 2020, 7:08 PM

Jeroen Bakker (jbakker) added a subscriber: Jeroen Bakker (jbakker).Apr 19 2020, 7:12 PM

Jeroen Bakker (jbakker) added inline comments.

source/blender/draw/engines/workbench/workbench_data.c
203	Can't we just always use `wpd`. the macro was created to work on `wpd`.

@Jeroen Bakker (jbakker) Apparently not, since @Clément Foucault (fclem) introduced this change in rBa250be980a13d487099873bb5edf9c797b701ca1 to fix T74805. Previously it did only use wpd.

Ankit Meel (ankitm) added a task: T75902: Workbench render crash.Apr 19 2020, 7:44 PM

I fixed it in a more correct way.

Revision Contents
Changeset List

Path

Size

source/

blender/

draw/

engines/

workbench/

workbench_data.c

3 lines

Diff 23877

View Options

source/blender/draw/engines/workbench/workbench_data.c

Fix initialization of the workbench engine when renderingAbandonedPublicActions