main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Showing only changes of commit 2282272787 - Show all commits

View File

@ -2220,7 +2220,7 @@ static void rna_def_userdef_theme_space_view3d(BlenderRNA *brna)
RNA_def_property_update(prop, 0, "rna_userdef_theme_update"); RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
prop = RNA_def_property(srna, "edge_width", PROP_INT, PROP_PIXEL); prop = RNA_def_property(srna, "edge_width", PROP_INT, PROP_PIXEL);
RNA_def_property_range(prop, 1, 5); RNA_def_property_range(prop, 1, 32);
RNA_def_property_ui_text(prop, "Edge Width", ""); RNA_def_property_ui_text(prop, "Edge Width", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update"); RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
@ -3069,7 +3069,7 @@ static void rna_def_userdef_theme_space_image(BlenderRNA *brna)
RNA_def_property_update(prop, 0, "rna_userdef_theme_update"); RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
prop = RNA_def_property(srna, "edge_width", PROP_INT, PROP_PIXEL); prop = RNA_def_property(srna, "edge_width", PROP_INT, PROP_PIXEL);
RNA_def_property_range(prop, 1, 5); RNA_def_property_range(prop, 1, 32);
RNA_def_property_ui_text(prop, "Edge Width", ""); RNA_def_property_ui_text(prop, "Edge Width", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update"); RNA_def_property_update(prop, 0, "rna_userdef_theme_update");