[Bf-blender-cvs] [bdbc1ff560e] tmp-eevee-aov: Code review: Rename ViewLayerAOV to AOV in the API.

[Jeroen Bakker]

Commit: bdbc1ff560e8cad903fdc66b37869463cc5d18a1
Author: Jeroen Bakker
Date:   Wed Oct 21 14:59:51 2020 +0200
Branches: tmp-eevee-aov
https://developer.blender.org/rBbdbc1ff560e8cad903fdc66b37869463cc5d18a1

Code review: Rename ViewLayerAOV to AOV in the API.

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

M	source/blender/makesrna/RNA_access.h
M	source/blender/makesrna/intern/rna_scene.c

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

diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index 63342096467..39afc22b72e 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -60,6 +60,7 @@ extern StructRNA RNA_AnimData;
 extern StructRNA RNA_AnimViz;
 extern StructRNA RNA_AnimVizMotionPaths;
 extern StructRNA RNA_AnyType;
+extern StructRNA RNA_AOV;
 extern StructRNA RNA_Area;
 extern StructRNA RNA_AreaLight;
 extern StructRNA RNA_Armature;
@@ -707,7 +708,6 @@ extern StructRNA RNA_View3DCursor;
 extern StructRNA RNA_View3DOverlay;
 extern StructRNA RNA_View3DShading;
 extern StructRNA RNA_ViewLayer;
-extern StructRNA RNA_ViewLayerAOV;
 extern StructRNA RNA_ViewLayerEEVEE;
 extern StructRNA RNA_Volume;
 extern StructRNA RNA_VolumeDisplaceModifier;
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 0b7b609b0de..40dd452faa8 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -1788,7 +1788,7 @@ void rna_ViewLayer_pass_update(Main *bmain, Scene *activescene, PointerRNA *ptr)
   if (ptr->type == &RNA_ViewLayer) {
     view_layer = (ViewLayer *)ptr->data;
   }
-  else if (ptr->type == &RNA_ViewLayerAOV) {
+  else if (ptr->type == &RNA_AOV) {
     ViewLayerAOV *aov = (ViewLayerAOV *)ptr->data;
     view_layer = BKE_view_layer_find_with_aov(scene, aov);
   }
@@ -4004,7 +4004,8 @@ static void rna_def_view_layer_aov(BlenderRNA *brna)
 {
   StructRNA *srna;
   PropertyRNA *prop;
-  srna = RNA_def_struct(brna, "ViewLayerAOV", NULL);
+  srna = RNA_def_struct(brna, "AOV", NULL);
+  RNA_def_struct_sdna(srna, "ViewLayerAOV");
   RNA_def_struct_ui_text(srna, "Shader AOV", "");
 
   prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
@@ -4079,11 +4080,11 @@ void rna_def_view_layer_common(StructRNA *srna, const bool scene)
 
     prop = RNA_def_property(srna, "aovs", PROP_COLLECTION, PROP_NONE);
     RNA_def_property_collection_sdna(prop, NULL, "aovs", NULL);
-    RNA_def_property_struct_type(prop, "ViewLayerAOV");
+    RNA_def_property_struct_type(prop, "AOV");
     RNA_def_property_ui_text(prop, "Shader AOV", "");
 
     prop = RNA_def_property(srna, "active_aov", PROP_POINTER, PROP_NONE);
-    RNA_def_property_struct_type(prop, "ViewLayerAOV");
+    RNA_def_property_struct_type(prop, "AOV");
     RNA_def_property_clear_flag(prop, PROP_EDITABLE);
     RNA_def_property_ui_text(prop, "Shader AOV", "Active AOV");