[Bf-blender-cvs] [609422c0a1d] blender-v3.3-release: Fix T100833: Cycles UDIM baking broken after recent changes

[Brecht Van Lommel]

Commit: 609422c0a1da5479ea08d9e1568453b5f3b82180
Author: Brecht Van Lommel
Date:   Thu Sep 8 20:23:02 2022 +0200
Branches: blender-v3.3-release
https://developer.blender.org/rB609422c0a1da5479ea08d9e1568453b5f3b82180

Fix T100833: Cycles UDIM baking broken after recent changes

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

M	intern/cycles/blender/session.cpp
M	intern/cycles/blender/session.h

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

diff --git a/intern/cycles/blender/session.cpp b/intern/cycles/blender/session.cpp
index 30128ccf348..5a6eff197c6 100644
--- a/intern/cycles/blender/session.cpp
+++ b/intern/cycles/blender/session.cpp
@@ -702,7 +702,7 @@ void BlenderSession::bake(BL::Depsgraph &b_depsgraph_,
     buffer_params.window_width = bake_width;
     buffer_params.window_height = bake_height;
     /* Unique layer name for multi-image baking. */
-    buffer_params.layer = string_printf("bake_%d\n", (int)full_buffer_files_.size());
+    buffer_params.layer = string_printf("bake_%d\n", bake_id++);
 
     /* Update session. */
     session->reset(session_params, buffer_params);
diff --git a/intern/cycles/blender/session.h b/intern/cycles/blender/session.h
index f9a5b6faf7e..ceca86016b8 100644
--- a/intern/cycles/blender/session.h
+++ b/intern/cycles/blender/session.h
@@ -146,6 +146,8 @@ class BlenderSession {
   BlenderDisplayDriver *display_driver_ = nullptr;
 
   vector<string> full_buffer_files_;
+
+  int bake_id = 0;
 };
 
 CCL_NAMESPACE_END