[Bf-blender-cvs] [a7540f4b361] master: Merge branch 'blender-v3.0-release'

[Campbell Barton]

Commit: a7540f4b3611a0d06f197e6f27148319927188f7
Author: Campbell Barton
Date:   Tue Nov 9 17:11:35 2021 +1100
Branches: master
https://developer.blender.org/rBa7540f4b3611a0d06f197e6f27148319927188f7

Merge branch 'blender-v3.0-release'

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



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

diff --cc source/blender/modifiers/intern/MOD_boolean.cc
index 16c0e98c8d5,1121e30b0ff..f8c181905b5
--- a/source/blender/modifiers/intern/MOD_boolean.cc
+++ b/source/blender/modifiers/intern/MOD_boolean.cc
@@@ -245,12 -245,16 +245,16 @@@ static BMesh *BMD_mesh_bm_create
  
    const BMAllocTemplate allocsize = BMALLOC_TEMPLATE_FROM_ME(mesh, mesh_operand_ob);
  
 -  BMeshCreateParams bmcp = {false};
 -  BMesh *bm = BM_mesh_create(&allocsize, &bmcp);
 +  BMeshCreateParams bmesh_create_params{};
 +  BMesh *bm = BM_mesh_create(&allocsize, &bmesh_create_params);
  
+   /* Needed so active layers are set based on `mesh` not `mesh_operand_ob`,
+    * otherwise the wrong active render layer is used, see T92384. */
+   BM_mesh_copy_init_customdata_from_mesh(bm, mesh, &allocsize);
+ 
 -  BMeshFromMeshParams params{};
 -  params.calc_face_normal = true;
 -  BM_mesh_bm_from_me(bm, mesh_operand_ob, &params);
 +  BMeshFromMeshParams bmesh_from_mesh_params{};
 +  bmesh_from_mesh_params.calc_face_normal = true;
 +  BM_mesh_bm_from_me(bm, mesh_operand_ob, &bmesh_from_mesh_params);
  
    if (UNLIKELY(*r_is_flip)) {
      const int cd_loop_mdisp_offset = CustomData_get_offset(&bm->ldata, CD_MDISPS);