Commit: 0dd6e5bfee3dee0ced75e9cb03e950627b59e75e Author: Julian Eisel Date: Sat Jun 10 16:41:58 2017 +0200 Branches: master https://developer.blender.org/rB0dd6e5bfee3dee0ced75e9cb03e950627b59e75e
UI: Replace placeholder icons in object-add menu Replaces the placeholder 'emtpy' icons of "Force Field" and "Group Instance" entries in object-add menu with proper new ones. Icons by @zlsa, thanks a lot! Maniphest task T51291. =================================================================== M release/datafiles/blender_icons.svg A release/datafiles/blender_icons16/icon16_outliner_ob_force_field.dat A release/datafiles/blender_icons16/icon16_outliner_ob_group_instance.dat A release/datafiles/blender_icons32/icon32_outliner_ob_force_field.dat A release/datafiles/blender_icons32/icon32_outliner_ob_group_instance.dat M release/scripts/startup/bl_ui/space_view3d.py M source/blender/editors/include/UI_icons.h =================================================================== diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg index d88788fa904..a9c0fd431eb 100644 --- a/release/datafiles/blender_icons.svg +++ b/release/datafiles/blender_icons.svg @@ -31358,6 +31358,136 @@ fx="-0.78262758" fy="294.63174" r="6.6750002" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient33897" + id="radialGradient29130" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.6249996,2.7477764e-7,-3.1704883e-7,1.874986,-24.234082,-761.21063)" + cx="39.528847" + cy="871.2453" + fx="39.528847" + fy="871.2453" + r="2.0000005" /> + <linearGradient + inkscape:collect="always" + id="linearGradient33897"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop33893" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop33895" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient319-367" + id="linearGradient63713" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.8167109,0,0,0.8433415,239.34332,-149.78578)" + x1="104.90227" + y1="53.227627" + x2="114.94328" + y2="60.73848" /> + <linearGradient + id="linearGradient319-367"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop320-53" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop321-562" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient319-367" + id="linearGradient63715" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(207,-246.99988)" + x1="-56.65625" + y1="342.03125" + x2="-53.1875" + y2="342.0625" /> + <linearGradient + id="linearGradient3043"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop3045" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop3047" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient319-367" + id="linearGradient63886" + x1="149.53125" + y1="95.781372" + x2="149.40625" + y2="103.12512" + gradientUnits="userSpaceOnUse" /> + <linearGradient + id="linearGradient3050"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop3052" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop3054" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient63892" + id="linearGradient63894" + x1="127.85783" + y1="115.03898" + x2="137.88899" + y2="121.44501" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + id="linearGradient63892"> + <stop + style="stop-color:#ba5d00;stop-opacity:1" + offset="0" + id="stop63888" /> + <stop + id="stop63896" + offset="0.5" + style="stop-color:#fa9a3a;stop-opacity:1" /> + <stop + style="stop-color:#ffffff;stop-opacity:1" + offset="1" + id="stop63890" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient319-367" + id="linearGradient63719" + gradientUnits="userSpaceOnUse" + x1="132" + y1="117.26753" + x2="142.72656" + y2="127.72736" /> + <linearGradient + id="linearGradient3062"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop3064" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop3066" /> + </linearGradient> </defs> <sodipodi:namedview id="base" @@ -92721,6 +92851,406 @@ style="display:inline;overflow:visible;visibility:visible;fill:none;stroke:#a8df84;stroke-width:2.93474906;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" id="path39834-2" inkscape:connector-curvature="0" /> + <g + id="g1418" + transform="matrix(1.6674711,0,0,1.6674711,-416.35106,-776.00982)" + style="display:inline;enable-background:new"> + <path + style="fill:none;stroke:#4b2f1e;stroke-width:2.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + id="path1374" + sodipodi:type="arc" + sodipodi:cx="41" + sodipodi:cy="873.36212" + sodipodi:rx="4.2499995" + sodipodi:ry="4.2499995" + sodipodi:start="6.1086524" + sodipodi:end="7.5049158" + sodipodi:open="true" + d="m 45.185432,872.62412 c 0.358149,2.03116 -0.793733,4.02628 -2.731847,4.73169" /> + <path + style="fill:none;stroke:#4b2f1e;stroke-width:2.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + id="path1376" + sodipodi:type="arc" + sodipodi:cx="41" + sodipodi:cy="873.36212" + sodipodi:rx="7" + sodipodi:ry="7" + sodipodi:start="4.4505896" + sodipodi:end="4.9741884" + sodipodi:open="true" + d="m 39.188267,866.60064 c 1.186888,-0.31802 2.436579,-0.31802 3.623467,0" /> + <path + d="m 47.76148,875.17385 c -0.318025,1.18689 -0.942871,2.26916 -1.811733,3.13802" + sodipodi:open="true" + sodipodi:end="0.78539816" + sodipodi:start="0.26179939" + sodipodi:ry="6.9999995" + sodipodi:rx="6.9999995" + sodipodi:cy="873.36212" + sodipodi:cx="41" + sodipodi:type="arc" + id="path1378" + style="fill:none;stroke:#4b2f1e;stroke-width:2.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + <path + d="m 39.546414,877.35581 c -1.938113,-0.70541 -3.089995,-2.70053 -2.731846,-4.73169" + sodipodi:open="true" + sodipodi:end="3.3161256" + sodipodi:start="1.9198622" + sodipodi:ry="4.2499995" + sodipodi:rx="4.2499995" + sodipodi:cy="873.36212" + sodipodi:cx="41" + sodipodi:type="arc" + id="path1380" + style="fill:none;stroke:#4b2f1e;stroke-width:2.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + <path + style="fill:none;stroke:#4b2f1e;stroke-width:2.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + id="path1382" + sodipodi:type="arc" + sodipodi:cx="41" + sodipodi:cy="873.36212" + sodipodi:rx="6.9999995" + sodipodi:ry="6.9999995" + sodipodi:start="2.3561945" + sodipodi:end="2.8797933" + sodipodi:open="true" + d="m 36.050253,878.31187 c -0.868862,-0.86886 -1.493708,-1.95113 -1.811733,-3.13802" /> + <rect + ry="2.75" + rx="2.75" + y="870.61212" + x="38.25" + height="5.5" + width="5.5000005" + id="rect1384" + style="fill:#4b2f1e;fill-opacity:1;fill-rule:nonzero;stroke:none" /> + <rect + style="fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:none" + id="rect1386" + width="20" + height="20" + x="31" + y="862.36212" + rx="0" + ry="0" /> + <rect + style="fill:#ff7d1f;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="rect1388" + width="4.0000005" + height="4" + x="39" + y="871.36212" + rx="2" + ry="2" /> + <rect + ry="1.5" + rx="1.5000004" + y="871.86212" + x="39.5" + height="3" + width="3.0000007" + id="rect1390" + style="fill:none;stroke:url(#radialGradient29130);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + <path + style="fill:none;stroke:#ffb36b;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + id="path1392" + sodipodi:type="arc" + sodipodi:cx="41" + sodipodi:cy="873.36212" + sodipodi:rx="4.2499995" + sodipodi:ry="4.2499995" + sodipodi:start="1.9198622" + sodipodi:end="3.3161256" + sodipodi:open="true" + d="m 39.546414,877.35581 c -1.938113,-0.70541 -3.089995,-2.70053 -2.731846,-4.73169" /> + <path + d="m 36.050253,878.31187 c -0.868862,-0.86886 -1.493708,-1.95113 -1.811733,-3.13802" + sodipodi:open="true" + sodipodi:end="2.8797933" + sodipodi:start="2.3561945" + @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs