blender
/
blender
130
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

UI: 4-state icon for view visibility popover 

This is a quick way to see if some of the object types in the
scene are hidden or unselected.

Icon design may change.
This commit is contained in:
Campbell Barton 2018-07-12 09:38:19 +02:00
parent 66087fe127
commit 963da9ff6e
13 changed files with 614 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

590
release/datafiles/blender_icons.svg
View File

@ -32021,6 +32021,190 @@
style="fill:url(#linearGradient25387-9);fill-rule:evenodd;stroke:none" />
</g>
</mask>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1610"
id="linearGradient15405"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-19,294.91429)"
x1="461.66425"
y1="16.23234"
x2="432.875"
y2="14.936845" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient319"
id="linearGradient15407"
gradientUnits="userSpaceOnUse"
x1="62.793919"
y1="133.73566"
x2="64.109718"
y2="135.18265" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1610-36-6-5"
id="linearGradient15602"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(144,188)"
x1="209"
y1="238"
x2="226.625"
y2="251.71078" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient18495"
id="radialGradient27973-2-2"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.39459,-0.991726,0.917787,0.36517,234.80511,750.0215)"
cx="450.06522"
cy="25.190212"
fx="450.06522"
fy="25.190212"
r="5.5" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient18134"
id="radialGradient27975-7-6"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.121304,-0.696283,0.871429,0.151818,359.51331,621.7)"
cx="450.72842"
cy="19.250505"
fx="450.72842"
fy="19.250505"
r="5.5" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1610"
id="linearGradient17086"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-19,294.91429)"
x1="461.66425"
y1="16.23234"
x2="432.875"
y2="14.936845" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient319"
id="linearGradient17088"
gradientUnits="userSpaceOnUse"
x1="62.793919"
y1="133.73566"
x2="64.109718"
y2="135.18265" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient319"
id="linearGradient17090"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-1,0,0,1,883.51417,295)"
x1="456.81198"
y1="15.545153"
x2="441.9628"
y2="13.21724" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1610-36-6-5"
id="linearGradient17092"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(144,188)"
x1="209"
y1="238"
x2="226.625"
y2="251.71078" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient18495"
id="radialGradient27973-2-2-2"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.39459,-0.991726,0.917787,0.36517,234.80511,750.0215)"
cx="450.06522"
cy="25.190212"
fx="450.06522"
fy="25.190212"
r="5.5" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient18134"
id="radialGradient27975-7-6-7"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.121304,-0.696283,0.871429,0.151818,359.51331,621.7)"
cx="450.72842"
cy="19.250505"
fx="450.72842"
fy="19.250505"
r="5.5" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient319"
id="linearGradient17532"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-1,0,0,1,883.51417,295)"
x1="456.81198"
y1="15.545153"
x2="441.9628"
y2="13.21724" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1610-36-6-5"
id="linearGradient17534"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(144,188)"
x1="209"
y1="238"
x2="226.625"
y2="251.71078" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1610-36-6-5"
id="linearGradient17536"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(144,188)"
x1="209"
y1="238"
x2="226.625"
y2="251.71078" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient18495"
id="radialGradient27973-2-2-2-0"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.39459,-0.991726,0.917787,0.36517,234.80511,750.0215)"
cx="450.06522"
cy="25.190212"
fx="450.06522"
fy="25.190212"
r="5.5" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient18134"
id="radialGradient27975-7-6-7-4"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.121304,-0.696283,0.871429,0.151818,359.51331,621.7)"
cx="450.72842"
cy="19.250505"
fx="450.72842"
fy="19.250505"
r="5.5" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient319"
id="linearGradient17802"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-1,0,0,1,883.51417,295)"
x1="456.81198"
y1="15.545153"
x2="441.9628"
y2="13.21724" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1610-36-6-5"
id="linearGradient17804"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(144,188)"
x1="209"
y1="238"
x2="226.625"
y2="251.71078" />
</defs>
<sodipodi:namedview
id="base"
@ -93198,6 +93382,412 @@
id="g8298" />
</g>
</g>
<g
style="display:inline;enable-background:new"
id="ICON_RESTRICT_VIEW_OFF-4"
transform="matrix(0.53591163,0,0,0.55801106,-126.5083,-25.447517)">
<rect
y="302"
x="404"
height="16"
width="16.000004"
id="rect27916-7"
style="display:inline;opacity:0;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
<g
id="g28110-8">
<path
id="path27918-4"
d="m 412,306.45213 c -3.54545,0 -5.90909,1.5 -6.49999,3.04787 0.5909,1.45213 2.95581,3.77094 6.49999,3.75 3.54709,-0.021 5.9091,-2.29787 6.50001,-3.75 -0.59091,-1.54787 -2.95455,-3.04787 -6.50001,-3.04787 z"
style="fill:url(#linearGradient15405);fill-opacity:1;fill-rule:evenodd;stroke:none"
sodipodi:nodetypes="ccscz"
inkscape:connector-curvature="0" />
<ellipse
id="path27920-5"
style="fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none"
transform="matrix(0.7500463,0,0,1.0294111,88.73017,294.07354)"
cx="431"
cy="14.5"
rx="3.9999149"
ry="2.91429" />
<circle
id="path27922-0"
style="display:inline;fill:url(#linearGradient15407);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.74699998;marker:none"
transform="matrix(2.249956,0,0,2.251405,267.75278,4.81032)"
cx="64"
cy="135"
r="1" />
<path
sodipodi:nodetypes="ccscs"
style="fill:none;stroke:#000000;stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 412,306.5 c -3.5,0 -5,1.5 -6.5,3 1.5,1.5 2.75,4 6.5,4 3.75,0 5,-2.5 6.5,-4 -1.5,-1.5 -3,-3 -6.5,-3 z"
id="path27924-3"
inkscape:connector-curvature="0" />
<rect
y="307.91428"
x="411"
height="2"
width="2"
id="rect27926-6"
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
<circle
id="path27928-1"
style="display:inline;opacity:0.7;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.74699998;marker:none"
transform="translate(347,172.91429)"
cx="64"
cy="135"
r="1" />
</g>
</g>
<path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#b4b4b4;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"
d="M 101.24481,150.52549 92.852426,137.08557"
id="path15475-0"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<g
transform="matrix(0.69944752,0,0,0.70386741,-158,-165.92486)"
style="display:inline;enable-background:new"
id="ICON_RESTRICT_SELECT_OFF-7-8">
<path
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccc"
id="path45378-1-5-6-4-8"
d="m 367.75,440.75 1.75,-1.5 2.5,5.25 1.75,-1 -2.25,-5 h 2.5 l -6.25,-6.25 z"
style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient15602);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;marker:none;enable-background:accumulate" />
<rect
y="430"
x="362"
height="16"
width="16"
id="rect45374-0-5-6-5-4"
style="display:inline;overflow:visible;visibility:visible;opacity:0;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
<path
sodipodi:nodetypes="cccccccc"
inkscape:connector-curvature="0"
id="path17835-7-25-3"
d="m 367.5,431.5 7,7.25 h -3 l 2.5,4.75 -1.75,1 -2.5,-5 -2.25,2.25 z"
style="fill:none;stroke:#000000;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path17845-9-4-1"
d="m 368.34375,433.75 v 5.75"
style="fill:none;stroke:#ffffff;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
<g
style="display:inline;enable-background:new"
id="ICON_RESTRICT_VIEW_OFF-4-6"
transform="matrix(0.53591163,0,0,0.55801106,-105.5083,-25.447514)">
<rect
y="302"
x="404"
height="16"
width="16.000004"
id="rect27916-7-4"
style="display:inline;opacity:0;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
<g
id="g28110-8-5">
<path
id="path27918-4-2"
d="m 412,306.45213 c -3.54545,0 -5.90909,1.5 -6.49999,3.04787 0.5909,1.45213 2.95581,3.77094 6.49999,3.75 3.54709,-0.021 5.9091,-2.29787 6.50001,-3.75 -0.59091,-1.54787 -2.95455,-3.04787 -6.50001,-3.04787 z"
style="fill:url(#linearGradient17086);fill-opacity:1;fill-rule:evenodd;stroke:none"
sodipodi:nodetypes="ccscz"
inkscape:connector-curvature="0" />
<ellipse
id="path27920-5-0"
style="fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none"
transform="matrix(0.7500463,0,0,1.0294111,88.73017,294.07354)"
cx="431"
cy="14.5"
rx="3.9999149"
ry="2.91429" />
<circle
id="path27922-0-2"
style="display:inline;fill:url(#linearGradient17088);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.74699998;marker:none"
transform="matrix(2.249956,0,0,2.251405,267.75278,4.81032)"
cx="64"
cy="135"
r="1" />
<path
sodipodi:nodetypes="ccscs"
style="fill:none;stroke:#000000;stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 412,306.5 c -3.5,0 -5,1.5 -6.5,3 1.5,1.5 2.75,4 6.5,4 3.75,0 5,-2.5 6.5,-4 -1.5,-1.5 -3,-3 -6.5,-3 z"
id="path27924-3-9"
inkscape:connector-curvature="0" />
<rect
y="307.91428"
x="411"
height="2"
width="2"
id="rect27926-6-0"
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
<circle
id="path27928-1-9"
style="display:inline;opacity:0.7;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.74699998;marker:none"
transform="translate(347,172.91429)"
cx="64"
cy="135"
r="1" />
</g>
</g>
<g
style="display:inline;enable-background:new"
id="ICON_RESTRICT_VIEW_ON-0-9"
transform="matrix(0.51332204,0,0,0.45193371,-106.94628,7.531493)">
<g
transform="translate(0.4838899)"
id="g27934-6-4">
<path
sodipodi:nodetypes="ccscz"
style="display:inline;opacity:0.25;fill:url(#radialGradient27973-2-2);fill-opacity:1;fill-rule:evenodd;stroke:none"
d="m 432.51611,305.45213 c -3,0 -7,2.04787 -5.5,4.04787 0.5,1.45213 2.49969,3.02073 5.49861,2.99979 3.00139,-0.021 4.82513,-1.62106 5.50139,-2.99995 2,-2.49984 -2.5,-4.04771 -5.5,-4.04771 z"
id="path27936-3-5"
inkscape:connector-curvature="0" />
<path
id="path27938-2-1"
d="m 432.51611,305.45213 c -3,0 -7.75,2.04787 -6.25,4.04787 0.5,1.45213 3.25108,3.52094 6.25,3.5 3.00139,-0.021 5.82374,-2.12111 6.5,-3.5 2,-2.49984 -3.5,-4.04787 -6.5,-4.04787 z"
style="display:inline;opacity:0.18000004;fill:url(#radialGradient27975-7-6);fill-opacity:1;fill-rule:evenodd;stroke:none"
sodipodi:nodetypes="ccscz"
inkscape:connector-curvature="0" />
<path
style="opacity:0.25;fill:none;stroke:url(#linearGradient17090);stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="m 438.51611,309.5 c -2,4 -10,4 -12,0"
id="path27940-0-0"
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0" />
<path
sodipodi:nodetypes="cc"
id="path27942-6-3"
d="m 426.01611,309.5 c 2,5 11,5 13,0"
style="opacity:0.3;fill:none;stroke:#000000;stroke-width:1.00000012px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
inkscape:connector-curvature="0" />
</g>
<rect
style="opacity:0.25;fill:none;stroke:none"
id="rect27944-1-7"
width="15.983887"
height="16"
x="425.01611"
y="302" />
</g>
<g
transform="matrix(0.67292818,0,0,0.69502762,-127.10972,-162.15459)"
style="display:inline;opacity:0.3;enable-background:new"
id="ICON_RESTRICT_SELECT_ON-6-8">
<path
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccc"
id="path45378-1-5-0-5-8"
d="m 367.75,440.75 1.75,-1.5 2.5,5.25 1.75,-1 -2.25,-5 h 2.5 l -6.25,-6.25 z"
style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient17092);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;marker:none;enable-background:accumulate" />
<rect
y="430"
x="362"
height="16"
width="16"
id="rect45374-0-5-0-6-6"
style="display:inline;overflow:visible;visibility:visible;opacity:0;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
<path
sodipodi:nodetypes="cccccccc"
inkscape:connector-curvature="0"
id="path17835-6-9-0"
d="m 367.5,431.5 7,7.25 h -3 l 2.5,4.75 -1.75,1 -2.5,-5 -2.25,2.25 z"
style="fill:none;stroke:#000000;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path17845-4-3-4"
d="m 368.34375,433.75 v 5.75"
style="fill:none;stroke:#ffffff;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
<path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#b4b4b4;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"
d="m 122.24481,150.52549 -8.39238,-13.43992"
id="path15475-0-6"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<g
style="display:inline;enable-background:new"
id="ICON_RESTRICT_VIEW_ON-0-9-9"
transform="matrix(0.51332204,0,0,0.45193371,-85.946279,7.5314909)">
<g
transform="translate(0.4838899)"
id="g27934-6-4-0">
<path
sodipodi:nodetypes="ccscz"
style="display:inline;opacity:0.25;fill:url(#radialGradient27973-2-2-2);fill-opacity:1;fill-rule:evenodd;stroke:none"
d="m 432.51611,305.45213 c -3,0 -7,2.04787 -5.5,4.04787 0.5,1.45213 2.49969,3.02073 5.49861,2.99979 3.00139,-0.021 4.82513,-1.62106 5.50139,-2.99995 2,-2.49984 -2.5,-4.04771 -5.5,-4.04771 z"
id="path27936-3-5-2"
inkscape:connector-curvature="0" />
<path
id="path27938-2-1-4"
d="m 432.51611,305.45213 c -3,0 -7.75,2.04787 -6.25,4.04787 0.5,1.45213 3.25108,3.52094 6.25,3.5 3.00139,-0.021 5.82374,-2.12111 6.5,-3.5 2,-2.49984 -3.5,-4.04787 -6.5,-4.04787 z"
style="display:inline;opacity:0.18000004;fill:url(#radialGradient27975-7-6-7);fill-opacity:1;fill-rule:evenodd;stroke:none"
sodipodi:nodetypes="ccscz"
inkscape:connector-curvature="0" />
<path
style="opacity:0.25;fill:none;stroke:url(#linearGradient17532);stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="m 438.51611,309.5 c -2,4 -10,4 -12,0"
id="path27940-0-0-7"
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0" />
<path
sodipodi:nodetypes="cc"
id="path27942-6-3-6"
d="m 426.01611,309.5 c 2,5 11,5 13,0"
style="opacity:0.3;fill:none;stroke:#000000;stroke-width:1.00000012px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
inkscape:connector-curvature="0" />
</g>
<rect
style="opacity:0.25;fill:none;stroke:none"
id="rect27944-1-7-5"
width="15.983887"
height="16"
x="425.01611"
y="302" />
</g>
<g
transform="matrix(0.67292818,0,0,0.69502762,-106.10972,-162.15459)"
style="display:inline;opacity:0.3;enable-background:new"
id="ICON_RESTRICT_SELECT_ON-6-8-7">
<path
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccc"
id="path45378-1-5-0-5-8-1"
d="m 367.75,440.75 1.75,-1.5 2.5,5.25 1.75,-1 -2.25,-5 h 2.5 l -6.25,-6.25 z"
style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient17534);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;marker:none;enable-background:accumulate" />
<rect
y="430"
x="362"
height="16"
width="16"
id="rect45374-0-5-0-6-6-3"
style="display:inline;overflow:visible;visibility:visible;opacity:0;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
<path
sodipodi:nodetypes="cccccccc"
inkscape:connector-curvature="0"
id="path17835-6-9-0-3"
d="m 367.5,431.5 7,7.25 h -3 l 2.5,4.75 -1.75,1 -2.5,-5 -2.25,2.25 z"
style="fill:none;stroke:#000000;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path17845-4-3-4-3"
d="m 368.34375,433.75 v 5.75"
style="fill:none;stroke:#ffffff;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
<path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#b4b4b4;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"
d="m 143.24481,150.52549 -8.39238,-13.43992"
id="path15475-0-6-8"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<g
transform="matrix(0.69944752,0,0,0.70386741,-116,-165.92486)"
style="display:inline;enable-background:new"
id="ICON_RESTRICT_SELECT_OFF-7-8-7-5">
<path
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccc"
id="path45378-1-5-6-4-8-6-1"
d="m 367.75,440.75 1.75,-1.5 2.5,5.25 1.75,-1 -2.25,-5 h 2.5 l -6.25,-6.25 z"
style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient17536);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;marker:none;enable-background:accumulate" />
<rect
y="430"
x="362"
height="16"
width="16"
id="rect45374-0-5-6-5-4-0-0"
style="display:inline;overflow:visible;visibility:visible;opacity:0;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
<path
sodipodi:nodetypes="cccccccc"
inkscape:connector-curvature="0"
id="path17835-7-25-3-9-8"
d="m 367.5,431.5 7,7.25 h -3 l 2.5,4.75 -1.75,1 -2.5,-5 -2.25,2.25 z"
style="fill:none;stroke:#000000;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path17845-9-4-1-7-7"
d="m 368.34375,433.75 v 5.75"
style="fill:none;stroke:#ffffff;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
<g
style="display:inline;enable-background:new"
id="ICON_RESTRICT_VIEW_ON-0-9-9-3"
transform="matrix(0.51332204,0,0,0.45193371,-65.946279,7.5314909)">
<g
transform="translate(0.4838899)"
id="g27934-6-4-0-1">
<path
sodipodi:nodetypes="ccscz"
style="display:inline;opacity:0.25;fill:url(#radialGradient27973-2-2-2-0);fill-opacity:1;fill-rule:evenodd;stroke:none"
d="m 432.51611,305.45213 c -3,0 -7,2.04787 -5.5,4.04787 0.5,1.45213 2.49969,3.02073 5.49861,2.99979 3.00139,-0.021 4.82513,-1.62106 5.50139,-2.99995 2,-2.49984 -2.5,-4.04771 -5.5,-4.04771 z"
id="path27936-3-5-2-8"
inkscape:connector-curvature="0" />
<path
id="path27938-2-1-4-3"
d="m 432.51611,305.45213 c -3,0 -7.75,2.04787 -6.25,4.04787 0.5,1.45213 3.25108,3.52094 6.25,3.5 3.00139,-0.021 5.82374,-2.12111 6.5,-3.5 2,-2.49984 -3.5,-4.04787 -6.5,-4.04787 z"
style="display:inline;opacity:0.18000004;fill:url(#radialGradient27975-7-6-7-4);fill-opacity:1;fill-rule:evenodd;stroke:none"
sodipodi:nodetypes="ccscz"
inkscape:connector-curvature="0" />
<path
style="opacity:0.25;fill:none;stroke:url(#linearGradient17802);stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="m 438.51611,309.5 c -2,4 -10,4 -12,0"
id="path27940-0-0-7-4"
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0" />
<path
sodipodi:nodetypes="cc"
id="path27942-6-3-6-2"
d="m 426.01611,309.5 c 2,5 11,5 13,0"
style="opacity:0.3;fill:none;stroke:#000000;stroke-width:1.00000012px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
inkscape:connector-curvature="0" />
</g>
<rect
style="opacity:0.25;fill:none;stroke:none"
id="rect27944-1-7-5-2"
width="15.983887"
height="16"
x="425.01611"
y="302" />
</g>
<g
transform="matrix(0.67292818,0,0,0.69502762,-86.109719,-162.15459)"
style="display:inline;opacity:0.3;enable-background:new"
id="ICON_RESTRICT_SELECT_ON-6-8-7-4">
<path
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccc"
id="path45378-1-5-0-5-8-1-5"
d="m 367.75,440.75 1.75,-1.5 2.5,5.25 1.75,-1 -2.25,-5 h 2.5 l -6.25,-6.25 z"
style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient17804);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;marker:none;enable-background:accumulate" />
<rect
y="430"
x="362"
height="16"
width="16"
id="rect45374-0-5-0-6-6-3-1"
style="display:inline;overflow:visible;visibility:visible;opacity:0;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
<path
sodipodi:nodetypes="cccccccc"
inkscape:connector-curvature="0"
id="path17835-6-9-0-3-7"
d="m 367.5,431.5 7,7.25 h -3 l 2.5,4.75 -1.75,1 -2.5,-5 -2.25,2.25 z"
style="fill:none;stroke:#000000;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path17845-4-3-4-3-5"
d="m 368.34375,433.75 v 5.75"
style="fill:none;stroke:#ffffff;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
<path
style="display:inline;fill:#ffffff;fill-rule:evenodd;stroke:#b4b4b4;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"
d="m 163.24481,150.52549 -8.39238,-13.43992"
id="path15475-0-6-8-7"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
</g>
<g
inkscape:groupmode="layer"

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 MiB

After

Width:  |  Height:  |  Size: 4.4 MiB

BIN
release/datafiles/blender_icons16/icon16_vis_sel_00.dat Normal file
View File

Binary file not shown.

BIN
release/datafiles/blender_icons16/icon16_vis_sel_01.dat Normal file
View File

Binary file not shown.

BIN
release/datafiles/blender_icons16/icon16_vis_sel_10.dat Normal file
View File

Binary file not shown.

BIN
release/datafiles/blender_icons16/icon16_vis_sel_11.dat Normal file
View File

Binary file not shown.

BIN
release/datafiles/blender_icons32/icon32_vis_sel_00.dat Normal file
View File

Binary file not shown.

BIN
release/datafiles/blender_icons32/icon32_vis_sel_01.dat Normal file
View File

Binary file not shown.

BIN
release/datafiles/blender_icons32/icon32_vis_sel_10.dat Normal file
View File

Binary file not shown.

BIN
release/datafiles/blender_icons32/icon32_vis_sel_11.dat Normal file
View File

Binary file not shown.

2
release/scripts/startup/bl_ui/space_view3d.py
View File

@ -213,7 +213,7 @@ class VIEW3D_HT_header(Header):
space_type='VIEW_3D',
region_type='HEADER',
panel_type="VIEW3D_PT_object_type_visibility",
icon="HIDE_OFF",
icon_value=view.icon_from_show_object_viewport,
text="",
)

4
source/blender/editors/datafiles/CMakeLists.txt
View File

@ -435,6 +435,10 @@ set(ICON_NAMES
copydown
pasteflipup
pasteflipdown
vis_sel_11
vis_sel_10
vis_sel_10
vis_sel_00
snap_surface
automerge_on
automerge_off

10
source/blender/editors/include/UI_icons.h
View File

@ -728,12 +728,10 @@ DEF_ICON(PASTEDOWN)
DEF_ICON(COPYDOWN)
DEF_ICON(PASTEFLIPUP)
DEF_ICON(PASTEFLIPDOWN)
#ifndef DEF_ICON_BLANK_SKIP
DEF_ICON(BLANK227)
DEF_ICON(BLANK228)
DEF_ICON(BLANK229)
DEF_ICON(BLANK230)
#endif
DEF_ICON(VIS_SEL_11)
DEF_ICON(VIS_SEL_10)
DEF_ICON(VIS_SEL_01)
DEF_ICON(VIS_SEL_00)
DEF_ICON(SNAP_SURFACE)
DEF_ICON(AUTOMERGE_ON)
DEF_ICON(AUTOMERGE_OFF)

15
source/blender/makesrna/intern/rna_space.c
View File

@ -905,6 +905,15 @@ static const EnumPropertyItem *rna_SpaceView3D_stereo3d_camera_itemf(
return stereo3d_camera_items;
}
static int rna_SpaceView3D_icon_from_show_object_viewport_get(PointerRNA *ptr)
{
const View3D *v3d = (View3D *)ptr->data;
/* Ignore selection values when view is off, intent is to show if visible objects aren't selectable. */
const int view_value = (v3d->object_type_exclude_viewport != 0);
const int select_value = (v3d->object_type_exclude_select & ~v3d->object_type_exclude_viewport) != 0;
return ICON_VIS_SEL_11 + (view_value << 1) + select_value;
}
static PointerRNA rna_SpaceView3D_shading_get(PointerRNA *ptr)
{
return rna_pointer_inherit_refine(ptr, &RNA_View3DShading, ptr->data);
@ -3113,6 +3122,12 @@ static void rna_def_space_view3d(BlenderRNA *brna)
}
}
/* Heper for drawing the icon. */
prop = RNA_def_property(srna, "icon_from_show_object_viewport", PROP_INT, PROP_NONE);
RNA_def_property_int_funcs(prop, "rna_SpaceView3D_icon_from_show_object_viewport_get", NULL, NULL);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_ui_text(prop, "Visibility Iconm", "");
}
/* Nested Structs */