[Bf-blender-cvs] [bb81a124590] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object
Antonio Vazquez
noreply at git.blender.org
Tue Dec 19 18:01:24 CET 2017
Commit: bb81a124590528b4bd57916786ee6ab8747b6175
Author: Antonio Vazquez
Date: Tue Dec 19 17:43:29 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rBbb81a124590528b4bd57916786ee6ab8747b6175
Merge branch 'blender2.8' into greasepencil-object
Conflicts:
release/datafiles/blender_icons.svg
release/datafiles/locale
source/blender/depsgraph/intern/depsgraph_tag.cc
source/tools
===================================================================
===================================================================
diff --cc release/datafiles/blender_icons.svg
index 1b524c5b61f,e939758e816..257c7b2949c
--- a/release/datafiles/blender_icons.svg
+++ b/release/datafiles/blender_icons.svg
@@@ -14,9 -14,9 +14,9 @@@
height="640"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
version="1.0"
- sodipodi:docname="blender_icons.svg"
+ sodipodi:docname="blender_icons_new.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
style="display:inline;enable-background:new"
inkscape:export-filename="blender_icons16.png"
@@@ -31754,21 -31538,21 +31584,21 @@@
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10000"
- objecttolerance="10000"
+ gridtolerance="10"
+ guidetolerance="10"
+ objecttolerance="10"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="1.4142136"
- inkscape:cx="383.5469"
- inkscape:cy="395.0103"
+ inkscape:zoom="2.499733"
+ inkscape:cx="368.97199"
+ inkscape:cy="160.72383"
inkscape:document-units="px"
- inkscape:current-layer="layer1"
+ inkscape:current-layer="ICON_LIBRARY_DATA_DIRECT-3"
showgrid="true"
- inkscape:window-width="1680"
- inkscape:window-height="987"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
+ inkscape:window-width="1920"
+ inkscape:window-height="981"
+ inkscape:window-x="0"
+ inkscape:window-y="28"
inkscape:snap-nodes="true"
inkscape:snap-bbox="true"
showguides="true"
@@@ -93070,748 -91220,504 +91266,811 @@@
style="opacity:0.51999996;fill:url(#radialGradient21448-8-143);fill-opacity:1;fill-rule:evenodd;stroke:none" />
</g>
</g>
+ <rect
+ style="display:inline;overflow:visible;visibility:visible;opacity:0;fill:#b3b3b3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.79999995;marker:none;enable-background:accumulate"
+ id="rect37989-8"
+ width="16"
+ height="16"
+ x="445.99872"
+ y="199.04828" />
+ <path
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccc"
+ id="path37498-7"
+ d="m 450.49871,213.54828 h -3 v -3 m 13,0 v 3 h -3 m -0.25,-13 h 3.25 v 3 m -13,0 v -3 h 3"
+ style="display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:2.4000001;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:new" />
+ <path
+ inkscape:connector-curvature="0"
+ style="display:inline;overflow:visible;visibility:visible;fill:none;stroke:url(#linearGradient18199);stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:new"
+ d="m 450.49871,213.54828 h -3 v -3 m 13,0 v 3 h -3 m -0.25,-13 h 3.25 v 3 m -13,0 v -3 h 3"
+ id="rect38140-7"
+ sodipodi:nodetypes="cccccccccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cssccc"
+ d="m 450.16181,203.39561 h 0.89957 c 0.59916,0 1.24671,0.78271 1.50221,1.66844 0.63925,2.216 1.68439,5.89183 3.52945,5.97555 1.60618,0 0.97041,-3.06773 1.90325,-3.15613 h 0.14993"
+ style="display:inline;overflow:visible;visibility:visible;fill:none;stroke:#1a1a1a;stroke-width:2.79900002;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+ id="path39832-9" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path39834-2"
+ style="display:inline;overflow:visible;visibility:visible;fill:none;stroke:#a8df84;stroke-width:1.75999999;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+ d="m 458.39766,207.83936 h -0.28744 c -1.33947,0 0.10775,2.96798 -2.06289,3.05843 -2.6675,0.11116 -3.22208,-7.55146 -4.84372,-7.53379 h -1.19942"
+ sodipodi:nodetypes="ccscc" />
<g
- transform="translate(335.99871,21.048284)"
style="display:inline;enable-background:new"
- id="ICON_ROTATE-7">
+ transform="translate(203.09136,-434.59044)"
+ id="g1418">
+ <path
+ d="m 45.185432,872.62412 a 4.2499995,4.2499995 0 0 1 -2.731847,4.73169"
+ sodipodi:open="true"
+ sodipodi:end="1.2217305"
+ sodipodi:start="6.1086524"
+ sodipodi:ry="4.2499995"
+ sodipodi:rx="4.2499995"
+ sodipodi:cy="873.36212"
+ sodipodi:cx="41"
+ sodipodi:type="arc"
+ id="path1374"
+ style="fill:none;stroke:#4b2f1e;stroke-width:2.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ d="m 39.188267,866.60064 a 7,7 0 0 1 3.623467,0"
+ sodipodi:open="true"
+ sodipodi:end="4.9741884"
+ sodipodi:start="4.4505896"
+ sodipodi:ry="7"
+ sodipodi:rx="7"
+ sodipodi:cy="873.36212"
+ sodipodi:cx="41"
+ sodipodi:type="arc"
+ id="path1376"
+ style="fill:none;stroke:#4b2f1e;stroke-width:2.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ style="fill:none;stroke:#4b2f1e;stroke-width:2.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path1378"
+ sodipodi:type="arc"
+ sodipodi:cx="41"
+ sodipodi:cy="873.36212"
+ sodipodi:rx="6.9999995"
+ sodipodi:ry="6.9999995"
+ sodipodi:start="0.26179939"
+ sodipodi:end="0.78539816"
+ sodipodi:open="true"
+ d="m 47.76148,875.17385 a 6.9999995,6.9999995 0 0 1 -1.811733,3.13802" />
+ <path
+ style="fill:none;stroke:#4b2f1e;stroke-width:2.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path1380"
+ 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 a 4.2499995,4.2499995 0 0 1 -2.731846,-4.73169" />
+ <path
+ d="M 36.050253,878.31187 A 6.9999995,6.9999995 0 0 1 34.23852,875.17385"
+ sodipodi:open="true"
+ sodipodi:end="2.8797933"
+ sodipodi:start="2.3561945"
+ sodipodi:ry="6.9999995"
+ sodipodi:rx="6.9999995"
+ sodipodi:cy="873.36212"
+ sodipodi:cx="41"
+ sodipodi:type="arc"
+ id="path1382"
+ style="fill:none;stroke:#4b2f1e;stroke-width:2.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<rect
- y="178"
- x="110"
- height="16"
- width="16"
- id="rect37989-8"
- style="display:inline;overflow:visible;visibility:visible;opacity:0;fill:#b3b3b3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.79999995;marker:none;enable-background:accumulate" />
+ style="fill:#4b2f1e;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="rect1384"
+ width="5.5000005"
+ height="5.5"
+ x="38.25"
+ y="870.61212"
+ rx="2.75"
+ ry="2.75" />
+ <rect
+ ry="0"
+ rx="0"
+ y="862.36212"
+ x="31"
+ height="20"
+ width="20"
+ id="rect1386"
+ style="fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:none" />
+ <rect
+ ry="2"
+ rx="2"
+ y="871.36212"
+ x="39"
+ height="4"
+ width="4.0000005"
+ id="rect1388"
+ style="fill:#ff7d1f;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+ <rect
+ style="fill:none;stroke:url(#radialGradient29130);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect1390"
+ width="3.0000007"
+ height="3"
+ x="39.5"
+ y="871.86212"
+ rx="1.5000004"
+ ry="1.5" />
<path
- style="display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:2.4000001;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:new"
- d="m 114.5,192.5 h -3 v -3 m 13,0 v 3 h -3 m -0.25,-13 h 3.25 v 3 m -13,0 v -3 h 3"
- id="path37498-7"
- sodipodi:nodetypes="cccccccccccc"
- inkscape:connector-curvature="0" />
+ d="m 39.546414,877.35581 a 4.2499995,4.2499995 0 0 1 -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="path1392"
+ style="fill:none;stroke:#ffb36b;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<path
- sodipodi:nodetypes="cccccccccccc"
- id="rect38140-7"
- d="m 114.5,192.5 h -3 v -3 m 13,0 v 3 h -3 m -0.25,-13 h 3.25 v 3 m -13,0 v -3 h 3"
- style="display:inline;overflow:visible;visibility:visible;fill:none;stroke:url(#linearGradient18199);stroke-width:1;st
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list