[Bf-blender-cvs] [b1e59f1a20a] sculpt-dev: Merge branch 'master' into sculpt-dev

[Pablo Dobarro]

Commit: b1e59f1a20af85444a545262f193e2ff25cb4a48
Author: Pablo Dobarro
Date:   Thu Jun 3 22:46:38 2021 +0200
Branches: sculpt-dev
https://developer.blender.org/rBb1e59f1a20af85444a545262f193e2ff25cb4a48

Merge branch 'master' into sculpt-dev

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



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

diff --cc source/blender/editors/object/object_modes.c
index 9fbe23070c1,3d1a5ac2d62..3144fef8e82
--- a/source/blender/editors/object/object_modes.c
+++ b/source/blender/editors/object/object_modes.c
@@@ -422,7 -408,7 +420,7 @@@ bool ED_object_mode_generic_has_data(st
  
  /** \} */
  
--/* -------------------------------------------------------------------- */
++	/* -------------------------------------------------------------------- */
  /** \name Transfer Mode
   *
   * Enters the same mode of the current active object in another object,
@@@ -733,4 -580,4 +592,4 @@@ void OBJECT_OT_transfer_mode(wmOperator
                    "Pick the object to switch to using an eyedropper");
  }
  
--/** \} */
++/** \} */