From 7b6df29203ea2b093bc68bc4f9aec0fa6a167b8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20David?= <felixg.david@gmail.com>
Date: Wed, 26 Apr 2023 12:48:51 +0200
Subject: [PATCH 01/16] Feature: Blender hook to execute python scripts at
 launch

---
 .../hooks/pre_add_run_python_script_arg.py    | 61 +++++++++++++++++++
 website/docs/dev_blender.md                   | 61 +++++++++++++++++++
 website/sidebars.js                           |  1 +
 3 files changed, 123 insertions(+)
 create mode 100644 openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py
 create mode 100644 website/docs/dev_blender.md

diff --git a/openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py b/openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py
new file mode 100644
index 0000000000..7cf7b0f852
--- /dev/null
+++ b/openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py
@@ -0,0 +1,61 @@
+from pathlib import Path
+
+from openpype.lib import PreLaunchHook
+from openpype.settings.lib import get_project_settings
+
+
+class AddPythonScriptToLaunchArgs(PreLaunchHook):
+    """Add python script to be executed before Blender launch."""
+
+    # Append after file argument
+    order = 15
+    app_groups = [
+        "blender",
+    ]
+
+    def execute(self):
+        # Check enabled in settings
+        project_name = self.data["project_name"]
+        project_settings = get_project_settings(project_name)
+        host_name = self.application.host_name
+        host_settings = project_settings.get(host_name)
+        if not host_settings:
+            self.log.info(f"""Host "{host_name}" doesn\'t have settings""")
+            return None
+
+        # Add path to workfile to arguments
+        for python_script_path in self.launch_context.data.get(
+            "python_scripts", []
+        ):
+            self.log.info(
+                f"Adding python script {python_script_path} to launch"
+            )
+            # Test script path exists
+            if not Path(python_script_path).exists():
+                raise ValueError(
+                    f"Python script {python_script_path} doesn't exist."
+                )
+
+            if "--" in self.launch_context.launch_args:
+                # Insert before separator
+                separator_index = self.launch_context.launch_args.index("--")
+                self.launch_context.launch_args.insert(
+                    separator_index,
+                    "-P",
+                )
+                self.launch_context.launch_args.insert(
+                    separator_index + 1,
+                    Path(python_script_path).as_posix(),
+                )
+            else:
+                self.launch_context.launch_args.extend(
+                    ["-P", Path(python_script_path).as_posix()]
+                )
+
+        # Ensure separator
+        if "--" not in self.launch_context.launch_args:
+            self.launch_context.launch_args.append("--")
+
+        self.launch_context.launch_args.extend(
+            [*self.launch_context.data.get("script_args", [])]
+        )
diff --git a/website/docs/dev_blender.md b/website/docs/dev_blender.md
new file mode 100644
index 0000000000..228447fb64
--- /dev/null
+++ b/website/docs/dev_blender.md
@@ -0,0 +1,61 @@
+---
+id: dev_blender
+title: Blender integration
+sidebar_label: Blender integration
+toc_max_heading_level: 4
+---
+
+## Run python script at launch
+In case you need to execute a python script when Blender is started (aka [`-P`](https://docs.blender.org/manual/en/latest/advanced/command_line/arguments.html#python-options)), for example to programmatically modify a blender file for conformation, you can create an OpenPype hook as follows:
+
+```python
+from openpype.hosts.blender.hooks.pre_add_run_python_script_arg import AddPythonScriptToLaunchArgs
+from openpype.lib import PreLaunchHook
+
+
+class MyHook(PreLaunchHook):
+    """Add python script to be executed before Blender launch."""
+
+    order = AddPythonScriptToLaunchArgs.order - 1
+    app_groups = [
+        "blender",
+    ]
+
+    def execute(self):
+        self.launch_context.data.setdefault("python_scripts", []).append(
+            "/path/to/my_script.py"
+        )
+```
+
+You can write a bare python script, as you could run into the [Text Editor](https://docs.blender.org/manual/en/latest/editors/text_editor.html).
+
+### Python script with arguments
+#### Adding arguments
+In case you need to pass arguments to your script, you can append them to `self.launch_context.data["script_args"]`:
+
+```python
+self.launch_context.data.setdefault("script_args", []).append(
+        "--my-arg",
+        "value",
+    )
+```
+
+#### Parsing arguments
+You can parse arguments in your script using [argparse](https://docs.python.org/3/library/argparse.html) as follows:
+
+```python
+import argparse
+
+parser = argparse.ArgumentParser(
+    description="Parsing arguments for my_script.py"
+)
+parser.add_argument(
+    "--my-arg",
+    nargs="?",
+    help="My argument",
+)
+args, unknown = arg_parser.parse_known_args(
+    sys.argv[sys.argv.index("--") + 1 :]
+)
+print(args.my_arg)
+```
diff --git a/website/sidebars.js b/website/sidebars.js
index 93887e00f6..c204c3fb45 100644
--- a/website/sidebars.js
+++ b/website/sidebars.js
@@ -179,6 +179,7 @@ module.exports = {
             ]
         },
         "dev_deadline",
+        "dev_blender",
         "dev_colorspace"
     ]
 };

From 6de1710810b028949c86276088a988ccb83f06e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20David?= <felixg.david@gmail.com>
Date: Wed, 26 Apr 2023 12:53:20 +0200
Subject: [PATCH 02/16] clean Path

---
 .../hosts/blender/hooks/pre_add_run_python_script_arg.py   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py b/openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py
index 7cf7b0f852..9ae96327ca 100644
--- a/openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py
+++ b/openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py
@@ -31,7 +31,8 @@ class AddPythonScriptToLaunchArgs(PreLaunchHook):
                 f"Adding python script {python_script_path} to launch"
             )
             # Test script path exists
-            if not Path(python_script_path).exists():
+            python_script_path = Path(python_script_path)
+            if not python_script_path.exists():
                 raise ValueError(
                     f"Python script {python_script_path} doesn't exist."
                 )
@@ -45,11 +46,11 @@ class AddPythonScriptToLaunchArgs(PreLaunchHook):
                 )
                 self.launch_context.launch_args.insert(
                     separator_index + 1,
-                    Path(python_script_path).as_posix(),
+                    python_script_path.as_posix(),
                 )
             else:
                 self.launch_context.launch_args.extend(
-                    ["-P", Path(python_script_path).as_posix()]
+                    ["-P", python_script_path.as_posix()]
                 )
 
         # Ensure separator

From 610a65420d521b26a3c44792368cbd4b9cec6219 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20David?= <felixg.david@gmail.com>
Date: Wed, 26 Apr 2023 14:02:18 +0200
Subject: [PATCH 03/16] remove useless settings

---
 .../hosts/blender/hooks/pre_add_run_python_script_arg.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py b/openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py
index 9ae96327ca..ff3683baa9 100644
--- a/openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py
+++ b/openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py
@@ -14,15 +14,6 @@ class AddPythonScriptToLaunchArgs(PreLaunchHook):
     ]
 
     def execute(self):
-        # Check enabled in settings
-        project_name = self.data["project_name"]
-        project_settings = get_project_settings(project_name)
-        host_name = self.application.host_name
-        host_settings = project_settings.get(host_name)
-        if not host_settings:
-            self.log.info(f"""Host "{host_name}" doesn\'t have settings""")
-            return None
-
         # Add path to workfile to arguments
         for python_script_path in self.launch_context.data.get(
             "python_scripts", []

From 4fe7ce64a2a834adcdd2763a22b8c93d532c0ef6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20David?= <felixg.david@gmail.com>
Date: Wed, 26 Apr 2023 14:05:39 +0200
Subject: [PATCH 04/16] changes from comments

---
 .../hosts/blender/hooks/pre_add_run_python_script_arg.py  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py b/openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py
index ff3683baa9..0f959b8f54 100644
--- a/openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py
+++ b/openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py
@@ -1,7 +1,6 @@
 from pathlib import Path
 
 from openpype.lib import PreLaunchHook
-from openpype.settings.lib import get_project_settings
 
 
 class AddPythonScriptToLaunchArgs(PreLaunchHook):
@@ -14,10 +13,11 @@ class AddPythonScriptToLaunchArgs(PreLaunchHook):
     ]
 
     def execute(self):
+        if not self.launch_context.data.get("python_scripts"):
+            return
+
         # Add path to workfile to arguments
-        for python_script_path in self.launch_context.data.get(
-            "python_scripts", []
-        ):
+        for python_script_path in self.launch_context.data["python_scripts"]:
             self.log.info(
                 f"Adding python script {python_script_path} to launch"
             )

From 6252e4b6c5c57e2a0f9f60fd0ad53cdcb7d26c77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20David?= <felixg.david@gmail.com>
Date: Wed, 10 May 2023 10:07:12 +0200
Subject: [PATCH 05/16] skipping if python script doesn't exist

---
 openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py b/openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py
index 0f959b8f54..8015a15de8 100644
--- a/openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py
+++ b/openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py
@@ -24,8 +24,8 @@ class AddPythonScriptToLaunchArgs(PreLaunchHook):
             # Test script path exists
             python_script_path = Path(python_script_path)
             if not python_script_path.exists():
-                raise ValueError(
-                    f"Python script {python_script_path} doesn't exist."
+                raise self.log.warning(
+                    f"Python script {python_script_path} doesn't exist. Skipped..."
                 )
 
             if "--" in self.launch_context.launch_args:

From 52ad442a9cacdd7675bb49c9fbcd144a2400df51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20David?= <felixg.david@gmail.com>
Date: Wed, 10 May 2023 10:10:12 +0200
Subject: [PATCH 06/16] lint

---
 openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py b/openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py
index 8015a15de8..2d1b773c5f 100644
--- a/openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py
+++ b/openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py
@@ -25,7 +25,8 @@ class AddPythonScriptToLaunchArgs(PreLaunchHook):
             python_script_path = Path(python_script_path)
             if not python_script_path.exists():
                 raise self.log.warning(
-                    f"Python script {python_script_path} doesn't exist. Skipped..."
+                    f"Python script {python_script_path} doesn't exist. "
+                    "Skipped..."
                 )
 
             if "--" in self.launch_context.launch_args:

From 2e7b0b9d954c606220f8ad89fdf86549dc38e3ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20David?= <felixg.david@gmail.com>
Date: Fri, 19 May 2023 18:20:03 +0200
Subject: [PATCH 07/16] fix raise

---
 openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py b/openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py
index 2d1b773c5f..525905f1ab 100644
--- a/openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py
+++ b/openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py
@@ -24,7 +24,7 @@ class AddPythonScriptToLaunchArgs(PreLaunchHook):
             # Test script path exists
             python_script_path = Path(python_script_path)
             if not python_script_path.exists():
-                raise self.log.warning(
+                self.log.warning(
                     f"Python script {python_script_path} doesn't exist. "
                     "Skipped..."
                 )

From dc7373408f8d586f854b99da7c9eb799441a3fec Mon Sep 17 00:00:00 2001
From: Felix David <felixg.david@gmail.com>
Date: Mon, 22 May 2023 10:39:30 +0200
Subject: [PATCH 08/16] continue if not python script path

---
 openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py b/openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py
index 525905f1ab..559e9ae0ce 100644
--- a/openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py
+++ b/openpype/hosts/blender/hooks/pre_add_run_python_script_arg.py
@@ -28,6 +28,7 @@ class AddPythonScriptToLaunchArgs(PreLaunchHook):
                     f"Python script {python_script_path} doesn't exist. "
                     "Skipped..."
                 )
+                continue
 
             if "--" in self.launch_context.launch_args:
                 # Insert before separator

From b7b8125d70406ef867af53f8a8afe2640e657058 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy@colorbleed.nl>
Date: Fri, 26 May 2023 23:23:06 +0200
Subject: [PATCH 09/16] Use .scriptlib for Resolve startup launch script entry
 point

---
 .../hooks/pre_resolve_launch_last_workfile.py | 35 ++++++++++++++++
 openpype/hosts/resolve/startup.py             | 40 +++++++++++++++++++
 .../openpype_startup.scriptlib                | 22 ++++++++++
 openpype/hosts/resolve/utils.py               |  8 ++++
 4 files changed, 105 insertions(+)
 create mode 100644 openpype/hosts/resolve/hooks/pre_resolve_launch_last_workfile.py
 create mode 100644 openpype/hosts/resolve/startup.py
 create mode 100644 openpype/hosts/resolve/utility_scripts/openpype_startup.scriptlib

diff --git a/openpype/hosts/resolve/hooks/pre_resolve_launch_last_workfile.py b/openpype/hosts/resolve/hooks/pre_resolve_launch_last_workfile.py
new file mode 100644
index 0000000000..6db3cc28b2
--- /dev/null
+++ b/openpype/hosts/resolve/hooks/pre_resolve_launch_last_workfile.py
@@ -0,0 +1,35 @@
+import os
+
+from openpype.lib import PreLaunchHook
+
+
+class ResolveLaunchLastWorkfile(PreLaunchHook):
+    """Special hook to open last workfile for Resolve.
+
+    Checks 'start_last_workfile', if set to False, it will not open last
+    workfile. This property is set explicitly in Launcher.
+    """
+
+    # Execute after workfile template copy
+    order = 10
+    app_groups = ["resolve"]
+
+    def execute(self):
+        if not self.data.get("start_last_workfile"):
+            self.log.info("It is set to not start last workfile on start.")
+            return
+
+        last_workfile = self.data.get("last_workfile_path")
+        if not last_workfile:
+            self.log.warning("Last workfile was not collected.")
+            return
+
+        if not os.path.exists(last_workfile):
+            self.log.info("Current context does not have any workfile yet.")
+            return
+
+        # Add path to launch environment for the startup script to pick up
+        self.log.info(f"Setting OPENPYPE_RESOLVE_OPEN_ON_LAUNCH to launch "
+                      f"last workfile: {last_workfile}")
+        key = "OPENPYPE_RESOLVE_OPEN_ON_LAUNCH"
+        self.launch_context.env[key] = last_workfile
diff --git a/openpype/hosts/resolve/startup.py b/openpype/hosts/resolve/startup.py
new file mode 100644
index 0000000000..4aeb106ef1
--- /dev/null
+++ b/openpype/hosts/resolve/startup.py
@@ -0,0 +1,40 @@
+import os
+
+# Importing this takes a little over a second and thus this means
+# that we have about 1.5 seconds delay before the workfile will actually
+# be opened at the minimum
+import openpype.hosts.resolve.api
+
+
+def launch_menu():
+    from openpype.pipeline import install_host
+    print("Launching Resolve OpenPype menu..")
+
+    # Activate resolve from openpype
+    install_host(openpype.hosts.resolve.api)
+
+    openpype.hosts.resolve.api.launch_pype_menu()
+
+
+def open_file(path):
+    # Avoid the need to "install" the host
+    openpype.hosts.resolve.api.bmdvr = resolve  # noqa
+    openpype.hosts.resolve.api.bmdvf = fusion  # noqa
+    openpype.hosts.resolve.api.open_file(path)
+
+
+def main():
+    # Open last workfile
+    workfile_path = os.environ.get("OPENPYPE_RESOLVE_OPEN_ON_LAUNCH")
+    if workfile_path:
+        open_file(workfile_path)
+    else:
+        print("No last workfile set to open. Skipping..")
+
+    # Launch OpenPype menu
+    # TODO: Add a setting to enable/disable this
+    launch_menu()
+
+
+if __name__ == "__main__":
+    main()
diff --git a/openpype/hosts/resolve/utility_scripts/openpype_startup.scriptlib b/openpype/hosts/resolve/utility_scripts/openpype_startup.scriptlib
new file mode 100644
index 0000000000..9fca666d78
--- /dev/null
+++ b/openpype/hosts/resolve/utility_scripts/openpype_startup.scriptlib
@@ -0,0 +1,22 @@
+-- Run OpenPype's Python launch script for resolve
+function file_exists(name)
+   local f = io.open(name, "r")
+   return f ~= nil and io.close(f)
+end
+
+
+openpype_root = os.getenv("OPENPYPE_ROOT")
+if openpype_root ~= nil then
+    script = openpype_root .. "/openpype/hosts/resolve/startup.py"
+    script = fusion:MapPath(script)
+
+    if file_exists(script) then
+        -- We must use RunScript to ensure it runs in a separate
+        -- process to Resolve itself to avoid a deadlock for
+        -- certain imports of OpenPype libraries or Qt
+        print("Running launch script: " .. script)
+        fusion:RunScript(script)
+    else
+        print("Launch script not found at: " .. script)
+    end
+end
\ No newline at end of file
diff --git a/openpype/hosts/resolve/utils.py b/openpype/hosts/resolve/utils.py
index 9a161f4865..e2c8c4a05e 100644
--- a/openpype/hosts/resolve/utils.py
+++ b/openpype/hosts/resolve/utils.py
@@ -50,6 +50,14 @@ def setup(env):
 
             src = os.path.join(directory, script)
             dst = os.path.join(util_scripts_dir, script)
+
+            # TODO: Make this a less hacky workaround
+            if script == "openpype_startup.scriptlib":
+                # Handle special case for scriptlib that needs to be a folder
+                # up from the Comp folder in the Fusion scripts
+                dst = os.path.join(os.path.dirname(util_scripts_dir),
+                                   script)
+
             log.info("Copying `{}` to `{}`...".format(src, dst))
             if os.path.isdir(src):
                 shutil.copytree(

From 00e89719dd75f465411e120fbb2c37dd8e495b7a Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy@colorbleed.nl>
Date: Fri, 26 May 2023 23:23:33 +0200
Subject: [PATCH 10/16] Do not prompt save project when not in a project (e.g.
 on Resolve launch)

---
 openpype/hosts/resolve/api/workio.py | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/openpype/hosts/resolve/api/workio.py b/openpype/hosts/resolve/api/workio.py
index 5ce73eea53..5966fa6a43 100644
--- a/openpype/hosts/resolve/api/workio.py
+++ b/openpype/hosts/resolve/api/workio.py
@@ -43,18 +43,22 @@ def open_file(filepath):
     """
     Loading project
     """
+
+    from . import bmdvr
+
     pm = get_project_manager()
+    page = bmdvr.GetCurrentPage()
+    if page is not None:
+        # Save current project only if Resolve has an active page, otherwise
+        # we consider Resolve being in a pre-launch state (no open UI yet)
+        project = pm.GetCurrentProject()
+        print(f"Saving current project: {project}")
+        pm.SaveProject()
+
     file = os.path.basename(filepath)
     fname, _ = os.path.splitext(file)
     dname, _ = fname.split("_v")
-
-    # deal with current project
-    project = pm.GetCurrentProject()
-    log.info(f"Test `pm`: {pm}")
-    pm.SaveProject()
-
     try:
-        log.info(f"Test `dname`: {dname}")
         if not set_project_manager_to_folder_name(dname):
             raise
         # load project from input path
@@ -72,6 +76,7 @@ def open_file(filepath):
         return False
     return True
 
+
 def current_file():
     pm = get_project_manager()
     current_dir = os.getenv("AVALON_WORKDIR")

From 279b3dc767fc870a8632abc625f1e2dbf3706add Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy@colorbleed.nl>
Date: Tue, 30 May 2023 12:09:53 +0200
Subject: [PATCH 11/16] Set explicit startup script path

---
 .../resolve/hooks/pre_resolve_launch_last_workfile.py | 11 +++++++++++
 .../utility_scripts/openpype_startup.scriptlib        |  7 +++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/openpype/hosts/resolve/hooks/pre_resolve_launch_last_workfile.py b/openpype/hosts/resolve/hooks/pre_resolve_launch_last_workfile.py
index 6db3cc28b2..2ad4352b82 100644
--- a/openpype/hosts/resolve/hooks/pre_resolve_launch_last_workfile.py
+++ b/openpype/hosts/resolve/hooks/pre_resolve_launch_last_workfile.py
@@ -1,6 +1,7 @@
 import os
 
 from openpype.lib import PreLaunchHook
+import openpype.hosts.resolve
 
 
 class ResolveLaunchLastWorkfile(PreLaunchHook):
@@ -33,3 +34,13 @@ class ResolveLaunchLastWorkfile(PreLaunchHook):
                       f"last workfile: {last_workfile}")
         key = "OPENPYPE_RESOLVE_OPEN_ON_LAUNCH"
         self.launch_context.env[key] = last_workfile
+
+        # Set the openpype prelaunch startup script path for easy access
+        # in the LUA .scriptlib code
+        op_resolve_root = os.path.dirname(openpype.hosts.resolve.__file__)
+        script_path = os.path.join(op_resolve_root, "startup.py")
+        key = "OPENPYPE_RESOLVE_STARTUP_SCRIPT"
+        self.launch_context.env[key] = script_path
+        self.log.info("Setting OPENPYPE_RESOLVE_STARTUP_SCRIPT to: "
+                      f"{script_path}")
+
diff --git a/openpype/hosts/resolve/utility_scripts/openpype_startup.scriptlib b/openpype/hosts/resolve/utility_scripts/openpype_startup.scriptlib
index 9fca666d78..ec9b30a18d 100644
--- a/openpype/hosts/resolve/utility_scripts/openpype_startup.scriptlib
+++ b/openpype/hosts/resolve/utility_scripts/openpype_startup.scriptlib
@@ -5,10 +5,9 @@ function file_exists(name)
 end
 
 
-openpype_root = os.getenv("OPENPYPE_ROOT")
-if openpype_root ~= nil then
-    script = openpype_root .. "/openpype/hosts/resolve/startup.py"
-    script = fusion:MapPath(script)
+openpype_startup_script = os.getenv("OPENPYPE_RESOLVE_STARTUP_SCRIPT")
+if openpype_startup_script ~= nil then
+    script = fusion:MapPath(openpype_startup_script)
 
     if file_exists(script) then
         -- We must use RunScript to ensure it runs in a separate

From 990737623bcfab7c5f7502e3cb4a0f2156f0891c Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy@colorbleed.nl>
Date: Tue, 30 May 2023 12:20:17 +0200
Subject: [PATCH 12/16] Cosmetics

---
 openpype/hosts/resolve/hooks/pre_resolve_launch_last_workfile.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openpype/hosts/resolve/hooks/pre_resolve_launch_last_workfile.py b/openpype/hosts/resolve/hooks/pre_resolve_launch_last_workfile.py
index 2ad4352b82..0e27ddb8c3 100644
--- a/openpype/hosts/resolve/hooks/pre_resolve_launch_last_workfile.py
+++ b/openpype/hosts/resolve/hooks/pre_resolve_launch_last_workfile.py
@@ -43,4 +43,3 @@ class ResolveLaunchLastWorkfile(PreLaunchHook):
         self.launch_context.env[key] = script_path
         self.log.info("Setting OPENPYPE_RESOLVE_STARTUP_SCRIPT to: "
                       f"{script_path}")
-

From 307eca8c28aeb1afeb68ba1e93e63e993c21a084 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy@colorbleed.nl>
Date: Tue, 30 May 2023 13:24:17 +0200
Subject: [PATCH 13/16] Cleanup Resolve startup script + add setting for launch
 menu on start

---
 openpype/hosts/resolve/startup.py             | 46 ++++++++++++++-----
 .../defaults/project_settings/resolve.json    |  1 +
 .../schema_project_resolve.json               |  5 ++
 3 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/openpype/hosts/resolve/startup.py b/openpype/hosts/resolve/startup.py
index 4aeb106ef1..79a64e0fbf 100644
--- a/openpype/hosts/resolve/startup.py
+++ b/openpype/hosts/resolve/startup.py
@@ -1,26 +1,44 @@
+"""This script is used as a startup script in Resolve through a .scriptlib file
+
+It triggers directly after the launch of Resolve and it's recommended to keep
+it optimized for fast performance since the Resolve UI is actually interactive
+while this is running. As such, there's nothing ensuring the user isn't
+continuing manually before any of the logic here runs. As such we also try
+to delay any imports as much as possible.
+
+This code runs in a separate process to the main Resolve process.
+
+"""
 import os
 
-# Importing this takes a little over a second and thus this means
-# that we have about 1.5 seconds delay before the workfile will actually
-# be opened at the minimum
 import openpype.hosts.resolve.api
 
 
-def launch_menu():
-    from openpype.pipeline import install_host
-    print("Launching Resolve OpenPype menu..")
+def ensure_installed_host():
+    """Install resolve host with openpype and return the registered host.
+
+    This function can be called multiple times without triggering an
+    additional install.
+    """
+    from openpype.pipeline import install_host, registered_host
+    host = registered_host()
+    if host:
+        return host
 
-    # Activate resolve from openpype
     install_host(openpype.hosts.resolve.api)
+    return registered_host()
 
+
+def launch_menu():
+    print("Launching Resolve OpenPype menu..")
+    ensure_installed_host()
     openpype.hosts.resolve.api.launch_pype_menu()
 
 
 def open_file(path):
     # Avoid the need to "install" the host
-    openpype.hosts.resolve.api.bmdvr = resolve  # noqa
-    openpype.hosts.resolve.api.bmdvf = fusion  # noqa
-    openpype.hosts.resolve.api.open_file(path)
+    host = ensure_installed_host()
+    host.open_file(path)
 
 
 def main():
@@ -32,8 +50,12 @@ def main():
         print("No last workfile set to open. Skipping..")
 
     # Launch OpenPype menu
-    # TODO: Add a setting to enable/disable this
-    launch_menu()
+    from openpype.settings import get_project_settings
+    from openpype.pipeline.context_tools import get_current_project_name
+    project_name = get_current_project_name()
+    settings = get_project_settings(project_name)
+    if settings.get("resolve", {}).get("launch_openpype_menu_on_start", True):
+        launch_menu()
 
 
 if __name__ == "__main__":
diff --git a/openpype/settings/defaults/project_settings/resolve.json b/openpype/settings/defaults/project_settings/resolve.json
index 264f3bd902..56efa78e89 100644
--- a/openpype/settings/defaults/project_settings/resolve.json
+++ b/openpype/settings/defaults/project_settings/resolve.json
@@ -1,4 +1,5 @@
 {
+    "launch_openpype_menu_on_start": false,
     "imageio": {
         "ocio_config": {
             "enabled": false,
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_resolve.json b/openpype/settings/entities/schemas/projects_schema/schema_project_resolve.json
index b326f22394..6f98bdd3bd 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_resolve.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_resolve.json
@@ -5,6 +5,11 @@
     "label": "DaVinci Resolve",
     "is_file": true,
     "children": [
+        {
+            "type": "boolean",
+            "key": "launch_openpype_menu_on_start",
+            "label": "Launch OpenPype menu on start of Resolve"
+        },
         {
             "key": "imageio",
             "type": "dict",

From de72f26f9451f48608229cc85868c1545a201afd Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Tue, 30 May 2023 17:09:54 +0200
Subject: [PATCH 14/16] adding check also against class attribute

---
 openpype/plugins/publish/collect_frames_fix.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/plugins/publish/collect_frames_fix.py b/openpype/plugins/publish/collect_frames_fix.py
index 837738eb06..ca1ccc19fd 100644
--- a/openpype/plugins/publish/collect_frames_fix.py
+++ b/openpype/plugins/publish/collect_frames_fix.py
@@ -66,7 +66,7 @@ class CollectFramesFixDef(
             self.log.debug("last_version_published_files::{}".format(
                 instance.data["last_version_published_files"]))
 
-            if rewrite_version:
+            if self.rewrite_version_enable and rewrite_version:
                 instance.data["version"] = version["name"]
                 # limits triggering version validator
                 instance.data.pop("latestVersion")

From 4d76c2520f254991da405dc463418d9bb6e2cfc4 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Tue, 30 May 2023 17:19:00 +0200
Subject: [PATCH 15/16] cleanup

---
 .../plugins/publish/collect_frames_fix.py     | 62 ++++++++++---------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/openpype/plugins/publish/collect_frames_fix.py b/openpype/plugins/publish/collect_frames_fix.py
index ca1ccc19fd..86e727b053 100644
--- a/openpype/plugins/publish/collect_frames_fix.py
+++ b/openpype/plugins/publish/collect_frames_fix.py
@@ -35,41 +35,47 @@ class CollectFramesFixDef(
 
         rewrite_version = attribute_values.get("rewrite_version")
 
-        if frames_to_fix:
-            instance.data["frames_to_fix"] = frames_to_fix
+        if not frames_to_fix:
+            return
 
-            subset_name = instance.data["subset"]
-            asset_name = instance.data["asset"]
+        instance.data["frames_to_fix"] = frames_to_fix
 
-            project_entity = instance.data["projectEntity"]
-            project_name = project_entity["name"]
+        subset_name = instance.data["subset"]
+        asset_name = instance.data["asset"]
 
-            version = get_last_version_by_subset_name(project_name,
-                                                      subset_name,
-                                                      asset_name=asset_name)
-            if not version:
-                self.log.warning("No last version found, "
-                                 "re-render not possible")
-                return
+        project_entity = instance.data["projectEntity"]
+        project_name = project_entity["name"]
 
-            representations = get_representations(project_name,
-                                                  version_ids=[version["_id"]])
-            published_files = []
-            for repre in representations:
-                if repre["context"]["family"] not in self.families:
-                    continue
+        version = get_last_version_by_subset_name(
+            project_name,
+            subset_name,
+            asset_name=asset_name
+        )
+        if not version:
+            self.log.warning(
+                "No last version found, re-render not possible"
+            )
+            return
 
-                for file_info in repre.get("files"):
-                    published_files.append(file_info["path"])
+        representations = get_representations(
+            project_name, version_ids=[version["_id"]]
+        )
+        published_files = []
+        for repre in representations:
+            if repre["context"]["family"] not in self.families:
+                continue
 
-            instance.data["last_version_published_files"] = published_files
-            self.log.debug("last_version_published_files::{}".format(
-                instance.data["last_version_published_files"]))
+            for file_info in repre.get("files"):
+                published_files.append(file_info["path"])
 
-            if self.rewrite_version_enable and rewrite_version:
-                instance.data["version"] = version["name"]
-                # limits triggering version validator
-                instance.data.pop("latestVersion")
+        instance.data["last_version_published_files"] = published_files
+        self.log.debug("last_version_published_files::{}".format(
+            instance.data["last_version_published_files"]))
+
+        if self.rewrite_version_enable and rewrite_version:
+            instance.data["version"] = version["name"]
+            # limits triggering version validator
+            instance.data.pop("latestVersion")
 
     @classmethod
     def get_attribute_defs(cls):

From d0886e43fe8efc8b675d9da5ccc9c37c459408d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20David?= <felixg.david@gmail.com>
Date: Thu, 1 Jun 2023 16:42:42 +0200
Subject: [PATCH 16/16] fix doc

---
 website/docs/dev_blender.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/docs/dev_blender.md b/website/docs/dev_blender.md
index 228447fb64..bed0e4a09d 100644
--- a/website/docs/dev_blender.md
+++ b/website/docs/dev_blender.md
@@ -9,14 +9,14 @@ toc_max_heading_level: 4
 In case you need to execute a python script when Blender is started (aka [`-P`](https://docs.blender.org/manual/en/latest/advanced/command_line/arguments.html#python-options)), for example to programmatically modify a blender file for conformation, you can create an OpenPype hook as follows:
 
 ```python
-from openpype.hosts.blender.hooks.pre_add_run_python_script_arg import AddPythonScriptToLaunchArgs
+from openpype.hosts.blender.hooks import pre_add_run_python_script_arg
 from openpype.lib import PreLaunchHook
 
 
 class MyHook(PreLaunchHook):
     """Add python script to be executed before Blender launch."""
 
-    order = AddPythonScriptToLaunchArgs.order - 1
+    order = pre_add_run_python_script_arg.AddPythonScriptToLaunchArgs.order - 1
     app_groups = [
         "blender",
     ]