[Bf-blender-cvs] [6114d909d6b] master: Fix T86417: Crash deleting Shader AOV from an empty list

[Philipp Oeser]

Commit: 6114d909d6b438cd8c0f2f82f8716b2994bc9f7e
Author: Philipp Oeser
Date:   Tue Mar 9 14:13:59 2021 +0100
Branches: master
https://developer.blender.org/rB6114d909d6b438cd8c0f2f82f8716b2994bc9f7e

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

===================================================================

M	source/blender/editors/render/render_shading.c

===================================================================

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);