griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v5.0-release'

Browse Source
This commit is contained in:
Harley Acheson
2025-10-08 12:00:42 -07:00
parent f0f0665dbc 765e38677a
commit d4c5f37421
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/datafiles/icons_svg/outliner_collection.svg
View File

@@ -1 +1 @@
<svg id="svg1" height="1600" viewBox="0 0 1700 1600" width="1700" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"><sodipodi:namedview pagecolor="#303030" showgrid="true"><inkscape:grid id="grid5" units="px" spacingx="100" spacingy="100" color="#4772b3" opacity="0.2" visible="true" /></sodipodi:namedview><g id="blender_collection"><path id="path1" d="m1499.5309 100.43027-1299.9863.03711-.01171 299.99218s1299.68651 2.63656 1299.95121-.07812zm-1200.0234 399.99804.01562 799.92969 1099.99608.082-.0547-799.93357z" fill="#fff" transform="translate(.461255 99.540436)"/></g><path id="path2" d="m175.6648 99.948542c-48.15785-.323156-75.54556 25.527328-75.54725 76.532298l-.014 423.30849s57.2301.18883 99.92707.23534l.0469 822.68913c.69231 47.4171 25.65156 76.9025 76.74481 77.2317h1147.55127c51.7456 0 76.0346-27.6411 75.7384-77.572l-.054-822.45446c43.7336-.1314 99.986-.18248 99.986-.18248v-424.07111c0-51.0049-25.7441-76.054072-73.9019-75.730906zm24.55583 100.301818h1299.80377v299.88603l-1299.96685-.10128zm99.81 399.85649 1099.96687-.0725-.2031 800.44125-1099.80377-.1993z" fill-opacity=".5" stroke-width="99.8344"/><path id="handhold" d="m700.40998 701.40838c-136.44824.30561-129.50035 200.27886 0 199.99996h299.03314c133.05938-.075 132.82888-199.92785 0-199.99996z" fill-opacity=".940455" stroke-width=".995635"/></svg> <svg id="svg1" height="1600" viewBox="0 0 1700 1600" width="1700" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"><sodipodi:namedview pagecolor="#303030" showgrid="true"><inkscape:grid id="grid5" units="px" spacingx="100" spacingy="100" color="#4772b3" opacity="0.2" visible="true" /></sodipodi:namedview><g id="blender_collection" fill="fff"><path id="path1" d="m1499.5309 100.43027-1299.9863.03711-.01171 299.99218s1299.68651 2.63656 1299.95121-.07812zm-1200.0234 399.99804.01562 799.92969 1099.99608.082-.0547-799.93357z" transform="translate(.461255 99.540436)"/></g><path id="path2" d="m175.6648 99.948542c-48.15785-.323156-75.54556 25.527328-75.54725 76.532298l-.014 423.30849s57.2301.18883 99.92707.23534l.0469 822.68913c.69231 47.4171 25.65156 76.9025 76.74481 77.2317h1147.55127c51.7456 0 76.0346-27.6411 75.7384-77.572l-.054-822.45446c43.7336-.1314 99.986-.18248 99.986-.18248v-424.07111c0-51.0049-25.7441-76.054072-73.9019-75.730906zm24.55583 100.301818h1299.80377v299.88603l-1299.96685-.10128zm99.81 399.85649 1099.96687-.0725-.2031 800.44125-1099.80377-.1993z" fill-opacity=".5" stroke-width="99.8344"/><path id="handhold" d="m700.40998 701.40838c-136.44824.30561-129.50035 200.27886 0 199.99996h299.03314c133.05938-.075 132.82888-199.92785 0-199.99996z" fill-opacity=".940455" stroke-width=".995635"/></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

4
source/blender/makesrna/intern/rna_userdef.cc
View File

@@ -2182,7 +2182,7 @@ static void rna_def_userdef_theme_ui(BlenderRNA *brna)
RNA_def_property_float_sdna(prop, nullptr, "icon_collection"); RNA_def_property_float_sdna(prop, nullptr, "icon_collection");
RNA_def_property_array(prop, 4); RNA_def_property_array(prop, 4);
RNA_def_property_ui_text(prop, "Collection", ""); RNA_def_property_ui_text(prop, "Collection", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update"); RNA_def_property_update(prop, 0, "rna_userdef_gpu_update");
prop = RNA_def_property(srna, "icon_object", PROP_FLOAT, PROP_COLOR_GAMMA); prop = RNA_def_property(srna, "icon_object", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, nullptr, "icon_object"); RNA_def_property_float_sdna(prop, nullptr, "icon_object");
@@ -4086,7 +4086,7 @@ static void rna_def_userdef_theme_collection_color(BlenderRNA *brna)
RNA_def_property_float_sdna(prop, nullptr, "color"); RNA_def_property_float_sdna(prop, nullptr, "color");
RNA_def_property_array(prop, 3); RNA_def_property_array(prop, 3);
RNA_def_property_ui_text(prop, "Color", "Collection Color Tag"); RNA_def_property_ui_text(prop, "Color", "Collection Color Tag");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update"); RNA_def_property_update(prop, 0, "rna_userdef_gpu_update");
} }
static void rna_def_userdef_theme_strip_color(BlenderRNA *brna) static void rna_def_userdef_theme_strip_color(BlenderRNA *brna)