[Bf-blender-cvs] [6baea955bf5] blender2.8: UI: use new 3D viewport navigation icons and image icon in add menu.
Brecht Van Lommel
noreply at git.blender.org
Thu Sep 27 20:12:10 CEST 2018
Commit: 6baea955bf562399caa9c6186601815af29b584d
Author: Brecht Van Lommel
Date: Thu Sep 27 19:15:18 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB6baea955bf562399caa9c6186601815af29b584d
UI: use new 3D viewport navigation icons and image icon in add menu.
I had to make the viewport navigation icons a bit smaller in the SVG since
the edges were being clipped off, we only support 16x16 icons currently.
They are a bit blurry because of this.
===================================================================
M release/datafiles/blender_icons.svg
M release/datafiles/blender_icons16/icon16_disclosure_tri_down.dat
M release/datafiles/blender_icons16/icon16_disclosure_tri_right.dat
A release/datafiles/blender_icons16/icon16_outliner_ob_image.dat
M release/datafiles/blender_icons16/icon16_view_camera.dat
M release/datafiles/blender_icons16/icon16_view_ortho.dat
M release/datafiles/blender_icons16/icon16_view_pan.dat
M release/datafiles/blender_icons16/icon16_view_perspective.dat
M release/datafiles/blender_icons16/icon16_view_zoom.dat
M release/datafiles/blender_icons32/icon32_disclosure_tri_down.dat
M release/datafiles/blender_icons32/icon32_disclosure_tri_right.dat
A release/datafiles/blender_icons32/icon32_outliner_ob_image.dat
M release/datafiles/blender_icons32/icon32_view_camera.dat
M release/datafiles/blender_icons32/icon32_view_ortho.dat
M release/datafiles/blender_icons32/icon32_view_pan.dat
M release/datafiles/blender_icons32/icon32_view_perspective.dat
M release/datafiles/blender_icons32/icon32_view_zoom.dat
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c
M source/blender/editors/include/ED_gizmo_library.h
M source/blender/editors/include/UI_icons.h
M source/blender/editors/space_view3d/view3d_gizmo_navigate.c
===================================================================
diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg
index e65131c7308..7352fec7964 100644
--- a/release/datafiles/blender_icons.svg
+++ b/release/datafiles/blender_icons.svg
@@ -14,7 +14,7 @@
height="640"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"
version="1.0"
sodipodi:docname="blender_icons.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
@@ -30105,6 +30105,48 @@
fx="74.518959"
fy="499.99969"
r="3.1650217" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient40455-7"
+ id="radialGradient37553-3"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.7881042,0.01544832,-0.01690407,0.7184169,-16.705439,29.204304)"
+ cx="-73.135666"
+ cy="95.970413"
+ fx="-73.135666"
+ fy="95.970413"
+ r="4.9999957" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient18495"
+ id="radialGradient37555-3"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.4604901,-0.4901463,0.6187826,0.5813434,279.52277,457.42224)"
+ cx="756.98285"
+ cy="206.8443"
+ fx="756.98285"
+ fy="206.8443"
+ r="6.9000001" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient58334"
+ id="linearGradient14523"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(670.49503,-32.964641)"
+ x1="89.012573"
+ y1="243.96121"
+ x2="93.0625"
+ y2="249" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient16500"
+ id="linearGradient14525"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(1,-94.999998)"
+ x1="754.28558"
+ y1="300.83292"
+ x2="758.62622"
+ y2="305.53677" />
</defs>
<sodipodi:namedview
id="base"
@@ -30116,16 +30158,16 @@
objecttolerance="10000"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="1.7675782"
- inkscape:cx="474.09045"
- inkscape:cy="240.94738"
+ inkscape:zoom="16"
+ inkscape:cx="357.41339"
+ inkscape:cy="196.12466"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
- inkscape:window-width="1145"
- inkscape:window-height="1339"
- inkscape:window-x="1254"
- inkscape:window-y="0"
+ inkscape:window-width="3775"
+ inkscape:window-height="2080"
+ inkscape:window-x="65"
+ inkscape:window-y="38"
inkscape:snap-nodes="true"
inkscape:snap-bbox="true"
showguides="true"
@@ -30134,7 +30176,7 @@
inkscape:object-paths="false"
inkscape:snap-intersection-line-segments="true"
inkscape:snap-intersection-grid-guide="false"
- inkscape:window-maximized="0"
+ inkscape:window-maximized="1"
inkscape:bbox-paths="false"
inkscape:snap-global="true"
inkscape:snap-bbox-midpoints="false"
@@ -85909,18 +85951,6 @@
d="m 36,544 h 1 v 2 h -1 z"
id="path5004" />
</g>
- <image
- y="688.74585"
- x="-97.166298"
- id="image14434"
- xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEcAAAAKCAYAAADmdkOtAAAABHNCSVQICAgIfAhkiAAAADlJREFU
-SInt0DEKACAQA0Hv8P9fjo2VyLZa7ED6sJUkQzfdrx/8zDjAOMA4wDjAOMA4wDhg7ulQVVnqPgUa
-9kvoAAAAAABJRU5ErkJggg==
-"
- style="image-rendering:optimizeSpeed"
- preserveAspectRatio="none"
- height="10"
- width="71" />
<path
sodipodi:nodetypes="ccc"
id="path13481"
@@ -86694,7 +86724,7 @@ SInt0DEKACAQA0Hv8P9fjo2VyLZa7ED6sJUkQzfdrx/8zDjAOMA4wDjAOMA4wDhg7ulQVVnqPgUa
inkscape:export-xdpi="96"
inkscape:export-ydpi="96" />
<g
- transform="translate(-1.8135029e-6)"
+ transform="matrix(0.88,0,0,0.88,64.558313,2.1616853)"
style="display:inline;enable-background:new"
id="g15624">
<path
@@ -86709,7 +86739,7 @@ SInt0DEKACAQA0Hv8P9fjo2VyLZa7ED6sJUkQzfdrx/8zDjAOMA4wDjAOMA4wDhg7ulQVVnqPgUa
id="path15447" />
</g>
<g
- transform="translate(-1.8135029e-6)"
+ transform="matrix(0.88,0,0,0.88,61.981895,2.1608086)"
style="display:inline;enable-background:new"
id="g15620">
<path
@@ -86724,7 +86754,7 @@ SInt0DEKACAQA0Hv8P9fjo2VyLZa7ED6sJUkQzfdrx/8zDjAOMA4wDjAOMA4wDhg7ulQVVnqPgUa
inkscape:connector-curvature="0" />
</g>
<g
- transform="translate(-1.8135029e-6)"
+ transform="matrix(0.88,0,0,0.88,56.999998,2.16)"
style="display:inline;enable-background:new"
id="g15612">
<path
@@ -86739,7 +86769,7 @@ SInt0DEKACAQA0Hv8P9fjo2VyLZa7ED6sJUkQzfdrx/8zDjAOMA4wDjAOMA4wDhg7ulQVVnqPgUa
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:nor [...]
</g>
<g
- transform="translate(-1.8135029e-6)"
+ transform="matrix(0.88,0,0,0.88,54.479998,2.22)"
style="display:inline;enable-background:new"
id="g15608">
<path
@@ -86754,7 +86784,7 @@ SInt0DEKACAQA0Hv8P9fjo2VyLZa7ED6sJUkQzfdrx/8zDjAOMA4wDjAOMA4wDhg7ulQVVnqPgUa
inkscape:connector-curvature="0" />
</g>
<g
- transform="translate(-1.8135029e-6)"
+ transform="matrix(0.88,0,0,0.88,59.519998,2.1601513)"
style="display:inline;enable-background:new"
id="g15616">
<path
@@ -87923,6 +87953,128 @@ SInt0DEKACAQA0Hv8P9fjo2VyLZa7ED6sJUkQzfdrx/8zDjAOMA4wDjAOMA4wDhg7ulQVVnqPgUa
id="rect12202"
style="display:inline;overflow:visible;visibility:visible;opacity:0;fill:#000000;stroke:none;stroke-width:3;marker:none;enable-background:accumulate" />
</g>
+ <g
+ style="display:inline;enable-background:new"
+ id="ICON_FILE_IMAGE-9"
+ transform="translate(-431.96906,226.0094)">
+ <path
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+ inkscape:export-filename="C:\Documents and Settings\Tata\Pulpit\BLENDER ICONSET\Kopia blender\.blender\icons\jendrzych's iconset.png"
+ sodipodi:nodetypes="cccccc"
+ id="path37516-3"
+ d="m 757.01257,204.46121 9.48743,0.0388 V 219.5 h -13 l 0.0126,-11.53879 3.5,-3.5 z"
+ style="display:inline;fill:#dcdcdc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none"
+ inkscape:connector-curvature="0" />
+ <g
+ id="g37518-6"
+ style="display:inline;enable-background:new"
+ transform="matrix(2.0006615,0,0,1,921.06748,111.96121)">
+ <g
+ id="g37520-0"
+ transform="matrix(0.49807352,0,0,1,-41.659898,0)">
+ <rect
+ style="display:inline;overflow:visible;visibility:visible;fill:#ffb36b;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80141318;marker:none;enable-background:accumulate"
+ id="rect37522-6"
+ width="10.03535"
+ height="12"
+ x="-83"
+ y="94" />
+ <rect
+ y="101"
+ x="-83"
+ height="4.9999976"
+ width="9.9999924"
+ id="rect37524-2"
+ style="display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#fd961b;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;marker:none;enable-background:accumulate" />
+ <rect
+ y="94"
+ x="-83"
+ height="6.8499999"
+ width="9.9999914"
+ id="rect37526-6"
+ style="display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:url(#radialGradient37553-3);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;marker:none;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="cccccccccccc"
+ id="path37528-1"
+ d="m -83,100.00002 h 1 l 1,0.74999 1,-0.74999 1,0.99999 h 2 l 1.5,-0.75 1.5,0.75 h 0.999991 L -73,102 h -9.999991 z"
+ style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;marker:none;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <rect
+ style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.1;marker:none;enable-background:accumulate"
+ id="rect37530-8"
+ width="2.0000029"
+ height="2.0000038"
+ x="-77"
+ y="96" />
+ <path
+ style="display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:#2b0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;marker:none;enable-background:accumulate"
+ d="m -83,102 h 10 v 1 h -10 z"
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list