diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2021-03-09 16:13:59 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2021-03-09 16:45:38 +0300 |
| commit | 6114d909d6b438cd8c0f2f82f8716b2994bc9f7e (patch) | |
| tree | e7fb1596a3bdc15d2c33f5c603ec3a835a406d48 /source | |
| parent | 68ff213cd4a26cde9b7b01570578e1a950768c3f (diff) | |
Fix T86417: Crash deleting Shader AOV from an empty list
Missing NULL check in {rB2bae11d5c08a}.
Candidate for corrective release I guess.
Maniphest Tasks: T86417
Differential Revision: https://developer.blender.org/D10666
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/render/render_shading.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index bfad79a1da9..b4cac58db1f 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -1074,6 +1074,11 @@ static int view_layer_remove_aov_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); + + if (view_layer->active_aov == NULL) { + return OPERATOR_FINISHED; + } + BKE_view_layer_remove_aov(view_layer, view_layer->active_aov); RenderEngineType *engine_type = RE_engines_find(scene->r.engine); |