diff options
author | Thomas Dinges <blender@dingto.org> | 2013-06-16 16:05:39 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2013-06-16 16:05:39 +0400 |
commit | 04295954408db25e749a897a7db2972049005688 (patch) | |
tree | 1db66e453f0599289762474e591fd2569ae0591f /release | |
parent | 9e16c5a9e429e0d00801a4dd6ee71a8fbf6691f0 (diff) | |
parent | 29be97975876a1f298f4e6dab14c75aa9956f96a (diff) |
Merged revision(s) 57423-57498 from trunk/blender into soc-2013-dingto
Diffstat (limited to 'release')
-rw-r--r-- | release/datafiles/blender_icons.svg | 937 | ||||
-rw-r--r-- | release/scripts/freestyle/style_modules/parameter_editor.py | 6 | ||||
-rw-r--r-- | release/scripts/modules/bpy_extras/object_utils.py | 42 | ||||
-rw-r--r-- | release/scripts/startup/bl_operators/wm.py | 24 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_freestyle.py | 3 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 12 |
6 files changed, 992 insertions, 32 deletions
diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg index 2d31301cee2..ef742839da0 100644 --- a/release/datafiles/blender_icons.svg +++ b/release/datafiles/blender_icons.svg @@ -26,6 +26,30 @@ id="title49470">Blender icons v. 2.5.08</title> <defs id="defs4"> + <linearGradient + inkscape:collect="always" + id="linearGradient18214"> + <stop + style="stop-color:#ff0000;stop-opacity:1;" + offset="0" + id="stop18216" /> + <stop + style="stop-color:#ff0000;stop-opacity:0;" + offset="1" + id="stop18218" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient18205"> + <stop + style="stop-color:#00ffff;stop-opacity:1;" + offset="0" + id="stop18207" /> + <stop + style="stop-color:#00ffff;stop-opacity:0;" + offset="1" + id="stop18210" /> + </linearGradient> <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 320 : 1" @@ -26201,6 +26225,708 @@ offset="1" id="stop321-54" /> </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient37829-7" + id="linearGradient37089-1" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-0.9999993,0,0,-0.9821923,165.4,716.20935)" + x1="261.17639" + y1="247.85646" + x2="253.86414" + y2="288.70752" /> + <linearGradient + id="linearGradient37829-7"> + <stop + id="stop37831-4" + offset="0" + style="stop-color:#3d361a;stop-opacity:1;" /> + <stop + style="stop-color:#d1c595;stop-opacity:1;" + offset="0.5" + id="stop37833-0" /> + <stop + id="stop37835-9" + offset="1" + style="stop-color:#ffffff;stop-opacity:1;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient39080-8" + id="linearGradient37091-4" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-0.888884,0,0,-0.8730569,136.66557,688.20759)" + x1="261.60016" + y1="247.008" + x2="263.60016" + y2="262.27994" /> + <linearGradient + id="linearGradient39080-8"> + <stop + style="stop-color:#1a2a3d;stop-opacity:1;" + offset="0" + id="stop39082-8" /> + <stop + id="stop39084-2" + offset="0.5" + style="stop-color:#95b0d1;stop-opacity:1;" /> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="1" + id="stop39086-4" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient9030-7-8-6-5" + id="linearGradient37093-5" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-124.99991,219.9903)" + x1="19.923029" + y1="232.59058" + x2="50.485012" + y2="265.9697" /> + <linearGradient + id="linearGradient9030-7-8-6-5"> + <stop + style="stop-color:white;stop-opacity:1;" + offset="0" + id="stop9032-4-9-2-1" /> + <stop + style="stop-color:white;stop-opacity:0;" + offset="1" + id="stop9034-0-2-3-7" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient40809-2-2-1" + id="linearGradient37096-1" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.7500336,0,0,0.8546123,-239.89087,340.17205)" + x1="199.26254" + y1="144.5041" + x2="193.7029" + y2="144.5041" /> + <linearGradient + id="linearGradient40809-2-2-1"> + <stop + style="stop-color:#0059d7;stop-opacity:1;" + offset="0" + id="stop40811-1-6-5" /> + <stop + style="stop-color:#b7d4ff;stop-opacity:1;" + offset="1" + id="stop40813-4-2-2" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient20055-7-5-5-6" + id="linearGradient37098-7" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-670.99999,411.99999)" + x1="579.625" + y1="54.299286" + x2="576.4375" + y2="49.84375" /> + <linearGradient + id="linearGradient20055-7-5-5-6"> + <stop + id="stop20057-1-7-7-1" + offset="0" + style="stop-color:#0a2a5a;stop-opacity:1;" /> + <stop + id="stop20059-1-6-8-4" + offset="1" + style="stop-color:#3771c8;stop-opacity:1;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient16500-4-9-7-3" + id="linearGradient37100-2" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-670.99999,411.99999)" + x1="582.79974" + y1="56.363762" + x2="575.70361" + y2="49.87711" /> + <linearGradient + id="linearGradient16500-4-9-7-3"> + <stop + style="stop-color:black;stop-opacity:1;" + offset="0" + id="stop16502-8-5-8-2" /> + <stop + style="stop-color:black;stop-opacity:0;" + offset="1" + id="stop16504-8-4-0-2" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient9030-7-8-6-5" + id="linearGradient37102-1" + gradientUnits="userSpaceOnUse" + x1="129.74713" + y1="118" + x2="144.33401" + y2="132.61403" /> + <linearGradient + id="linearGradient15945"> + <stop + style="stop-color:white;stop-opacity:1;" + offset="0" + id="stop15947" /> + <stop + style="stop-color:white;stop-opacity:0;" + offset="1" + id="stop15949" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient16500-4-9-7-3" + id="linearGradient37104-6" + gradientUnits="userSpaceOnUse" + x1="140.78264" + y1="123.96156" + x2="132.25548" + y2="116.40535" /> + <linearGradient + id="linearGradient15952"> + <stop + style="stop-color:black;stop-opacity:1;" + offset="0" + id="stop15954" /> + <stop + style="stop-color:black;stop-opacity:0;" + offset="1" + id="stop15956" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient1610-1" + id="linearGradient16638-1" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(42,0)" + x1="108" + y1="500" + x2="54.8125" + y2="500" /> + <linearGradient + id="linearGradient1610-1"> + <stop + style="stop-color:black;stop-opacity:1;" + offset="0" + id="stop1611-38" /> + <stop + style="stop-color:white;stop-opacity:1;" + offset="1" + id="stop1612-7" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient15809-2" + id="linearGradient16640-4" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(42,0)" + x1="85.874489" + y1="501.74075" + x2="26.561054" + y2="498.48148" /> + <linearGradient + inkscape:collect="always" + id="linearGradient15809-2"> + <stop + style="stop-color:#000000;stop-opacity:1;" + offset="0" + id="stop15811-7" /> + <stop + style="stop-color:#000000;stop-opacity:0;" + offset="1" + id="stop15813-79" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient1610-1" + id="linearGradient16642-3" + gradientUnits="userSpaceOnUse" + x1="80.768944" + y1="504.67188" + x2="76.885078" + y2="501.58331" /> + <linearGradient + id="linearGradient16104"> + <stop + style="stop-color:black;stop-opacity:1;" + offset="0" + id="stop16106" /> + <stop + style="stop-color:white;stop-opacity:1;" + offset="1" + id="stop16108" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient319-98" + id="linearGradient16644-1" + gradientUnits="userSpaceOnUse" + x1="89.526657" + y1="511.42972" + x2="78.000008" + y2="501.04794" /> + <linearGradient + id="linearGradient319-98"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop320-65" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop321-028" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient14262-0" + id="radialGradient16646-6" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.3949409,0.3949425,-0.4243709,0.4254619,300.60762,256.85923)" + cx="75.95578" + cy="492.15359" + fx="75.95578" + fy="492.15359" + r="3.1650217" /> + <linearGradient + id="linearGradient14262-0"> + <stop + id="stop14264-2" + offset="0" + style="stop-color:#2661b6;stop-opacity:1;" /> + <stop + id="stop14266-4" + offset="1" + style="stop-color:#c1d7f8;stop-opacity:0;" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient319-98" + id="radialGradient16648-8" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.4624192,0,0,1.4467089,-36.975824,-224.99718)" + cx="79.959885" + cy="503.81497" + fx="79.959885" + fy="503.81497" + r="2.9089756" /> + <linearGradient + id="linearGradient16119"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop16121" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop16123" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient14262-0" + id="radialGradient16650-6" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.8886193,0.8021825,-0.8051059,0.8972684,411.80247,-8.668512)" + cx="74.518959" + cy="499.99969" + fx="74.518959" + fy="499.99969" + r="3.1650217" /> + <linearGradient + id="linearGradient16126"> + <stop + id="stop16128" + offset="0" + style="stop-color:#2661b6;stop-opacity:1;" /> + <stop + id="stop16130" + offset="1" + style="stop-color:#c1d7f8;stop-opacity:0;" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient18821-0" + id="radialGradient32447-5" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.8728692,0.8400852,-1.1671853,1.2200916,594.18579,-173.07738)" + cx="75.054749" + cy="499.87418" + fx="75.054749" + fy="499.87418" + r="3.1650217" /> + <linearGradient + id="linearGradient18821-0"> + <stop + style="stop-color:#fc6b58;stop-opacity:1;" + offset="0" + id="stop18823-9" /> + <stop + style="stop-color:#fc6b58;stop-opacity:0;" + offset="1" + id="stop18825-0" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient1610" + id="linearGradient16326" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(42,0)" + x1="108" + y1="500" + x2="54.8125" + y2="500" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient15809" + id="linearGradient16328" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(42,0)" + x1="85.874489" + y1="501.74075" + x2="26.561054" + y2="498.48148" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient1610" + id="linearGradient16330" + gradientUnits="userSpaceOnUse" + x1="80.768944" + y1="504.67188" + x2="76.885078" + y2="501.58331" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient319" + id="linearGradient16332" + gradientUnits="userSpaceOnUse" + x1="89.526657" + y1="511.42972" + x2="78.000008" + y2="501.04794" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient14262" + id="radialGradient16334" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.3949409,0.3949425,-0.4243709,0.4254619,300.60762,256.85923)" + cx="75.95578" + cy="492.15359" + fx="75.95578" + fy="492.15359" + r="3.1650217" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient319" + id="radialGradient16336" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.4624192,0,0,1.4467089,-36.975824,-224.99718)" + cx="79.959885" + cy="503.81497" + fx="79.959885" + fy="503.81497" + r="2.9089756" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient14262" + id="radialGradient16338" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.8886193,0.8021825,-0.8051059,0.8972684,411.80247,-8.668512)" + cx="74.518959" + cy="499.99969" + fx="74.518959" + fy="499.99969" + r="3.1650217" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient18821" + id="radialGradient16340" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.8728692,0.8400852,-1.1671853,1.2200916,594.18579,-173.07738)" + cx="75.054749" + cy="499.87418" + fx="75.054749" + fy="499.87418" + r="3.1650217" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient1610" + id="linearGradient16365" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(42,0)" + x1="108" + y1="500" + x2="54.8125" + y2="500" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient15809" + id="linearGradient16368" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(42,0)" + x1="85.874489" + y1="501.74075" + x2="26.561054" + y2="498.48148" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient1610" + id="linearGradient16370" + gradientUnits="userSpaceOnUse" + x1="80.768944" + y1="504.67188" + x2="76.885078" + y2="501.58331" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient319" + id="linearGradient16372" + gradientUnits="userSpaceOnUse" + x1="89.526657" + y1="511.42972" + x2="78.000008" + y2="501.04794" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient14262" + id="radialGradient16374" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.3949409,0.3949425,-0.4243709,0.4254619,300.60762,256.85923)" + cx="75.95578" + cy="492.15359" + fx="75.95578" + fy="492.15359" + r="3.1650217" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient319" + id="radialGradient16376" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.4624192,0,0,1.4467089,-36.975824,-224.99718)" + cx="79.959885" + cy="503.81497" + fx="79.959885" + fy="503.81497" + r="2.9089756" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient14262" + id="radialGradient16378" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.8886193,0.8021825,-0.8051059,0.8972684,411.80247,-8.668512)" + cx="74.518959" + cy="499.99969" + fx="74.518959" + fy="499.99969" + r="3.1650217" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient18821" + id="radialGradient16380" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.8728692,0.8400852,-1.1671853,1.2200916,594.18579,-173.07738)" + cx="75.054749" + cy="499.87418" + fx="75.054749" + fy="499.87418" + r="3.1650217" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient14262" + id="radialGradient16388" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.25944122,0.26285562,-0.27877413,0.28316794,597.6654,341.51983)" + cx="75.95578" + cy="492.15359" + fx="75.95578" + fy="492.15359" + r="3.1650217" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient15809" + id="linearGradient16404" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6569115,0,0,0.66555416,427.78308,170.5661)" + x1="85.874489" + y1="501.74075" + x2="26.561054" + y2="498.48148" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient1610" + id="linearGradient16407" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6569115,0,0,0.66555416,427.78308,170.5661)" + x1="108" + y1="500" + x2="54.8125" + y2="500" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient18821" + id="radialGradient16409" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.8728692,0.8400852,-1.1671853,1.2200916,594.18579,-173.07738)" + cx="75.054749" + cy="499.87418" + fx="75.054749" + fy="499.87418" + r="3.1650217" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient14262" + id="radialGradient16411" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.8886193,0.8021825,-0.8051059,0.8972684,411.80247,-8.668512)" + cx="74.518959" + cy="499.99969" + fx="74.518959" + fy="499.99969" + r="3.1650217" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient319" + id="radialGradient16413" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.4624192,0,0,1.4467089,-36.975824,-224.99718)" + cx="79.959885" + cy="503.81497" + fx="79.959885" + fy="503.81497" + r="2.9089756" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient319" + id="linearGradient16415" + gradientUnits="userSpaceOnUse" + x1="89.526657" + y1="511.42972" + x2="78.000008" + y2="501.04794" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient1610" + id="linearGradient16417" + gradientUnits="userSpaceOnUse" + x1="80.768944" + y1="504.67188" + x2="76.885078" + y2="501.58331" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient14262" + id="radialGradient17992" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.3949409,0.3949425,-0.4243709,0.4254619,657.60762,257.85923)" + cx="75.95578" + cy="492.15359" + fx="75.95578" + fy="492.15359" + r="3.1650217" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient15809" + id="linearGradient18008" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(399,1)" + x1="85.874489" + y1="501.74075" + x2="26.561054" + y2="498.48148" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient1610" + id="linearGradient18011" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(399,1)" + x1="108" + y1="500" + x2="54.8125" + y2="500" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient1610" + id="linearGradient18146" + gradientUnits="userSpaceOnUse" + x1="80.768944" + y1="504.67188" + x2="76.885078" + y2="501.58331" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient319" + id="linearGradient18149" + gradientUnits="userSpaceOnUse" + x1="89.526657" + y1="511.42972" + x2="78.000008" + y2="501.04794" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient319" + id="radialGradient18151" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.4624192,0,0,1.4467089,-36.975824,-224.99718)" + cx="79.959885" + cy="503.81497" + fx="79.959885" + fy="503.81497" + r="2.9089756" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient14262" + id="radialGradient18153" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.8886193,0.8021825,-0.8051059,0.8972684,411.80247,-8.668512)" + cx="74.518959" + cy="499.99969" + fx="74.518959" + fy="499.99969" + r="3.1650217" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient18821-4" + id="radialGradient18161-2" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.8728692,0.8400852,-1.1671853,1.2200916,594.18579,-173.07738)" + cx="75.054749" + cy="499.87418" + fx="75.054749" + fy="499.87418" + r="3.1650217" /> + <linearGradient + id="linearGradient18821-4"> + <stop + style="stop-color:#fc6b58;stop-opacity:1;" + offset="0" + id="stop18823-0" /> + <stop + style="stop-color:#fc6b58;stop-opacity:0;" + offset="1" + id="stop18825-1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient18205" + id="linearGradient18212" + x1="75.46875" + y1="502" + x2="80.53125" + y2="502" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient18214" + id="linearGradient18220" + x1="75.46875" + y1="502" + x2="80.53125" + y2="502" + gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" @@ -85070,6 +85796,217 @@ id="rect39229-9-8-3" style="fill:#e6e6e6;stroke:#969696;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:7.40000265000000024;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> </g> + <rect + style="opacity:0;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect17868" + width="16" + height="16" + x="467" + y="493" + rx="0" + ry="0" /> + <rect + rx="1.7356256" + style="fill:url(#linearGradient18011);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect17872" + width="15" + height="12" + x="467.5" + y="495.5" + ry="1.7356256" /> + <path + inkscape:connector-curvature="0" + style="fill:url(#linearGradient18008);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 468,499.48148 468,505 c 0,0.56404 0.36784,1.00001 0.84375,1 l 12.3125,0 C 481.63216,506 482,505.56405 482,505 l 0,-5.51852 c -0.31371,0.37179 -0.76923,0.59259 -1.25,0.59259 l -11.5,0 c -0.48077,0 -0.93629,-0.2208 -1.25,-0.59259 z" + id="path17875" + sodipodi:nodetypes="ccccccccc" /> + <rect + ry="1" + y="495.5" + x="467.5" + height="2" + width="15" + id="rect17877" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + rx="1.5817194" /> + <rect + rx="1.503511" + ry="1.503511" + y="495.5" + x="467.5" + height="12" + width="15" + id="rect17879" + style="fill:none;stroke:#000000;stroke-width:0.80000001;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="opacity:0.25;fill:none;stroke:#ffffff;stroke-width:0.99999988;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect17883" + width="13.000001" + height="10" + x="468.5" + y="496.5" + ry="0.4910686" + rx="0.5078125" /> + <g + transform="matrix(0.7547901,0,0,1,416.02177,0)" + id="g17893"> + <path + transform="matrix(0.7901234,0,0,0.2000006,9.8760061,395.5997)" + d="m 80.53125,502 c 0,1.38071 -1.133279,2.5 -2.53125,2.5 -1.397971,0 -2.53125,-1.11929 -2.53125,-2.5 0,-1.38071 1.133279,-2.5 2.53125,-2.5 1.397971,0 2.53125,1.11929 2.53125,2.5 z" + sodipodi:ry="2.5" + sodipodi:rx="2.5312502" + sodipodi:cy="502" + sodipodi:cx="78" + id="path17895" + style="fill:none;stroke:#999999;stroke-width:2.89550138;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + <path + inkscape:connector-curvature="0" + style="fill:none;stroke:#000000;stroke-width:1.15103066;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m 69.505631,495.5 0,-0.50001 c 0,-0.276 0.896,-0.5 2,-0.5 1.104,0 2,0.224 2,0.5 l 0,0.50001" + id="path17897" + sodipodi:nodetypes="csccc" /> + <rect + y="495" + x="70.189362" + height="1" + width="2.6497433" + id="rect17899" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + </g> + <rect + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect17901" + width="2" + height="1.5" + x="479" + y="497.5" /> + <rect + y="497.5" + x="479" + height="1.5" + width="2" + id="rect17903" + style="fill:url(#radialGradient17992);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect17905" + width="1" + height="1" + x="470" + y="498" /> + <use + x="0" + y="0" + xlink:href="#g18103" + id="use18134" + transform="translate(-6.1847313,0)" + width="602" + height="640" /> + <g + id="g18103" + transform="matrix(0.81050804,0,0,0.81050804,91.905464,90.739248)"> + <path + transform="matrix(1.5770887,0,0,1.5999841,353.49325,-294.69208)" + d="m 80.53125,502 c 0,1.38071 -1.133279,2.5 -2.53125,2.5 -1.397971,0 -2.53125,-1.11929 -2.53125,-2.5 0,-1.38071 1.133279,-2.5 2.53125,-2.5 1.397971,0 2.53125,1.11929 2.53125,2.5 z" + sodipodi:ry="2.5" + sodipodi:rx="2.5312502" + sodipodi:cy="502" + sodipodi:cx="78" + id="path17885" + style="opacity:0.1;fill:none;stroke:#000000;stroke-width:0.62952667;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + <path + sodipodi:type="arc" + style="opacity:0.7;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.75859177;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path17881" + sodipodi:cx="78" + sodipodi:cy="502" + sodipodi:rx="2.5312502" + sodipodi:ry="2.5" + d="m 80.53125,502 c 0,1.38071 -1.133279,2.5 -2.53125,2.5 -1.397971,0 -2.53125,-1.11929 -2.53125,-2.5 0,-1.38071 1.133279,-2.5 2.53125,-2.5 1.397971,0 2.53125,1.11929 2.53125,2.5 z" + transform="matrix(1.3955004,0,0,1.2452423,368.18333,-114.72474)" /> + <path + sodipodi:type="arc" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient18146);stroke-width:0.97061968;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path17887" + sodipodi:cx="78" + sodipodi:cy="502" + sodipodi:rx="2.5312502" + sodipodi:ry="2.5" + d="m 80.53125,502 c 0,1.38071 -1.133279,2.5 -2.53125,2.5 -1.397971,0 -2.53125,-1.11929 -2.53125,-2.5 0,-1.38071 1.133279,-2.5 2.53125,-2.5 1.397971,0 2.53125,1.11929 2.53125,2.5 z" + transform="matrix(1.1794014,0,0,0.8999954,384.50686,55.952303)" /> + <path + transform="matrix(1.1827463,0,0,1.2,384.24579,-92.900024)" + d="m 80.53125,502 c 0,1.38071 -1.133279,2.5 -2.53125,2.5 -1.397971,0 -2.53125,-1.11929 -2.53125,-2.5 0,-1.38071 1.133279,-2.5 2.53125,-2.5 1.397971,0 2.53125,1.11929 2.53125,2.5 z" + sodipodi:ry="2.5" + sodipodi:rx="2.5312502" + sodipodi:cy="502" + sodipodi:cx="78" + id="path17889" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#b3b3b3;stroke-width:0.83938956;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + <path + sodipodi:type="arc" + style="fill:none;stroke:url(#linearGradient18149);stroke-width:1.26754272;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path17891" + sodipodi:cx="78" + sodipodi:cy="502" + sodipodi:rx="2.5312502" + sodipodi:ry="2.5" + d="m 80.53125,502 c 0,1.38071 -1.133279,2.5 -2.53125,2.5 -1.397971,0 -2.53125,-1.11929 -2.53125,-2.5 0,-1.38071 1.133279,-2.5 2.53125,-2.5 1.397971,0 2.53125,1.11929 2.53125,2.5 z" + transform="matrix(0.790122,0,0,0.787736,414.87048,114.05649)" /> + <path + sodipodi:type="arc" + style="fill:none;stroke:url(#radialGradient18151);stroke-width:0.67151165;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path17907" + sodipodi:cx="78" + sodipodi:cy="502" + sodipodi:rx="2.5312502" + sodipodi:ry="2.5" + d="m 80.53125,502 c 0,1.38071 -1.133279,2.5 -2.53125,2.5 -1.397971,0 -2.53125,-1.11929 -2.53125,-2.5 0,-1.38071 1.133279,-2.5 2.53125,-2.5 1.397971,0 2.53125,1.11929 2.53125,2.5 z" + transform="matrix(1.1827463,0,0,1.2,384.24579,-92.900024)" /> + <path + transform="matrix(0.8888868,0,0,0.8862026,407.16682,64.626266)" + d="m 80.53125,502 c 0,1.38071 -1.133279,2.5 -2.53125,2.5 -1.397971,0 -2.53125,-1.11929 -2.53125,-2.5 0,-1.38071 1.133279,-2.5 2.53125,-2.5 1.397971,0 2.53125,1.11929 2.53125,2.5 z" + sodipodi:ry="2.5" + sodipodi:rx="2.5312502" + sodipodi:cy="502" + sodipodi:cx="78" + id="path17909" + style="fill:url(#radialGradient18153);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.26754272;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + <path + sodipodi:type="arc" + style="opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.26754272;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path17911" + sodipodi:cx="78" + sodipodi:cy="502" + sodipodi:rx="2.5312502" + sodipodi:ry="2.5" + d="m 80.53125,502 c 0,1.38071 -1.133279,2.5 -2.53125,2.5 -1.397971,0 -2.53125,-1.11929 -2.53125,-2.5 0,-1.38071 1.133279,-2.5 2.53125,-2.5 1.397971,0 2.53125,1.11929 2.53125,2.5 z" + transform="matrix(0.1975308,0,0,0.1999991,460.0926,408.10045)" /> + </g> + <path + sodipodi:type="arc" + style="opacity:0.69999999999999996;fill:url(#linearGradient18220);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.98985862999999996;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path17913-5" + sodipodi:cx="78" + sodipodi:cy="502" + sodipodi:rx="2.5312502" + sodipodi:ry="2.5" + d="m 80.53125,502 a 2.5312502,2.5 0 1 1 -5.0625,0 2.5312502,2.5 0 1 1 5.0625,0 z" + transform="matrix(-0.71872408,0.04983719,-0.0496867,-0.7165537,559.14667,859.50468)" /> + <path + transform="matrix(-0.71872408,0.04983719,-0.0496867,-0.7165537,552.92989,859.50468)" + d="m 80.53125,502 a 2.5312502,2.5 0 1 1 -5.0625,0 2.5312502,2.5 0 1 1 5.0625,0 z" + sodipodi:ry="2.5" + sodipodi:rx="2.5312502" + sodipodi:cy="502" + sodipodi:cx="78" + id="path18197" + style="opacity:0.7;fill:url(#linearGradient18212);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.98985863;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> </g> <g inkscape:groupmode="layer" diff --git a/release/scripts/freestyle/style_modules/parameter_editor.py b/release/scripts/freestyle/style_modules/parameter_editor.py index 6b7f57cbce1..71cfdce43f0 100644 --- a/release/scripts/freestyle/style_modules/parameter_editor.py +++ b/release/scripts/freestyle/style_modules/parameter_editor.py @@ -885,6 +885,9 @@ class FaceMarkBothUP1D(UnaryPredicate1D): if fe.is_smooth: if fe.face_mark: return True + elif (fe.nature & Nature.BORDER): + if fe.face_mark_left: + return True else: if fe.face_mark_right and fe.face_mark_left: return True @@ -898,6 +901,9 @@ class FaceMarkOneUP1D(UnaryPredicate1D): if fe.is_smooth: if fe.face_mark: return True + elif (fe.nature & Nature.BORDER): + if fe.face_mark_left: + return True else: if fe.face_mark_right or fe.face_mark_left: return True diff --git a/release/scripts/modules/bpy_extras/object_utils.py b/release/scripts/modules/bpy_extras/object_utils.py index 9381f49d408..7412d34940f 100644 --- a/release/scripts/modules/bpy_extras/object_utils.py +++ b/release/scripts/modules/bpy_extras/object_utils.py @@ -25,6 +25,7 @@ __all__ = ( "object_add_grid_scale", "object_add_grid_scale_apply_operator", "object_image_guess", + "world_to_camera", ) @@ -265,3 +266,44 @@ def object_image_guess(obj, bm=None): if image is not None: return image return None + + +def world_to_camera(scene, obj, coord): + """ + Returns the 2d camera space coords for a 3d point. + + Where (0, 0) is the bottom left and (1, 1) is the top right of the camera frame. + values outside 0-1 are also supported. + + Takes shift-x/y, lens angle and sensor size into account + as well as perspective/ortho projections. + + :arg scene: Scene to use for frame size. + :type scene: :class:`bpy.types.Scene` + :arg obj: Camera object. + :type obj: :class:`bpy.types.Object` + :arg coord: World space location. + :type coord: :class:`mathutils.Vector` + :return: normalized 2d vector. + :rtype: :class:`mathutils.Vector` + """ + from mathutils import Vector + + co_local = obj.matrix_world.normalized().inverted() * coord + z = -co_local.z + + camera = obj.data + frame = [-v for v in camera.view_frame(scene=scene)[:3]] + if camera.type != 'ORTHO': + if z == 0.0: + return Vector((0.5, 0.5, 0.0)) + else: + frame = [(v / (v.z / z)) for v in frame] + + min_x, max_x = frame[1].x, frame[2].x + min_y, max_y = frame[0].y, frame[1].y + + x = (co_local.x - min_x) / (max_x - min_x) + y = (co_local.y - min_y) / (max_y - min_y) + + return Vector((x, y, z)) diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index 9cd9131ec4b..fd1f538efd3 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -32,30 +32,6 @@ from rna_prop_ui import rna_idprop_ui_prop_get, rna_idprop_ui_prop_clear from bpy.app.translations import pgettext_tip as tip_ -class MESH_OT_delete_edgeloop(Operator): - """Delete an edge loop by merging the faces on each side """ \ - """to a single face loop""" - bl_idname = "mesh.delete_edgeloop" - bl_label = "Delete Edge Loop" - bl_options = {'UNDO', 'REGISTER'} - - @classmethod - def poll(cls, context): - return bpy.ops.transform.edge_slide.poll() - - def execute(self, context): - mesh = context.object.data - use_mirror_x = mesh.use_mirror_x - mesh.use_mirror_x = False - if 'FINISHED' in bpy.ops.transform.edge_slide(value=1.0, correct_uv=True): - bpy.ops.mesh.select_more() - bpy.ops.mesh.remove_doubles() - ret = {'FINISHED'} - else: - ret = {'CANCELLED'} - mesh.use_mirror_x = use_mirror_x - return ret - rna_path_prop = StringProperty( name="Context Attributes", description="RNA context string", diff --git a/release/scripts/startup/bl_ui/properties_freestyle.py b/release/scripts/startup/bl_ui/properties_freestyle.py index 528608790cd..96321eded50 100644 --- a/release/scripts/startup/bl_ui/properties_freestyle.py +++ b/release/scripts/startup/bl_ui/properties_freestyle.py @@ -138,7 +138,8 @@ class RENDERLAYER_PT_freestyle(RenderLayerFreestyleButtonsPanel, Panel): col = split.column() col.prop(freestyle, "use_smoothness") - col.prop(freestyle, "use_material_boundaries") + if freestyle.mode == 'SCRIPT': + col.prop(freestyle, "use_material_boundaries") # Advanced options are hidden by default to warn new users if freestyle.use_advanced_options: diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index c61b07800ca..b8cbd058063 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -2075,13 +2075,11 @@ class VIEW3D_MT_edit_mesh_delete(Menu): layout.separator() - mesh_select_mode = context.tool_settings.mesh_select_mode[:] - if mesh_select_mode[2]: - layout.operator("mesh.dissolve_faces") - elif mesh_select_mode[1]: - layout.operator("mesh.dissolve_edges") - elif mesh_select_mode[0]: - layout.operator("mesh.dissolve_verts") + layout.operator("mesh.dissolve_verts") + layout.operator("mesh.dissolve_edges") + layout.operator("mesh.dissolve_faces") + + layout.separator() layout.operator("mesh.dissolve_limited") |