Merge branch 'blender-v4.1-release'

2024-03-08 22:54:36 +01:00
parent 04a9790035 9bebd39197
commit 2e8e2be0af
8 changed files with 102 additions and 38 deletions
--- a/intern/cycles/blender/python.cpp
+++ b/intern/cycles/blender/python.cpp
@@ -758,7 +758,7 @@ static PyObject *denoise_func(PyObject * /*self*/, PyObject *args, PyObject *key
      (ID *)PyLong_AsVoidPtr(pyscene), &RNA_ViewLayer, PyLong_AsVoidPtr(pyviewlayer));
  BL::ViewLayer b_view_layer(viewlayerptr);

-  DenoiseParams params = BlenderSync::get_denoise_params(b_scene, b_view_layer, true);
+  DenoiseParams params = BlenderSync::get_denoise_params(b_scene, b_view_layer, true, device);
  params.use = true;

  /* Parse file paths list. */