[Bf-blender-cvs] [921ee974d89] new-object-types: Merge branch 'master' into new-object-types

[Brecht Van Lommel]

Commit: 921ee974d896b1ab5afa5483b760d86c18ae4b99
Author: Brecht Van Lommel
Date:   Wed Feb 5 10:38:40 2020 +0100
Branches: new-object-types
https://developer.blender.org/rB921ee974d896b1ab5afa5483b760d86c18ae4b99

Merge branch 'master' into new-object-types

===================================================================



===================================================================

diff --cc release/datafiles/blender_icons.svg
index 01183fb3091,ebebc82695a..16d50623fa4
--- a/release/datafiles/blender_icons.svg
+++ b/release/datafiles/blender_icons.svg
@@@ -5348,117 -5435,23 +5435,134 @@@
        <path sodipodi:nodetypes="csssscccccc" inkscape:connector-curvature="0" id="path28911-6" transform="translate(540,1)" d="m 7,654 v 8 c 0,0.54532 0.45468,1 1,1 h 12 c 0.54532,0 1,-0.45468 1,-1 v -8 h -1 v 8 H 8 v -8 z" style="opacity:0.6;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke"/>
        <path sodipodi:nodetypes="ssccccsssccccc" inkscape:connector-curvature="0" style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke" d="m 8,670 c -0.54532,0 -1,0.45468 -1,1 v 3 h 1 12 1 v -3 c 0,-0.54532 -0.45468,-1 -1,-1 z m 0,1 h 2 v 2 H 8 Z" transform="translate(540,-20)" id="path2 [...]
      </g>
 +    <g
 +       style="display:inline;opacity:1;fill:#ffffff;enable-background:new"
 +       id="g7388-6-3"
 +       transform="translate(457.49535,-616.1486)"
 +       inkscape:export-filename="C:\Users\Andrzej Ambroż\Desktop\mtrx.png"
 +       inkscape:export-xdpi="96"
 +       inkscape:export-ydpi="96">
 +      <rect
 +         transform="scale(-1,1)"
 +         style="display:inline;overflow:visible;visibility:visible;opacity:0;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.79999995;marker:none;enable-background:accumulate"
 +         id="rect7384-9-6"
 +         width="16"
 +         height="16"
 +         x="437"
 +         y="710" />
 +      <path
 +         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:no [...]
 +         d="m -447.96289,710.98828 a 1.0001,1.0001 0 0 0 -0.83789,0.41211 c -3.30626,4.40835 -3.18183,10.96743 -3.18555,12.58399 a 1.0001,1.0001 0 1 0 2,0.006 c 0.004,-1.64212 0.0934,-7.79897 2.78711,-11.39062 a 1.0001,1.0001 0 0 0 -0.76367,-1.61133 z m 4.97461,3.00195 a 1.0001,1.0001 0 0 0 -0.69727,0.28125 c -2.25424,2.12239 -3.3739,3.98924 -3.89062,5.64258 C -448.0929,721.56741 -448,722.96385 -448,724 a 1.0001,1.0001 0 1 0 2,0 c 0,-1.13631 -0.0696,-2.20308 0.33203,-3.48828 0.40167,-1. [...]
 +         id="path7133-7-7"
 +         inkscape:connector-curvature="0" />
 +    </g>
 +    <path
 +       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:norm [...]
 +       d="m 30.560537,94.85135 a 0.50005,0.50005 0 0 0 -0.41797,0.20312 c -2.41605,3.180716 -3.44475,6.00321 -3.85742,8.28711 -0.41267,2.2839 -0.21655,4.04989 -0.21875,5.00586 a 0.50005,0.50005 0 1 0 1,0.004 c 0.002,-1.08433 -0.18375,-2.69094 0.20312,-4.83203 0.38687,-2.1411 1.34101,-4.795944 3.66797,-7.85938 a 0.50005,0.50005 0 0 0 -0.37695,-0.80858 z m 4.95508,3.001946 a 0.50005,0.50005 0 0 0 -0.30469,0.12695 c -4.12358,3.585044 -5.17188,7.536354 -5.17188,10.376954 a 0.50005,0.50005 0 [...]
 +       id="path18476-0-2-5"
 +       inkscape:connector-curvature="0" />
 +    <path
 +       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:norm [...]
 +       d="m 52.942267,94.61165 a 0.50005,0.50005 0 0 0 -0.41797,0.20312 c -2.41605,3.180716 -3.44475,6.00321 -3.85743,8.28711 -0.41267,2.2839 -0.21654,4.04989 -0.21875,5.00586 a 0.50005,0.50005 0 1 0 1,0.004 c 0.002,-1.08433 -0.18374,-2.69094 0.20313,-4.83203 0.38687,-2.1411 1.341,-4.795944 3.66797,-7.85938 a 0.50005,0.50005 0 0 0 -0.37695,-0.80858 z m 4.95507,3.00195 a 0.50005,0.50005 0 0 0 -0.30468,0.12695 c -4.12359,3.58504 -5.17188,7.53635 -5.17188,10.37695 a 0.50005,0.50005 0 1 0 1 [...]
 +       id="path18476-0-2-5-3"
 +       inkscape:connector-curvature="0" />
 +    <path
 +       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:norm [...]
 +       d="m 139.512,94.8218 c -0.39468,0.0302 -0.78775,0.12022 -1.16797,0.27148 -1.52086,0.60507 -2.52148,2.07999 -2.52148,3.716796 -7.6e-4,0.0448 0.004,0.0894 0.0156,0.13281 -0.36519,0.0927 -0.72282,0.22834 -1.0586,0.42774 -1.44139,0.855954 -2.17088,2.516884 -1.8789,4.144534 -0.68715,0.57705 -1.10816,1.44799 -1.07617,2.39648 0.0502,1.48769 1.19214,2.71921 2.67187,2.88086 1.39818,0.15274 2.69975,-0.69789 3.15234,-2.00781 0.89605,0.0388 1.7697,-0.22225 2.49805,-0.74609 1.07373,0.85551 2. [...]

@@ Diff output truncated at 10240 characters. @@