From 6114d909d6b438cd8c0f2f82f8716b2994bc9f7e Mon Sep 17 00:00:00 2001 From: Philipp Oeser Date: Tue, 9 Mar 2021 14:13:59 +0100 Subject: 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 --- source/blender/editors/render/render_shading.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source') 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); -- cgit v1.2.3