[Bf-blender-cvs] [ae6872e26f3] blender2.8: UI: update status bar mouse icons, draw in text color.
Brecht Van Lommel
noreply at git.blender.org
Mon Jul 2 17:41:22 CEST 2018
Commit: ae6872e26f3732d632212d9940ed5abc0b6ad0ce
Author: Brecht Van Lommel
Date: Mon Jul 2 15:28:47 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBae6872e26f3732d632212d9940ed5abc0b6ad0ce
UI: update status bar mouse icons, draw in text color.
===================================================================
M release/datafiles/blender_icons.svg
M release/datafiles/blender_icons16/icon16_mouse_lmb.dat
M release/datafiles/blender_icons16/icon16_mouse_lmb_drag.dat
M release/datafiles/blender_icons16/icon16_mouse_mmb.dat
M release/datafiles/blender_icons16/icon16_mouse_mmb_drag.dat
M release/datafiles/blender_icons16/icon16_mouse_move.dat
M release/datafiles/blender_icons16/icon16_mouse_rmb.dat
M release/datafiles/blender_icons16/icon16_mouse_rmb_drag.dat
M release/datafiles/blender_icons16/icon16_restrict_view_off.dat
M release/datafiles/blender_icons16/icon16_restrict_view_on.dat
M release/datafiles/blender_icons32/icon32_mouse_lmb.dat
M release/datafiles/blender_icons32/icon32_mouse_lmb_drag.dat
M release/datafiles/blender_icons32/icon32_mouse_mmb.dat
M release/datafiles/blender_icons32/icon32_mouse_mmb_drag.dat
M release/datafiles/blender_icons32/icon32_mouse_move.dat
M release/datafiles/blender_icons32/icon32_mouse_rmb.dat
M release/datafiles/blender_icons32/icon32_mouse_rmb_drag.dat
M release/datafiles/blender_icons32/icon32_restrict_view_off.dat
M release/datafiles/blender_icons32/icon32_restrict_view_on.dat
M source/blender/editors/include/UI_icons.h
M source/blender/editors/interface/interface_icons.c
===================================================================
diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg
index c190fa4dd2a..a14f2903b71 100644
--- a/release/datafiles/blender_icons.svg
+++ b/release/datafiles/blender_icons.svg
@@ -92825,7 +92825,7 @@
</g>
<g
style="display:inline;enable-background:new"
- transform="translate(168.01766,170.03707)"
+ transform="translate(168.01766,128.03044)"
id="ICON_GRID-3"
mask="url(#mask25369-1)">
<rect
@@ -92861,8 +92861,8 @@
inkscape:connector-curvature="0" />
</g>
<g
- style="display:inline;enable-background:new;opacity:0.25"
- transform="translate(188.9552,170.08067)"
+ style="display:inline;opacity:0.25;enable-background:new"
+ transform="translate(188.9552,128.07404)"
id="ICON_GRID-3-7"
mask="url(#mask25369-1-6)">
<rect
@@ -92899,382 +92899,305 @@
</g>
<g
style="display:inline;enable-background:new"
- id="g8189"
- transform="translate(-647.84611,-56.087322)">
- <rect
- transform="scale(-1,1)"
- y="506.99997"
- x="-669"
- height="15.999999"
- width="15.999999"
- id="rect8179"
- style="opacity:0;vector-effect:none;fill:#d40000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
- <path
- sodipodi:nodetypes="cssssssc"
- inkscape:connector-curvature="0"
- id="path8183"
- d="m -655.5,513.49997 v 6.0165 c 0,1.65287 -1.33066,2.98353 -2.98353,2.98353 h -4.03294 c -1.65287,0 -2.98353,-1.33066 -2.98353,-2.98353 v -9.03297 c 0,-1.65287 1.33066,-2.98353 2.98353,-2.98353 H -658.5"
- style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
- transform="scale(-1,1)" />
- <g
- transform="translate(-20)"
- id="g8185" />
- <path
- sodipodi:nodetypes="csssccc"
- inkscape:connector-curvature="0"
- id="path8187"
- d="m 659.5,507.49997 h -1.0165 c -0.64696,0 -1.24455,0.20387 -1.73231,0.55112 -0.75838,0.53993 -1.25122,1.4265 -1.25122,2.43241 v 3.01647 l 4.00824,0.008 z"
- style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:new" />
- </g>
- <g
- style="display:inline;enable-background:new"
- id="g8210"
- transform="translate(-646.84611,-35.087322)">
- <rect
- y="485.99997"
- x="673"
- height="15.999999"
- width="15.999999"
- id="rect8201"
- style="opacity:0;vector-effect:none;fill:#d40000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
- <rect
- ry="2.9835341"
- rx="2.9835341"
- y="486.5"
- x="675.5"
- height="14.999969"
- width="10"
- id="rect8203"
- style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
- <rect
- style="opacity:1;vector-effect:none;fill:#f9f9f9;fill-opacity:1;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
- id="rect8205"
- width="2"
- height="5.0000005"
- x="679.5"
- y="489.49997"
- rx="0.546875"
- ry="0.546875" />
+ id="g9502">
<g
- id="g8208"
- transform="translate(0,-21)" />
- </g>
- <g
- transform="matrix(-1,0,0,1,715.15389,-56.087322)"
- id="g8275"
- style="display:inline;enable-background:new">
- <rect
- style="opacity:0;vector-effect:none;fill:#d40000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
- id="rect8264"
- width="15.999999"
- height="15.999999"
- x="-669"
- y="506.99997"
- transform="scale(-1,1)" />
- <path
- transform="scale(-1,1)"
- style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
- d="m -655.5,513.49997 v 6.0165 c 0,1.65287 -1.33066,2.98353 -2.98353,2.98353 h -4.03294 c -1.65287,0 -2.98353,-1.33066 -2.98353,-2.98353 v -9.03297 c 0,-1.65287 1.33066,-2.98353 2.98353,-2.98353 H -658.5"
- id="path8267"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssssssc" />
- <g
- id="g8270"
- transform="translate(-20)" />
- <path
- style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:new"
- d="m 659.5,507.49997 h -1.0165 c -0.64696,0 -1.24455,0.20387 -1.73231,0.55112 -0.75838,0.53993 -1.25122,1.4265 -1.25122,2.43241 v 3.01647 l 4.00824,0.008 z"
- id="path8273"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="csssccc" />
- </g>
- <g
- style="display:inline;enable-background:new"
- id="g8244"
- transform="translate(-416.84613,479.91244)">
+ transform="translate(-84.000002,1e-5)"
+ id="g10350-2"
+ style="display:inline;enable-background:new">
+ <rect
+ ry="3.0625"
+ rx="3.0625"
+ style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+ id="rect10334-4"
+ width="10"
+ height="15"
+ x="152.5"
+ y="451.5" />
+ <g
+ transform="translate(-523,-55.999969)"
+ id="g10338-4" />
+ <g
+ id="g8140-7">
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ id="path10340-2"
+ d="M 165.5,459.5 V 454"
+ style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+ <path
+ sodipodi:open="true"
+ d="M 164.50114,451.52593 A 9.3798456,5.5 0 0 1 165.50372,454"
+ sodipodi:end="0"
+ sodipodi:start="5.8166094"
+ sodipodi:ry="5.5"
+ sodipodi:rx="9.3798456"
+ sodipodi:cy="454"
+ sodipodi:cx="156.12387"
+ sodipodi:type="arc"
+ id="path10342-8"
+ style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke" />
+ <path
+ style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+ d="m 167.50001,457.60147 v -4.05761"
+ id="path10344-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ </g>
+ <g
+ id="g8200-9">
+ <path
+ transform="translate(-523,-55.99997)"
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ d="m 680.5,513.49997 -0.01,-4.03235"
+ style="display:inline;opacity:0.5;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:new"
+ id="path10336-9" />
+ <rect
+ ry="3.0625"
+ rx="3.0625"
+ style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+ id="rect8195-2"
+ width="10"
+ height="15"
+ x="152.5"
+ y="451.5" />
+ </g>
+ </g>
<g
- id="g8231">
+ transform="translate(-63.000001)"
+ id="g3173"
+ style="display:inline;enable-background:new">
<path
sodipodi:nodetypes="cssssssc"
inkscape:connector-curvature="0"
- id="path8225"
- d="m 489.50002,-13.49979 h -0.93752 c -1.69663,0 -3.0625,-1.36588 -3.0625,-3.0625 v -8.875 c 0,-1.69662 1.36587,-3.0625 3.0625,-3.0625 h 3.875 c 1.69662,0 3.0625,1.36588 3.0625,3.0625 v 7.9375"
- style="opacity:0.6;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+ id="rect10312-1"
+ d="m 152.5,459.50001 v 4.0165 c 0,1.65287 1.33066,2.98353 2.98353,2.98353 h 4.03294 c 1.65287,0 2.98353,-1.33066 2.98353,-2.9
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list