From 0f120b6364eaebfb033c6c3bf5d657073b25a32f Mon Sep 17 00:00:00 2001
From: Campbell Barton <campbell@blender.org>
Date: Mon, 7 Aug 2023 22:06:26 +1000
Subject: [PATCH] Fix hydra API, incorrect Python API handling of invalid
 arguments

Exceptions must return nullptr, not None.
---
 source/blender/render/hydra/python.cc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/source/blender/render/hydra/python.cc b/source/blender/render/hydra/python.cc
index ffeafe47313..935a991e3bf 100644
--- a/source/blender/render/hydra/python.cc
+++ b/source/blender/render/hydra/python.cc
@@ -33,7 +33,7 @@ static PyObject *engine_create_func(PyObject * /*self*/, PyObject *args)
   PyObject *pyengine;
   char *engine_type, *render_delegate_id;
   if (!PyArg_ParseTuple(args, "Oss", &pyengine, &engine_type, &render_delegate_id)) {
-    Py_RETURN_NONE;
+    return nullptr;
   }
 
   RenderEngine *bl_engine = pyrna_to_pointer<RenderEngine>(pyengine, &RNA_RenderEngine);
@@ -63,7 +63,7 @@ static PyObject *engine_free_func(PyObject * /*self*/, PyObject *args)
 {
   PyObject *pyengine;
   if (!PyArg_ParseTuple(args, "O", &pyengine)) {
-    Py_RETURN_NONE;
+    return nullptr;
   }
 
   Engine *engine = static_cast<Engine *>(PyLong_AsVoidPtr(pyengine));
@@ -77,7 +77,7 @@ static PyObject *engine_update_func(PyObject * /*self*/, PyObject *args)
 {
   PyObject *pyengine, *pydepsgraph, *pycontext;
   if (!PyArg_ParseTuple(args, "OOO", &pyengine, &pydepsgraph, &pycontext)) {
-    Py_RETURN_NONE;
+    return nullptr;
   }
 
   Engine *engine = static_cast<Engine *>(PyLong_AsVoidPtr(pyengine));
@@ -94,7 +94,7 @@ static PyObject *engine_render_func(PyObject * /*self*/, PyObject *args)
 {
   PyObject *pyengine;
   if (!PyArg_ParseTuple(args, "O", &pyengine)) {
-    Py_RETURN_NONE;
+    return nullptr;
   }
 
   Engine *engine = static_cast<Engine *>(PyLong_AsVoidPtr(pyengine));
@@ -113,7 +113,7 @@ static PyObject *engine_view_draw_func(PyObject * /*self*/, PyObject *args)
 {
   PyObject *pyengine, *pycontext;
   if (!PyArg_ParseTuple(args, "OO", &pyengine, &pycontext)) {
-    Py_RETURN_NONE;
+    return nullptr;
   }
 
   ViewportEngine *engine = static_cast<ViewportEngine *>(PyLong_AsVoidPtr(pyengine));
@@ -152,7 +152,7 @@ static PyObject *engine_set_render_setting_func(PyObject * /*self*/, PyObject *a
   PyObject *pyengine, *pyval;
   char *key;
   if (!PyArg_ParseTuple(args, "OsO", &pyengine, &key, &pyval)) {
-    Py_RETURN_NONE;
+    return nullptr;
   }
 
   Engine *engine = static_cast<Engine *>(PyLong_AsVoidPtr(pyengine));
@@ -167,7 +167,7 @@ static PyObject *cache_or_get_image_file_func(PyObject * /*self*/, PyObject *arg
 {
   PyObject *pycontext, *pyimage;
   if (!PyArg_ParseTuple(args, "OO", &pycontext, &pyimage)) {
-    Py_RETURN_NONE;
+    return nullptr;
   }
 
   bContext *context = static_cast<bContext *>(PyLong_AsVoidPtr(pycontext));