[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57962] branches/soc-2013-depsgraph_mt: Merging r57954 through r57961 from trunk into soc-2013-depsgraph_mt
Sergey Sharybin
sergey.vfx at gmail.com
Wed Jul 3 14:38:30 CEST 2013
Revision: 57962
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57962
Author: nazgul
Date: 2013-07-03 12:38:30 +0000 (Wed, 03 Jul 2013)
Log Message:
-----------
Merging r57954 through r57961 from trunk into soc-2013-depsgraph_mt
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57954
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57961
Modified Paths:
--------------
branches/soc-2013-depsgraph_mt/release/datafiles/blender_icons.svg
branches/soc-2013-depsgraph_mt/release/datafiles/blender_icons16.png
branches/soc-2013-depsgraph_mt/release/datafiles/blender_icons32.png
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-depsgraph_mt/source/blender/editors/include/ED_mesh.h
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editface.c
branches/soc-2013-depsgraph_mt/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/sculpt_paint/paint_utils.c
Property Changed:
----------------
branches/soc-2013-depsgraph_mt/
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-depsgraph_mt
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-57953
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-57961
Modified: branches/soc-2013-depsgraph_mt/release/datafiles/blender_icons.svg
===================================================================
--- branches/soc-2013-depsgraph_mt/release/datafiles/blender_icons.svg 2013-07-03 12:33:28 UTC (rev 57961)
+++ branches/soc-2013-depsgraph_mt/release/datafiles/blender_icons.svg 2013-07-03 12:38:30 UTC (rev 57962)
@@ -14,7 +14,7 @@
height="640"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.48.3.1 r9886"
+ inkscape:version="0.48.2 r9819"
version="1.0"
sodipodi:docname="blender_icons.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
@@ -26927,6 +26927,129 @@
x2="80.53125"
y2="502"
gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient29761"
+ id="linearGradient28981"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.8422958,0,0,0.8364537,82.535678,2.9394266)"
+ x1="89.975014"
+ y1="-32.339718"
+ x2="88.492455"
+ y2="-33.303608" />
+ <linearGradient
+ id="linearGradient29761">
+ <stop
+ style="stop-color:#b74125;stop-opacity:1;"
+ offset="0"
+ id="stop29763" />
+ <stop
+ style="stop-color:#f9fbff;stop-opacity:1"
+ offset="1"
+ id="stop29765" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient29761"
+ id="linearGradient28983"
+ gradientUnits="userSpaceOnUse"
+ x1="131.02808"
+ y1="123.49161"
+ x2="128.7139"
+ y2="115.97001" />
+ <linearGradient
+ id="linearGradient67970">
+ <stop
+ style="stop-color:#b74125;stop-opacity:1;"
+ offset="0"
+ id="stop67972" />
+ <stop
+ style="stop-color:#f9fbff;stop-opacity:1"
+ offset="1"
+ id="stop67974" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient29761"
+ id="linearGradient28985"
+ gradientUnits="userSpaceOnUse"
+ x1="136.35806"
+ y1="124.27161"
+ x2="130.48389"
+ y2="118" />
+ <linearGradient
+ id="linearGradient67977">
+ <stop
+ style="stop-color:#b74125;stop-opacity:1;"
+ offset="0"
+ id="stop67979" />
+ <stop
+ style="stop-color:#f9fbff;stop-opacity:1"
+ offset="1"
+ id="stop67981" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8864-1"
+ id="linearGradient28987"
+ gradientUnits="userSpaceOnUse"
+ x1="115.15884"
+ y1="88.476723"
+ x2="109.18613"
+ y2="82.308861" />
+ <linearGradient
+ id="linearGradient8864-1">
+ <stop
+ id="stop8866-0"
+ offset="0"
+ style="stop-color:#b43214;stop-opacity:1;" />
+ <stop
+ id="stop8868-1"
+ offset="1"
+ style="stop-color:#e86830;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1610-8-8"
+ id="linearGradient28989"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(21,0)"
+ x1="101"
+ y1="84.25"
+ x2="97.75"
+ y2="81.5" />
+ <linearGradient
+ id="linearGradient1610-8-8">
+ <stop
+ style="stop-color:black;stop-opacity:1;"
+ offset="0"
+ id="stop1611-7-7" />
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="1"
+ id="stop1612-4-6" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient319-77-0"
+ id="linearGradient28991"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(21,0)"
+ x1="87.44548"
+ y1="81.439644"
+ x2="96.592278"
+ y2="89.708977" />
+ <linearGradient
+ id="linearGradient319-77-0">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop320-9-0" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop321-31-9" />
+ </linearGradient>
</defs>
<sodipodi:namedview
id="base"
@@ -86007,6 +86130,116 @@
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
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+ inkscape:export-filename="C:\Documents and Settings\Pracownia\Pulpit\sss.png"
+ transform="translate(102.25002,373)"
+ id="g28949"
+ style="display:inline;enable-background:new">
+ <rect
+ style="opacity:0;fill:#808000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.89999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+ id="rect28951"
+ width="15.999955"
+ height="16"
+ x="155"
+ y="-27" />
+ <g
+ id="g28953"
+ style="opacity:0.6;display:inline;enable-background:new">
+ <path
+ inkscape:connector-curvature="0"
+ id="path28955"
+ d="m 157.5,-26.5 c -1.10457,0 -2,0.895431 -2,2 0,1.104569 0.89543,2 2,2 0.0211,0 0.0415,6.5e-4 0.0625,0 0.005,0.02296 0.0259,0.03977 0.0312,0.0625 -0.63487,0.174633 -1.09375,0.747145 -1.09375,1.4375 0,0.828426 0.67157,1.5 1.5,1.5 0.69036,0 1.26287,-0.45888 1.4375,-1.09375 0.18381,0.04305 0.36556,0.09375 0.5625,0.09375 1.38071,0 2.5,-1.119289 2.5,-2.5 0,-1.380711 -1.11929,-2.5 -2.5,-2.5 -0.25351,0 -0.48817,0.05484 -0.71875,0.125 -0.32553,-0.663426 -0.9924,-1.125 -1.78125,-1.125 l 5e-5,0 z"
+ style="fill:url(#linearGradient28981);fill-opacity:1;fill-rule:nonzero;stroke:#0b1728;stroke-width:1;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:new" />
+ <path
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+ inkscape:export-filename="C:\Documents and Settings\Tata\Pulpit\Kopia blender\.blender\icons\blender's iconset.png"
+ d="m 140,118 c 0,4.41828 -3.58172,8 -8,8 -4.41828,0 -8,-3.58172 -8,-8 0,-4.41828 3.58172,-8 8,-8 4.41828,0 8,3.58172 8,8 z"
+ sodipodi:ry="8"
+ sodipodi:rx="8"
+ sodipodi:cy="118"
+ sodipodi:cx="132"
+ id="path28957"
+ style="fill:url(#linearGradient28983);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;enable-background:new"
+ sodipodi:type="arc"
+ transform="matrix(0,0.1250004,0.1250004,0,143.24995,-37.50005)" />
+ <path
+ transform="matrix(0,0.25,0.2500001,0,130.49998,-56)"
+ sodipodi:type="arc"
+ style="fill:url(#linearGradient28985);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;enable-background:new"
+ id="path28959"
+ sodipodi:cx="132"
+ sodipodi:cy="118"
+ sodipodi:rx="8"
+ sodipodi:ry="8"
+ d="m 140,118 c 0,4.41828 -3.58172,8 -8,8 -4.41828,0 -8,-3.58172 -8,-8 0,-4.41828 3.58172,-8 8,-8 4.41828,0 8,3.58172 8,8 z"
+ inkscape:export-filename="C:\Documents and Settings\Tata\Pulpit\Kopia blender\.blender\icons\blender's iconset.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ </g>
+ <g
+ id="g28961"
+ transform="translate(45,-100)">
+ <path
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cszccccccccz"
+ id="path28963"
+ d="m 110.5,85.5 c 0,2.25 2,3 3.5,3 2.25,0 3.1933,-1.514034 4,-2.5 l 4.5,-5.5 3,0 0,-2 -4,0 -5.5,5.5 -1.25,-1.5 -3.25,0 -1,1 0,2 z"
+ style="fill:#b43214;fill-opacity:1;stroke:none" />
+ <path
+ inkscape:connector-curvature="0"
+ style="fill:url(#linearGradient28987);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 110.5,85.5 c 0,2.25 2,3 3.5,3 2.25,0 3.46788,-1.244422 4.25,-2.25 L 120,84 l -2,-2 -1.5,1.5 -1,0 0,-1 -1,-1 -3,0 -1,1 0,3 z"
+ id="path28965"
+ sodipodi:nodetypes="cszccccccccz" />
+ <path
+ inkscape:connector-curvature="0"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list