Merge branch 'blender-v4.2-release'

release/datafiles/blender_icons.svg

@@ -17731,6 +17731,19 @@
          d="m 141.51562,82 a 0.50005,0.50005 0 0 0 -0.5,0.5 v 5 a 0.50005,0.50005 0 0 0 0.5,0.5 H 145.5 a 0.50005,0.50005 0 0 0 0.5,-0.5 v -5 A 0.50005,0.50005 0 0 0 145.5,82 Z m 0.5,1 H 145 v 4 h -2.98438 z m -9.5,-1 a 0.50005,0.50005 0 0 0 -0.5,0.5 v 5 a 0.50005,0.50005 0 0 0 0.5,0.5 H 136.5 a 0.50005,0.50005 0 0 0 0.5,-0.5 v -5 A 0.50005,0.50005 0 0 0 136.5,82 Z m 0.5,1 H 136 v 4 h -2.98438 z m 8.5,-9 a 0.50005,0.50005 0 0 0 -0.5,0.5 v 5 a 0.50005,0.50005 0 0 0 0.5,0.5 H 145.5 a 0.50005,0.50005 0 0 0 0.5,-0.5 v -5 A 0.50005,0.50005 0 0 0 145.5,74 Z m 0.5,1 H 145 v 4 h -2.98438 z m -9.5,-1 a 0.50005,0.50005 0 0 0 -0.5,0.5 v 5 a 0.50005,0.50005 0 0 0 0.5,0.5 H 136.5 a 0.50005,0.50005 0 0 0 0.5,-0.5 v -5 A 0.50005,0.50005 0 0 0 136.5,74 Z m 0.5,1 H 136 v 4 h -2.98438 z"
          inkscape:connector-curvature="0" />
     </g>
+    <g
+        id="g14"
+        style="display:inline;enable-background:new"
+        inkscape:label="D-9"><path
+          d="m 208.08827,82.239344 -4.85823,4.858234 a 1.3551554,1.3551554 0 0 1 -1.91754,0 l -5.8204,-5.813619 v -6.775777 h 6.77578 l 5.82039,5.820393 a 1.3551554,1.3551554 0 0 1 0,1.910769 z"
+          id="path1-7"
+          style="display:inline;fill:none;stroke:#ffffff;stroke-width:1.01636;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;enable-background:new"
+          inkscape:label="tag_outline" /><path
+          style="color:#000000;fill:#ffffff;stroke-width:2.72314;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none"
+          d="m 199.24748,76.880862 a 1.3838472,1.3838472 0 0 0 -1.38818,1.382845 1.3838472,1.3838472 0 0 0 1.38818,1.382847 h 0.0163 a 1.3838472,1.3838472 0 0 0 1.38284,-1.382847 1.3838472,1.3838472 0 0 0 -1.38284,-1.382845 z"
+          id="line1"
+          inkscape:label="tag_center" />
+    </g>
     <g
        id="g34189"
        style="display:inline;enable-background:new"
@@ -19541,6 +19554,24 @@
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          sodipodi:nodetypes="sssccccccccsccssssssccssssssc" />
     </g>
+    <g
+       id="g14"
+       style="display:inline;enable-background:new"
+       inkscape:label="D-9"
+       transform="translate(0.01225526,-3.698e-4)">
+      <path
+         d="m 208.08827,82.239344 -4.85823,4.858234 c -0.52934,0.529929 -1.3882,0.529929 -1.91754,0 l -5.82431,-5.817525 v -6.775777 l 6.77969,0.0039 5.82039,5.820393 c 0.52543,0.528561 0.52543,1.382208 0,1.910769 z"
+         id="path1-7"
+         style="display:inline;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;enable-background:new"
+         inkscape:label="tag_outline"
+         sodipodi:nodetypes="cccccccc" />
+      <path
+         style="color:#000000;fill:#ffffff;stroke-width:2.72314;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none"
+         d="m 199.49196,77.115237 c -0.76558,-0.0024 -1.38763,0.617264 -1.38818,1.382845 5.5e-4,0.765582 0.6226,1.385244 1.38818,1.382847 h 0.0163 c 0.76349,0 1.38229,-0.619353 1.38284,-1.382847 -5.5e-4,-0.763493 -0.61935,-1.382845 -1.38284,-1.382845 z"
+         id="line1"
+         inkscape:label="tag_center"
+         sodipodi:nodetypes="cccscsc" />
+    </g>
   </g>
   <g
      inkscape:groupmode="layer"

scripts/addons_core/bl_pkg/bl_extension_ui.py

@@ -895,7 +895,7 @@ def extensions_panel_draw(panel, context):
     row_b = row.row(align=True)
     row_b.prop(wm, "extension_type", text="")
     row_b.popover("USERPREF_PT_extensions_filter", text="", icon='FILTER')
-    row_b.popover("USERPREF_PT_extensions_tags", text="", icon='COLOR')
+    row_b.popover("USERPREF_PT_extensions_tags", text="", icon='TAG')
 
     row_b.separator()
     row_b.popover("USERPREF_PT_extensions_repos", text="Repositories")

source/blender/editors/datafiles/CMakeLists.txt

@@ -626,6 +626,7 @@ set(ICON_NAMES
   shortdisplay
   longdisplay
   imgdisplay
+  tag
   bookmarks
   fontpreview
   filter

source/blender/editors/include/UI_icons.hh

@@ -774,7 +774,7 @@ DEF_ICON(LONGDISPLAY)
 DEF_ICON_BLANK(786)
 DEF_ICON(IMGDISPLAY)
 DEF_ICON_BLANK(788)
-DEF_ICON_BLANK(789)
+DEF_ICON(TAG)
 DEF_ICON(BOOKMARKS)
 DEF_ICON(FONTPREVIEW)
 DEF_ICON(FILTER)