diff options
author | Jeroen Bakker <jeroen@blender.org> | 2022-08-22 09:40:36 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2022-08-22 09:40:36 +0300 |
commit | 0aeae0d0b9810fea0214fc60d41652684135c177 (patch) | |
tree | 357a823c83fa9461fab45855f6c2f1d5be5fda12 /source | |
parent | ae7909010fba2605af1b7f32b5574df3381d4d3f (diff) |
Revert "Fix T99259: Python API: ViewLayer.aovs.remove isn't available"
This reverts commit ae7909010fba2605af1b7f32b5574df3381d4d3f.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/layer.c | 6 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 7 |
2 files changed, 1 insertions, 12 deletions
diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c index c5e9ec28f7b..4257bccad93 100644 --- a/source/blender/blenkernel/intern/layer.c +++ b/source/blender/blenkernel/intern/layer.c @@ -2432,12 +2432,8 @@ struct ViewLayerAOV *BKE_view_layer_add_aov(struct ViewLayer *view_layer) void BKE_view_layer_remove_aov(ViewLayer *view_layer, ViewLayerAOV *aov) { - if (BLI_findindex(&view_layer->aovs, aov) == -1) { - return; - } - + BLI_assert(BLI_findindex(&view_layer->aovs, aov) != -1); BLI_assert(aov != NULL); - if (view_layer->active_aov == aov) { if (aov->next) { viewlayer_aov_active_set(view_layer, aov->next); diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 628a616fe03..720b115c73b 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -4256,13 +4256,6 @@ static void rna_def_view_layer_aovs(BlenderRNA *brna, PropertyRNA *cprop) func = RNA_def_function(srna, "add", "BKE_view_layer_add_aov"); parm = RNA_def_pointer(func, "aov", "AOV", "", "Newly created AOV"); RNA_def_function_return(func, parm); - - func = RNA_def_function(srna, "remove", "BKE_view_layer_remove_aov"); - RNA_def_function_ui_description(func, "Remove a AOV"); - RNA_def_function_flag(func, FUNC_USE_MAIN | FUNC_USE_REPORTS | FUNC_USE_SELF_ID); - parm = RNA_def_pointer(func, "aov", "AOV", "", "AOVs to remove"); - RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED | PARM_RNAPTR); - RNA_def_parameter_clear_flags(parm, PROP_THICK_WRAP, 0); } static void rna_def_view_layer_aov(BlenderRNA *brna) |