Commit: 6231a4ce241c49add3f35459b86111a6bdb7b2a4
Author: Jeroen Bakker
Date: Wed Mar 30 08:07:21 2022 +0200
Branches: temp-T96709-painting-target
https://developer.blender.org/rB6231a4ce241c49add3f35459b86111a6bdb7b2a4
Merge remote-tracking branch 'origin/master' into temp-T96709-painting-target
===================================================================
===================================================================
diff --cc release/scripts/startup/bl_ui/space_userpref.py
index 366c904475d,f9642a2dbb6..a08dad0c113
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@@ -2261,7 -2261,7 +2261,8 @@@ class USERPREF_PT_experimental_new_feat
context, (
({"property": "use_sculpt_vertex_colors"}, "T71947"),
({"property": "use_sculpt_tools_tilt"}, "T82877"),
+ ({"property": "use_sculpt_texture_paint"}, "T96225"),
+ ({"property": "use_select_nearest_on_first_click"}, "T96752"),
({"property": "use_extended_asset_browser"},
("project/view/130/", "Project Page")),
({"property": "use_override_templates"}, ("T73318",
"Milestone 4")),
({"property": "use_named_attribute_nodes"}, ("T91742")),
diff --cc source/blender/makesdna/DNA_userdef_types.h
index 6b0b9d210cb,5fb8d0328f1..8a698050629
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@@ -650,8 -650,9 +650,10 @@@ typedef struct UserDef_Experimental
char use_extended_asset_browser;
char use_override_templates;
char use_named_attribute_nodes;
+ char use_select_nearest_on_first_click;
char enable_eevee_next;
- // char _pad[0];
+ char use_sculpt_texture_paint;
++ char _pad[7];
/** `makesdna` does not allow empty structs. */
} UserDef_Experimental;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
