[Bf-blender-cvs] [d2ad2563267] blender2.8: UI: add dedicated icon IDs for decorators, tool settings, shaderfx, overlays.
Brecht Van Lommel
noreply at git.blender.org
Thu Aug 30 17:58:34 CEST 2018
Commit: d2ad256326736c8a4c746163f9b27491d8a6e95a
Author: Brecht Van Lommel
Date: Fri Aug 24 12:54:48 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBd2ad256326736c8a4c746163f9b27491d8a6e95a
UI: add dedicated icon IDs for decorators, tool settings, shaderfx, overlays.
The preset and decorator icons were updated to be monochrome and draw in the
same color as text. Other icons are unchanged, having them as separate icon IDs
prepares for an artist to make them.
===================================================================
M release/datafiles/blender_icons.svg
A release/datafiles/blender_icons16/icon16_decorate.dat
A release/datafiles/blender_icons16/icon16_decorate_animate.dat
A release/datafiles/blender_icons16/icon16_decorate_driver.dat
A release/datafiles/blender_icons16/icon16_decorate_keyframe.dat
A release/datafiles/blender_icons16/icon16_decorate_linked.dat
A release/datafiles/blender_icons16/icon16_decorate_locked.dat
A release/datafiles/blender_icons16/icon16_decorate_override.dat
A release/datafiles/blender_icons16/icon16_decorate_unlocked.dat
A release/datafiles/blender_icons16/icon16_overlay.dat
M release/datafiles/blender_icons16/icon16_preset.dat
A release/datafiles/blender_icons16/icon16_shaderfx.dat
A release/datafiles/blender_icons16/icon16_tool_settings.dat
A release/datafiles/blender_icons32/icon32_decorate.dat
A release/datafiles/blender_icons32/icon32_decorate_animate.dat
A release/datafiles/blender_icons32/icon32_decorate_driver.dat
A release/datafiles/blender_icons32/icon32_decorate_keyframe.dat
A release/datafiles/blender_icons32/icon32_decorate_linked.dat
A release/datafiles/blender_icons32/icon32_decorate_locked.dat
A release/datafiles/blender_icons32/icon32_decorate_override.dat
A release/datafiles/blender_icons32/icon32_decorate_unlocked.dat
A release/datafiles/blender_icons32/icon32_overlay.dat
M release/datafiles/blender_icons32/icon32_preset.dat
A release/datafiles/blender_icons32/icon32_shaderfx.dat
A release/datafiles/blender_icons32/icon32_tool_settings.dat
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/editors/include/UI_icons.h
M source/blender/editors/interface/interface_anim.c
M source/blender/editors/space_view3d/view3d_buttons.c
M source/blender/makesrna/intern/rna_space.c
===================================================================
diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg
index 4174c575e67..e0df177e36a 100644
--- a/release/datafiles/blender_icons.svg
+++ b/release/datafiles/blender_icons.svg
@@ -31693,94 +31693,6 @@
offset="1"
id="stop32081" />
</linearGradient>
- <linearGradient
- id="linearGradient16201"
- inkscape:collect="always">
- <stop
- id="stop16197"
- offset="0"
- style="stop-color:#3162a3;stop-opacity:1" />
- <stop
- id="stop16199"
- offset="1"
- style="stop-color:#f7fefe;stop-opacity:1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- id="linearGradient32049">
- <stop
- style="stop-color:#000000;stop-opacity:0.502"
- offset="0"
- id="stop32045" />
- <stop
- style="stop-color:#000000;stop-opacity:0;"
- offset="1"
- id="stop32047" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient32083"
- id="linearGradient1839"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9995967,0,0,1.0002103,-78.949724,-0.02739749)"
- x1="130.96371"
- y1="93.79351"
- x2="130.95943"
- y2="102.0938" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient32049"
- id="linearGradient1843"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99959671,0,0,1.0002103,-77.491851,-1.6095542)"
- x1="134.59244"
- y1="102.70123"
- x2="129.80527"
- y2="99.260376" />
- <radialGradient
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0756796,0,0,1.0756796,169.29413,52.235312)"
- r="2.5804064"
- fy="221.18524"
- fx="126.53663"
- cy="221.18524"
- cx="126.53663"
- id="radialGradient16215-8-6"
- xlink:href="#linearGradient18134"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient32275"
- id="linearGradient1837"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.24672296,0,0,0.24587247,48.791231,-7.4945859)"
- x1="-106.86201"
- y1="54.004005"
- x2="-118.21918"
- y2="42.824642" />
- <linearGradient
- inkscape:collect="always"
- id="linearGradient32275">
- <stop
- style="stop-color:#ffffff;stop-opacity:0.502"
- offset="0"
- id="stop32271" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.502"
- offset="1"
- id="stop32273" />
- </linearGradient>
- <radialGradient
- gradientTransform="matrix(0.74982815,0,0,0.74524045,-395.41513,-347.41042)"
- r="8"
- fy="116.10581"
- fx="135.00543"
- cy="116.10581"
- cx="135.00543"
- gradientUnits="userSpaceOnUse"
- id="radialGradient16343-7"
- xlink:href="#linearGradient20909"
- inkscape:collect="always" />
<linearGradient
id="linearGradient20909">
<stop
@@ -31792,70 +31704,6 @@
offset="1"
style="stop-color:#be6405;stop-opacity:1" />
</linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient18134"
- id="linearGradient1833"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.68749955,0,0,0.68749925,174.25458,209.80705)"
- x1="125.81818"
- y1="111.81818"
- x2="143.88347"
- y2="129.27184" />
- <radialGradient
- r="4.0908751"
- fy="224.26517"
- fx="129.04718"
- cy="224.26517"
- cx="129.04718"
- gradientTransform="matrix(2.3313393,0.09414236,-0.07778124,1.9261749,-17.080128,-154.09391)"
- gradientUnits="userSpaceOnUse"
- id="radialGradient16345-9"
- xlink:href="#linearGradient20915"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- id="linearGradient20915">
- <stop
- style="stop-color:#efa351;stop-opacity:1"
- offset="0"
- id="stop20911" />
- <stop
- style="stop-color:#f7fefe;stop-opacity:1"
- offset="1"
- id="stop20913" />
- </linearGradient>
- <radialGradient
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0756796,0,0,1.0756796,126.28771,52.31486)"
- r="2.5804064"
- fy="221.18524"
- fx="126.53663"
- cy="221.18524"
- cx="126.53663"
- id="radialGradient16215-2"
- xlink:href="#linearGradient18134"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient37542"
- id="linearGradient15186"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9995967,0,0,1.0002103,-78.949724,-0.02739749)"
- x1="109.04134"
- y1="75.666725"
- x2="135.45256"
- y2="103.11092" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient319"
- id="linearGradient15188"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.1000194,0,0,1.0998287,-4.6508478,-9.2334126)"
- x1="47.655102"
- y1="93.805557"
- x2="59.057678"
- y2="105.27895" />
<linearGradient
id="linearGradient16192">
<stop
@@ -31867,58 +31715,6 @@
offset="1"
id="stop16190" />
</linearGradient>
- <radialGradient
- gradientTransform="matrix(0.74982815,0,0,0.74524045,-395.41513,-347.41042)"
- r="8"
- fy="116.10581"
- fx="135.00543"
- cy="116.10581"
- cx="135.00543"
- gradientUnits="userSpaceOnUse"
- id="radialGradient16343"
- xlink:href="#linearGradient16192"
- inkscape:collect="always" />
- <linearGradient
- gradientTransform="matrix(0.68749955,0,0,0.68749925,174.25458,209.80705)"
- y2="129.27184"
- x2="143.88347"
- y1="111.81818"
- x1="125.81818"
- gradientUnits="userSpaceOnUse"
- id="linearGradient15938"
- xlink:href="#linearGradient18134"
- inkscape:collect="always" />
- <radialGradient
- r="4.0908751"
- fy="224.26517"
- fx="129.04718"
- cy="224.26517"
- cx="129.04718"
- gradientTransform="matrix(2.3313393,0.09414236,-0.07778124,1.9261749,-17.080128,-154.09391)"
- gradientUnits="userSpaceOnUse"
- id="radialGradient16345"
- xlink:href="#linearGradient16201"
- inkscape:collect="always" />
- <radialGradient
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0756796,0,0,1.0756796,126.28771,52.31486)"
- r="2.5804064"
- fy="221.18524"
- fx="126.53663"
- cy="221.18524"
- cx="126.53663"
- id="radialGradient16215"
- xlink:href="#linearGradient18134"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient27277-1-8"
- id="linearGradient18811"
- gradientUnits="userSpaceOnUse"
- x1="4.1933641"
- y1="199.12067"
- x2="17.16466"
- y2="211.01585" />
<mask
maskUnits="userSpaceOnUse"
id="mask25369-1">
@@ -32205,6 +32001,162 @@
y1="238"
x2="226.625"
y2="251.71078" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient18495"
+ id="radialGradient45309-02"
+ cx="336.42892"
+ cy="611.10455"
+ fx="336.42892"
+ fy="611.10455"
+ r="5.9852905"
+ gradientTransform="matrix(1.0070601,0.03386866,-0.03770425,1.1211085,20.665977,-85.772965)"
+ gradientUnits="userSpaceOnUse" />
+ <filter
+ style="color-interpolation-filters:sRGB"
+ inkscape:collect="always"
+ id="filter24186-3-2-2"
+ x="-0.12810811"
+ width="1.2562162"
+ y="-0.11285714"
+ height="1.2257143">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.395"
+ id="feGaussianBlur24188-3-7-2" />
+ </filter>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient319-9-1"
+ id="linearGradient42578"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(301.02752,449.99999)"
+ x1="25.963812"
+ y1="155.66899"
+ x2="29.972469"
+ y2="168" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1610-06-1-5"
+ id="linearGradient42580"
+ gradientUnits="userSpaceOnUse"
+ x1="335.96875"
+ y1="607.09375"
+ x2="337.04251"
+ y2="628.20752" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient15859-1-3"
+ id="linearGradient42617"
+ gradientUnits="userSpaceOnUse"
+ x1="12.602254"
+ y1="206.13333"
+ x2="26.167894"
+ y2="220.66356" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient48327-1"
+ id="radialGradient42840"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.4461753,0.01083717,0.0036163,6.752143,-191.34795,-740.3814)"
+ cx="131.99811"
+ cy="126.63337"
+ fx="131.99811"
+ fy="126.63337"
+ r="9.1978254" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient10069-74-1"
+ id="linearGradient42842"
+ gradientUnits="userSpaceOnUse"
+ x1="125.20553"
+ y1="111.38132"
+ x2="132.35237"
+ y2="118.69846" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient319-7409-3-7"
+ id="linearGradient42844"
+ gradientUnits="userSpaceOnUse"
+ x1="130.60338"
+ y1="115.87343"
+ x2="143.88347"
+ y2="129.27184" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient319-7409-3-7"
+ id="linearGradient42846"
+ gradientUnits="userSpaceOnUse"
+ x1="125.81818"
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list