[Bf-blender-cvs] [ab632243e64] temp_bmesh_multires: Merge branch 'master' into temp_bmesh_multires

[Joseph Eagar]

Commit: ab632243e649bbea4071eca181f10e18437e1724
Author: Joseph Eagar
Date:   Sun Aug 15 18:14:41 2021 -0700
Branches: temp_bmesh_multires
https://developer.blender.org/rBab632243e649bbea4071eca181f10e18437e1724

Merge branch 'master' into temp_bmesh_multires

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



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

diff --cc release/scripts/startup/bl_ui/space_userpref.py
index 5e06c79a92f,003f2f223ea..261b4118fa3
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@@ -2257,9 -2252,8 +2252,9 @@@ class USERPREF_PT_experimental_new_feat
          self._draw_items(
              context, (
                  ({"property": "use_sculpt_vertex_colors"}, "T71947"),
 +                ({"property": "use_sculpt_uvsmooth"}, ""),
                  ({"property": "use_sculpt_tools_tilt"}, "T82877"),
-                 ({"property": "use_asset_browser"}, ("project/profile/124/", "Milestone 1")),
+                 ({"property": "use_extended_asset_browser"}, ("project/view/130/", "Project Page")),
                  ({"property": "use_override_templates"}, ("T73318", "Milestone 4")),
              ),
          )
diff --cc source/blender/makesdna/DNA_userdef_types.h
index 136d7a4856a,28acf5413b8..b291be7f655
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@@ -645,10 -645,9 +645,10 @@@ typedef struct UserDef_Experimental 
    char use_full_frame_compositor;
    char use_sculpt_vertex_colors;
    char use_sculpt_tools_tilt;
-   char use_asset_browser;
+   char use_extended_asset_browser;
    char use_override_templates;
 -  char _pad[5];
 +  char use_sculpt_uvsmooth;
 +  char _pad[4];
    /** `makesdna` does not allow empty structs. */
  } UserDef_Experimental;