adding removeAOVs in setting to allow users to choose whether keeping existing AOVs

openpype/hosts/maya/api/lib_rendersettings.py

@@ -101,14 +101,15 @@ class RenderSettings(object):
         from mtoa.core import createOptions  # noqa
         from mtoa.aovs import AOVInterface  # noqa
         createOptions()
-        arnold_render_presets = self._project_settings["maya"]["RenderSettings"]["arnold_renderer"] # noqa
+        render_settings = self._project_settings["maya"]["RenderSettings"]
+        arnold_render_presets = render_settings["arnold_renderer"] # noqa
         # Force resetting settings and AOV list to avoid having to deal with
         # AOV checking logic, for now.
         # This is a work around because the standard
         # function to revert render settings does not reset AOVs list in MtoA
         # Fetch current aovs in case there's any.
         current_aovs = AOVInterface().getAOVs()
-        remove_aovs = arnold_render_presets["remove_aovs"]
+        remove_aovs = render_settings["remove_aovs"]
         if remove_aovs:
         # Remove fetched AOVs
             AOVInterface().removeAOVs(current_aovs)

openpype/settings/defaults/project_settings/maya.json

@@ -59,13 +59,13 @@
         "default_render_image_folder": "renders/maya",
         "enable_all_lights": true,
         "aov_separator": "underscore",
+        "remove_aovs": false,
         "reset_current_frame": false,
         "arnold_renderer": {
             "image_prefix": "<Scene>/<RenderLayer>/<RenderLayer>_<RenderPass>",
             "image_format": "exr",
             "multilayer_exr": true,
             "tiled": true,
-            "remove_aovs": false,
             "aov_list": [],
             "additional_options": []
         },

openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_render_settings.json

@@ -31,6 +31,11 @@
                 {"dot": ". (dot)"}
             ]
         },
+        {
+          "key": "remove_aovs",
+          "label": "Remove existing AOVs",
+          "type": "boolean"
+        },
         {
           "key": "reset_current_frame",
           "label": "Reset Current Frame",
@@ -74,11 +79,6 @@
                   "label": "Tiled (tif, exr)",
                   "type": "boolean"
                 },
-                {
-                  "key": "remove_aovs",
-                  "label": "Remove existing AOVs",
-                  "type": "boolean"
-                },
                 {
                   "key": "aov_list",
                   "label": "AOVs to create",