Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'release')
-rw-r--r--release/datafiles/blender_icons.svg327
-rw-r--r--release/datafiles/blender_icons16/icon16_mouse_drag.datbin1048 -> 1048 bytes
-rw-r--r--release/datafiles/blender_icons16/icon16_mouse_lmb.datbin1048 -> 1048 bytes
-rw-r--r--release/datafiles/blender_icons16/icon16_mouse_lmb_drag.datbin0 -> 1048 bytes
-rw-r--r--release/datafiles/blender_icons16/icon16_mouse_mmb.datbin1048 -> 1048 bytes
-rw-r--r--release/datafiles/blender_icons16/icon16_mouse_mmb_drag.datbin0 -> 1048 bytes
-rw-r--r--release/datafiles/blender_icons16/icon16_mouse_move.datbin0 -> 1048 bytes
-rw-r--r--release/datafiles/blender_icons16/icon16_mouse_rmb.datbin1048 -> 1048 bytes
-rw-r--r--release/datafiles/blender_icons16/icon16_mouse_rmb_drag.datbin0 -> 1048 bytes
-rw-r--r--release/datafiles/blender_icons32/icon32_mouse_drag.datbin4120 -> 4120 bytes
-rw-r--r--release/datafiles/blender_icons32/icon32_mouse_lmb.datbin4120 -> 4120 bytes
-rw-r--r--release/datafiles/blender_icons32/icon32_mouse_lmb_drag.datbin0 -> 4120 bytes
-rw-r--r--release/datafiles/blender_icons32/icon32_mouse_mmb.datbin4120 -> 4120 bytes
-rw-r--r--release/datafiles/blender_icons32/icon32_mouse_mmb_drag.datbin0 -> 4120 bytes
-rw-r--r--release/datafiles/blender_icons32/icon32_mouse_move.datbin0 -> 4120 bytes
-rw-r--r--release/datafiles/blender_icons32/icon32_mouse_rmb.datbin4120 -> 4120 bytes
-rw-r--r--release/datafiles/blender_icons32/icon32_mouse_rmb_drag.datbin0 -> 4120 bytes
-rw-r--r--release/datafiles/userdef/userdef_default_theme.c40
-rw-r--r--release/scripts/startup/bl_operators/screen_play_rendered_anim.py45
-rw-r--r--release/scripts/startup/bl_ui/properties_data_camera.py2
-rw-r--r--release/scripts/startup/bl_ui/properties_object.py10
-rw-r--r--release/scripts/startup/bl_ui/properties_physics_field.py4
-rw-r--r--release/scripts/startup/bl_ui/space_dopesheet.py2
-rw-r--r--release/scripts/startup/bl_ui/space_topbar.py42
-rw-r--r--release/scripts/startup/bl_ui/space_view3d.py4
25 files changed, 377 insertions, 99 deletions
diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg
index fe4e2015e79..c190fa4dd2a 100644
--- a/release/datafiles/blender_icons.svg
+++ b/release/datafiles/blender_icons.svg
@@ -92369,7 +92369,7 @@
sodipodi:nodetypes="ccccc"
id="path9152-7-3"
d="M 46.49945,103.49527 V 92.492523 l 10.996287,2.228527 v 6.75793 z"
- style="fill:none;stroke:url(#linearGradient15188);stroke-width:1.0000248px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"/>
+ style="fill:none;stroke:url(#linearGradient15188);stroke-width:1.0000248px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
<path
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
@@ -92898,7 +92898,145 @@
inkscape:connector-curvature="0" />
</g>
<g
- transform="translate(-564,-55.99997)"
+ style="display:inline;enable-background:new"
+ id="g8189"
+ transform="translate(-647.84611,-56.087322)">
+ <rect
+ transform="scale(-1,1)"
+ y="506.99997"
+ x="-669"
+ height="15.999999"
+ width="15.999999"
+ id="rect8179"
+ style="opacity:0;vector-effect:none;fill:#d40000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+ <path
+ sodipodi:nodetypes="cssssssc"
+ inkscape:connector-curvature="0"
+ id="path8183"
+ d="m -655.5,513.49997 v 6.0165 c 0,1.65287 -1.33066,2.98353 -2.98353,2.98353 h -4.03294 c -1.65287,0 -2.98353,-1.33066 -2.98353,-2.98353 v -9.03297 c 0,-1.65287 1.33066,-2.98353 2.98353,-2.98353 H -658.5"
+ style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+ transform="scale(-1,1)" />
+ <g
+ transform="translate(-20)"
+ id="g8185" />
+ <path
+ sodipodi:nodetypes="csssccc"
+ inkscape:connector-curvature="0"
+ id="path8187"
+ d="m 659.5,507.49997 h -1.0165 c -0.64696,0 -1.24455,0.20387 -1.73231,0.55112 -0.75838,0.53993 -1.25122,1.4265 -1.25122,2.43241 v 3.01647 l 4.00824,0.008 z"
+ style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:new" />
+ </g>
+ <g
+ style="display:inline;enable-background:new"
+ id="g8210"
+ transform="translate(-646.84611,-35.087322)">
+ <rect
+ y="485.99997"
+ x="673"
+ height="15.999999"
+ width="15.999999"
+ id="rect8201"
+ style="opacity:0;vector-effect:none;fill:#d40000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+ <rect
+ ry="2.9835341"
+ rx="2.9835341"
+ y="486.5"
+ x="675.5"
+ height="14.999969"
+ width="10"
+ id="rect8203"
+ style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+ <rect
+ style="opacity:1;vector-effect:none;fill:#f9f9f9;fill-opacity:1;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+ id="rect8205"
+ width="2"
+ height="5.0000005"
+ x="679.5"
+ y="489.49997"
+ rx="0.546875"
+ ry="0.546875" />
+ <g
+ id="g8208"
+ transform="translate(0,-21)" />
+ </g>
+ <g
+ transform="matrix(-1,0,0,1,715.15389,-56.087322)"
+ id="g8275"
+ style="display:inline;enable-background:new">
+ <rect
+ style="opacity:0;vector-effect:none;fill:#d40000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+ id="rect8264"
+ width="15.999999"
+ height="15.999999"
+ x="-669"
+ y="506.99997"
+ transform="scale(-1,1)" />
+ <path
+ transform="scale(-1,1)"
+ style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+ d="m -655.5,513.49997 v 6.0165 c 0,1.65287 -1.33066,2.98353 -2.98353,2.98353 h -4.03294 c -1.65287,0 -2.98353,-1.33066 -2.98353,-2.98353 v -9.03297 c 0,-1.65287 1.33066,-2.98353 2.98353,-2.98353 H -658.5"
+ id="path8267"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cssssssc" />
+ <g
+ id="g8270"
+ transform="translate(-20)" />
+ <path
+ style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:new"
+ d="m 659.5,507.49997 h -1.0165 c -0.64696,0 -1.24455,0.20387 -1.73231,0.55112 -0.75838,0.53993 -1.25122,1.4265 -1.25122,2.43241 v 3.01647 l 4.00824,0.008 z"
+ id="path8273"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="csssccc" />
+ </g>
+ <g
+ style="display:inline;enable-background:new"
+ id="g8244"
+ transform="translate(-416.84613,479.91244)">
+ <g
+ id="g8231">
+ <path
+ sodipodi:nodetypes="cssssssc"
+ inkscape:connector-curvature="0"
+ id="path8225"
+ d="m 489.50002,-13.49979 h -0.93752 c -1.69663,0 -3.0625,-1.36588 -3.0625,-3.0625 v -8.875 c 0,-1.69662 1.36587,-3.0625 3.0625,-3.0625 h 3.875 c 1.69662,0 3.0625,1.36588 3.0625,3.0625 v 7.9375"
+ style="opacity:0.6;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+ <g
+ id="g8229"
+ transform="translate(-190,-535.99976)"
+ style="opacity:1">
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ d="m 680.5,513.49997 -0.01,-4.03235"
+ style="opacity:0.6;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+ id="path8227" />
+ </g>
+ </g>
+ <g
+ transform="matrix(0,1,1,0,516.49726,-513.49725)"
+ id="g8242">
+ <path
+ style="display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:new"
+ d="m 497.99746,-15.99726 0.005,-9.961189"
+ id="path8233"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+ d="m 500.00251,-24.00231 -2,-2 -2,2"
+ id="path8238"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccc" />
+ <path
+ sodipodi:nodetypes="ccc"
+ inkscape:connector-curvature="0"
+ id="path8240"
+ d="m 500.00251,-17.997239 -2,2 -2,-2"
+ style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+ </g>
+ </g>
+ <g
+ transform="translate(-565.88191,-56.028557)"
id="g10320"
style="display:inline;enable-background:new">
<rect
@@ -92912,7 +93050,7 @@
<path
transform="scale(-1,1)"
style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
- d="m -655.5,515.49997 v 4.0165 c 0,1.65287 -1.33066,2.98353 -2.98353,2.98353 h -4.03294 c -1.65287,0 -2.98353,-1.33066 -2.98353,-2.98353 v -9.03297 c 0,-1.65287 1.33066,-2.98353 2.98353,-2.98353 H -660.5"
+ d="m -655.5,515.49997 v 4.0165 c 0,1.65287 -1.33066,2.98353 -2.98353,2.98353 h -4.03294 c -1.65287,0 -2.98353,-1.33066 -2.98353,-2.98353 v -9.03297 c 0,-1.65287 1.33066,-2.98353 2.98353,-2.98353 H -661.5"
id="rect10312"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cssssssc" />
@@ -92921,14 +93059,15 @@
transform="translate(-20)" />
<path
style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:new"
- d="m 658.5,507.49997 h -0.0165 c -1.65287,0 -2.98353,1.33066 -2.98353,2.98353 v 3.01647 l 3.00824,0.008 z"
+ d="m 659.5,507.49997 h -1.0165 c -0.64696,0 -1.24455,0.20387 -1.73231,0.55112 -0.75838,0.53993 -1.25122,1.4265 -1.25122,2.43241 v 3.01647 l 4.00824,0.008 -0.008,-5.97178 z"
id="rect10312-0"
inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssccc" />
+ sodipodi:nodetypes="cssscccc" />
</g>
<g
style="display:inline;enable-background:new"
- id="g10350">
+ id="g10350"
+ transform="translate(0.11808428,-0.02858689)">
<rect
y="451.5"
x="152.5"
@@ -92940,55 +93079,58 @@
ry="3.0625" />
<g
id="g10338"
- transform="translate(-523,-55.999969)">
+ transform="translate(-523,-55.999969)" />
+ <g
+ id="g8140">
+ <path
+ style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+ d="M 165.5,459.5 V 454"
+ id="path10340"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;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"
+ id="path10342"
+ sodipodi:type="arc"
+ sodipodi:cx="156.12387"
+ sodipodi:cy="454"
+ sodipodi:rx="9.3798456"
+ sodipodi:ry="5.5"
+ sodipodi:start="5.8166094"
+ sodipodi:end="0"
+ d="M 164.50114,451.52593 A 9.3798456,5.5 0 0 1 165.50372,454"
+ sodipodi:open="true" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
+ id="path10344"
+ d="m 167.50001,457.60147 v -4.05761"
+ style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+ </g>
+ <g
+ id="g8200">
+ <path
+ id="path10336"
+ style="display:inline;opacity:0.6;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:new"
d="m 680.5,513.49997 -0.01,-4.03235"
- style="opacity:0.6;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
- id="path10336" />
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc"
+ transform="translate(-523,-55.99997)" />
+ <rect
+ y="451.5"
+ x="152.5"
+ height="15"
+ width="10"
+ id="rect8195"
+ style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+ rx="3.0625"
+ ry="3.0625" />
</g>
- <path
- sodipodi:nodetypes="cc"
- inkscape:connector-curvature="0"
- id="path10340"
- d="M 165.5,459.5 V 455"
- style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
- <path
- sodipodi:open="true"
- d="M 164.50114,451.52593 A 9.3798456,5.5 0 0 1 165.50372,454"
- sodipodi:end="0"
- sodipodi:start="5.8166094"
- sodipodi:ry="5.5"
- sodipodi:rx="9.3798456"
- sodipodi:cy="454"
- sodipodi:cx="156.12387"
- sodipodi:type="arc"
- id="path10342"
- style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;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
- style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
- d="m 167.50001,457.60147 v -4.05761"
- id="path10344"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc" />
- <path
- style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
- d="M 165.5,459.5 V 454"
- id="path10346"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc" />
- <path
- sodipodi:nodetypes="cc"
- inkscape:connector-curvature="0"
- id="path10348"
- d="m 167.50001,457.60147 v -4.05761"
- style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
</g>
<g
style="display:inline;enable-background:new"
id="g10432"
- transform="translate(-522,-55.99997)">
+ transform="translate(-523.88191,-56.028557)">
<rect
transform="scale(-1,1)"
y="506.99997"
@@ -93001,7 +93143,7 @@
sodipodi:nodetypes="cssssssc"
inkscape:connector-curvature="0"
id="path10426"
- d="m 665.49995,515.49997 v 4.0165 c 0,1.65287 -1.33066,2.98353 -2.98353,2.98353 h -4.03294 c -1.65287,0 -2.98353,-1.33066 -2.98353,-2.98353 v -9.03297 c 0,-1.65287 1.33066,-2.98353 2.98353,-2.98353 h 2.01647"
+ d="m 665.49995,515.49997 v 4.0165 c 0,1.65287 -1.33066,2.98353 -2.98353,2.98353 h -4.03294 c -1.65287,0 -2.98353,-1.33066 -2.98353,-2.98353 v -9.03297 c 0,-1.65287 1.33066,-2.98353 2.98353,-2.98353 h 1.01647"
style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
<g
transform="translate(-20)"
@@ -93010,11 +93152,11 @@
sodipodi:nodetypes="cssccc"
inkscape:connector-curvature="0"
id="path10430"
- d="m 662.49995,507.49997 h 0.0165 c 1.65287,0 2.98353,1.33066 2.98353,2.98353 v 3.01647 l -3.00824,0.008 z"
+ d="m 661.49995,507.49997 h 1.0165 c 1.65287,0 2.98353,1.33066 2.98353,2.98353 v 3.01647 l -4.00824,0.008 z"
style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:new" />
</g>
<g
- transform="translate(-563,-34.99997)"
+ transform="translate(-564.88191,-35.028557)"
id="g10308-9"
style="display:inline;enable-background:new">
<rect
@@ -93046,6 +93188,93 @@
transform="translate(0,-21)"
id="g10306-4" />
</g>
+ <g
+ transform="translate(-62.825225,-0.25534436)"
+ style="display:inline;enable-background:new"
+ id="g8140-4">
+ <path
+ style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+ d="M 165.5,459.5 V 454"
+ id="path10340-6"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;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"
+ id="path10342-2"
+ sodipodi:type="arc"
+ sodipodi:cx="156.12387"
+ sodipodi:cy="454"
+ sodipodi:rx="9.3798456"
+ sodipodi:ry="5.5"
+ sodipodi:start="5.8166094"
+ sodipodi:end="0"
+ d="M 164.50114,451.52593 A 9.3798456,5.5 0 0 1 165.50372,454"
+ sodipodi:open="true" />
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ id="path10344-4"
+ d="m 167.50001,457.60147 v -4.05761"
+ style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+ </g>
+ <g
+ id="g8181"
+ style="display:inline;enable-background:new"
+ transform="translate(-41.825225,-0.25534436)">
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ id="path8170"
+ d="M 165.5,459.5 V 454"
+ style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+ <path
+ sodipodi:open="true"
+ d="M 164.50114,451.52593 A 9.3798456,5.5 0 0 1 165.50372,454"
+ sodipodi:end="0"
+ sodipodi:start="5.8166094"
+ sodipodi:ry="5.5"
+ sodipodi:rx="9.3798456"
+ sodipodi:cy="454"
+ sodipodi:cx="156.12387"
+ sodipodi:type="arc"
+ id="path8175"
+ style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;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
+ style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+ d="m 167.50001,457.60147 v -4.05761"
+ id="path8178"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ </g>
+ <g
+ transform="translate(-20.825225,-0.25534436)"
+ style="display:inline;enable-background:new"
+ id="g8193">
+ <path
+ style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+ d="M 165.5,459.5 V 454"
+ id="path8185"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;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"
+ id="path8189"
+ sodipodi:type="arc"
+ sodipodi:cx="156.12387"
+ sodipodi:cy="454"
+ sodipodi:rx="9.3798456"
+ sodipodi:ry="5.5"
+ sodipodi:start="5.8166094"
+ sodipodi:end="0"
+ d="M 164.50114,451.52593 A 9.3798456,5.5 0 0 1 165.50372,454"
+ sodipodi:open="true" />
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ id="path8191"
+ d="m 167.50001,457.60147 v -4.05761"
+ style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+ </g>
</g>
<g
inkscape:groupmode="layer"
diff --git a/release/datafiles/blender_icons16/icon16_mouse_drag.dat b/release/datafiles/blender_icons16/icon16_mouse_drag.dat
index 751421684b1..f925ef9e155 100644
--- a/release/datafiles/blender_icons16/icon16_mouse_drag.dat
+++ b/release/datafiles/blender_icons16/icon16_mouse_drag.dat
Binary files differ
diff --git a/release/datafiles/blender_icons16/icon16_mouse_lmb.dat b/release/datafiles/blender_icons16/icon16_mouse_lmb.dat
index 2a0c42f4a6a..df004fd17fb 100644
--- a/release/datafiles/blender_icons16/icon16_mouse_lmb.dat
+++ b/release/datafiles/blender_icons16/icon16_mouse_lmb.dat
Binary files differ
diff --git a/release/datafiles/blender_icons16/icon16_mouse_lmb_drag.dat b/release/datafiles/blender_icons16/icon16_mouse_lmb_drag.dat
new file mode 100644
index 00000000000..40145ffb326
--- /dev/null
+++ b/release/datafiles/blender_icons16/icon16_mouse_lmb_drag.dat
Binary files differ
diff --git a/release/datafiles/blender_icons16/icon16_mouse_mmb.dat b/release/datafiles/blender_icons16/icon16_mouse_mmb.dat
index 300f6be4ee3..63a172d7a53 100644
--- a/release/datafiles/blender_icons16/icon16_mouse_mmb.dat
+++ b/release/datafiles/blender_icons16/icon16_mouse_mmb.dat
Binary files differ
diff --git a/release/datafiles/blender_icons16/icon16_mouse_mmb_drag.dat b/release/datafiles/blender_icons16/icon16_mouse_mmb_drag.dat
new file mode 100644
index 00000000000..6684b18d83b
--- /dev/null
+++ b/release/datafiles/blender_icons16/icon16_mouse_mmb_drag.dat
Binary files differ
diff --git a/release/datafiles/blender_icons16/icon16_mouse_move.dat b/release/datafiles/blender_icons16/icon16_mouse_move.dat
new file mode 100644
index 00000000000..e9a65e45f2d
--- /dev/null
+++ b/release/datafiles/blender_icons16/icon16_mouse_move.dat
Binary files differ
diff --git a/release/datafiles/blender_icons16/icon16_mouse_rmb.dat b/release/datafiles/blender_icons16/icon16_mouse_rmb.dat
index 3f13b167eff..af1a76cb54b 100644
--- a/release/datafiles/blender_icons16/icon16_mouse_rmb.dat
+++ b/release/datafiles/blender_icons16/icon16_mouse_rmb.dat
Binary files differ
diff --git a/release/datafiles/blender_icons16/icon16_mouse_rmb_drag.dat b/release/datafiles/blender_icons16/icon16_mouse_rmb_drag.dat
new file mode 100644
index 00000000000..1e8051ee667
--- /dev/null
+++ b/release/datafiles/blender_icons16/icon16_mouse_rmb_drag.dat
Binary files differ
diff --git a/release/datafiles/blender_icons32/icon32_mouse_drag.dat b/release/datafiles/blender_icons32/icon32_mouse_drag.dat
index 96d3e23181c..ef137d3b2ae 100644
--- a/release/datafiles/blender_icons32/icon32_mouse_drag.dat
+++ b/release/datafiles/blender_icons32/icon32_mouse_drag.dat
Binary files differ
diff --git a/release/datafiles/blender_icons32/icon32_mouse_lmb.dat b/release/datafiles/blender_icons32/icon32_mouse_lmb.dat
index 5cb01a4199b..26b78f7e485 100644
--- a/release/datafiles/blender_icons32/icon32_mouse_lmb.dat
+++ b/release/datafiles/blender_icons32/icon32_mouse_lmb.dat
Binary files differ
diff --git a/release/datafiles/blender_icons32/icon32_mouse_lmb_drag.dat b/release/datafiles/blender_icons32/icon32_mouse_lmb_drag.dat
new file mode 100644
index 00000000000..f5d3cab77f5
--- /dev/null
+++ b/release/datafiles/blender_icons32/icon32_mouse_lmb_drag.dat
Binary files differ
diff --git a/release/datafiles/blender_icons32/icon32_mouse_mmb.dat b/release/datafiles/blender_icons32/icon32_mouse_mmb.dat
index 2c0bc4e1873..d9f6312ac0a 100644
--- a/release/datafiles/blender_icons32/icon32_mouse_mmb.dat
+++ b/release/datafiles/blender_icons32/icon32_mouse_mmb.dat
Binary files differ
diff --git a/release/datafiles/blender_icons32/icon32_mouse_mmb_drag.dat b/release/datafiles/blender_icons32/icon32_mouse_mmb_drag.dat
new file mode 100644
index 00000000000..1f33c3e769e
--- /dev/null
+++ b/release/datafiles/blender_icons32/icon32_mouse_mmb_drag.dat
Binary files differ
diff --git a/release/datafiles/blender_icons32/icon32_mouse_move.dat b/release/datafiles/blender_icons32/icon32_mouse_move.dat
new file mode 100644
index 00000000000..f5832a9e902
--- /dev/null
+++ b/release/datafiles/blender_icons32/icon32_mouse_move.dat
Binary files differ
diff --git a/release/datafiles/blender_icons32/icon32_mouse_rmb.dat b/release/datafiles/blender_icons32/icon32_mouse_rmb.dat
index 3e8bf43d306..3e5921e15eb 100644
--- a/release/datafiles/blender_icons32/icon32_mouse_rmb.dat
+++ b/release/datafiles/blender_icons32/icon32_mouse_rmb.dat
Binary files differ
diff --git a/release/datafiles/blender_icons32/icon32_mouse_rmb_drag.dat b/release/datafiles/blender_icons32/icon32_mouse_rmb_drag.dat
new file mode 100644
index 00000000000..ca250715757
--- /dev/null
+++ b/release/datafiles/blender_icons32/icon32_mouse_rmb_drag.dat
Binary files differ
diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index 4506d23b49d..76023edca50 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -20,7 +20,7 @@ const bTheme U_theme_default = {
.name = "Default",
.tui = {
.wcol_regular = {
- .outline = RGBA(0x38393e00),
+ .outline = RGBA(0x38393eff),
.inner = RGBA(0x505158ff),
.inner_sel = RGBA(0x80858aff),
.item = RGBA(0x38393eff),
@@ -30,7 +30,7 @@ const bTheme U_theme_default = {
.roundness = 0.2f,
},
.wcol_tool = {
- .outline = RGBA(0x2f2f3400),
+ .outline = RGBA(0x2f2f34ff),
.inner = RGBA(0x505158ff),
.inner_sel = RGBA(0x2f2f34ff),
.item = RGBA(0xe6ebffff),
@@ -40,7 +40,7 @@ const bTheme U_theme_default = {
.roundness = 0.2f,
},
.wcol_toolbar_item = {
- .outline = RGBA(0x19191900),
+ .outline = RGBA(0x191919ff),
.inner = RGBA(0x505158ff),
.inner_sel = RGBA(0x2d2d33ff),
.item = RGBA(0x191919ff),
@@ -49,7 +49,7 @@ const bTheme U_theme_default = {
.roundness = 0.25f,
},
.wcol_text = {
- .outline = RGBA(0x43454d00),
+ .outline = RGBA(0x43454dff),
.inner = RGBA(0x2d2e33ff),
.inner_sel = RGBA(0x717280ff),
.item = RGBA(0x599eb3ff),
@@ -60,7 +60,7 @@ const bTheme U_theme_default = {
.roundness = 0.2f,
},
.wcol_radio = {
- .outline = RGBA(0x42435200),
+ .outline = RGBA(0x424352ff),
.inner = RGBA(0x505158ff),
.inner_sel = RGBA(0x2d2d33ff),
.item = RGBA(0xffffffff),
@@ -71,7 +71,7 @@ const bTheme U_theme_default = {
.roundness = 0.2f,
},
.wcol_option = {
- .outline = RGBA(0x42435200),
+ .outline = RGBA(0x424352ff),
.inner = RGBA(0x5c5c66cc),
.inner_sel = RGBA(0x70707cff),
.item = RGBA(0xffffffff),
@@ -81,7 +81,7 @@ const bTheme U_theme_default = {
.roundness = 0.25f,
},
.wcol_toggle = {
- .outline = RGBA(0x43434d00),
+ .outline = RGBA(0x43434dff),
.inner = RGBA(0x595966ff),
.inner_sel = RGBA(0x3f7d80ff),
.item = RGBA(0x191919ff),
@@ -90,7 +90,7 @@ const bTheme U_theme_default = {
.roundness = 0.25f,
},
.wcol_num = {
- .outline = RGBA(0x46464d00),
+ .outline = RGBA(0x46464dff),
.inner = RGBA(0x505158ff),
.inner_sel = RGBA(0x3f7780ff),
.item = RGBA(0x46464dff),
@@ -100,7 +100,7 @@ const bTheme U_theme_default = {
.roundness = 0.3f,
},
.wcol_numslider = {
- .outline = RGBA(0x46464d00),
+ .outline = RGBA(0x46464dff),
.inner = RGBA(0x3f3f47ff),
.inner_sel = RGBA(0x3f7780ff),
.item = RGBA(0x505158ff),
@@ -111,7 +111,7 @@ const bTheme U_theme_default = {
.roundness = 0.4f,
},
.wcol_tab = {
- .outline = RGBA(0x28292d00),
+ .outline = RGBA(0x28292dff),
.inner = RGBA(0x323239ff),
.inner_sel = RGBA(0x43444bff),
.item = RGBA(0x28292dff),
@@ -120,7 +120,7 @@ const bTheme U_theme_default = {
.roundness = 0.15f,
},
.wcol_menu = {
- .outline = RGBA(0x43454d00),
+ .outline = RGBA(0x43454dff),
.inner = RGBA(0x29282eff),
.inner_sel = RGBA(0x505158ff),
.item = RGBA(0xe6e6e6ff),
@@ -131,7 +131,7 @@ const bTheme U_theme_default = {
.roundness = 0.2f,
},
.wcol_pulldown = {
- .outline = RGBA(0x43454d00),
+ .outline = RGBA(0x43454dff),
.inner = RGBA(0x29282e99),
.inner_sel = RGBA(0x505158ff),
.item = RGBA(0x696a72ff),
@@ -142,7 +142,7 @@ const bTheme U_theme_default = {
.roundness = 0.2f,
},
.wcol_menu_back = {
- .outline = RGBA(0x29282e00),
+ .outline = RGBA(0x29282eff),
.inner = RGBA(0x1f1f1fef),
.inner_sel = RGBA(0x505158ff),
.item = RGBA(0x696a72ff),
@@ -161,7 +161,7 @@ const bTheme U_theme_default = {
.roundness = 0.25f,
},
.wcol_tooltip = {
- .outline = RGBA(0x2f303500),
+ .outline = RGBA(0x2f3035ff),
.inner = RGBA(0x19191aef),
.inner_sel = RGBA(0x19191aef),
.item = RGBA(0x19191aef),
@@ -172,7 +172,7 @@ const bTheme U_theme_default = {
.roundness = 0.25f,
},
.wcol_box = {
- .outline = RGBA(0x2d2e3300),
+ .outline = RGBA(0x2d2e33ff),
.inner = RGBA(0x43454dff),
.inner_sel = RGBA(0x3f7780ff),
.item = RGBA(0x191919ff),
@@ -181,7 +181,7 @@ const bTheme U_theme_default = {
.roundness = 0.2f,
},
.wcol_scroll = {
- .outline = RGBA(0x2f303500),
+ .outline = RGBA(0x2f3035ff),
.inner = RGBA(0x585a6700),
.inner_sel = RGBA(0x599eb3ff),
.item = RGBA(0x585a67ff),
@@ -192,7 +192,7 @@ const bTheme U_theme_default = {
.roundness = 0.5f,
},
.wcol_progress = {
- .outline = RGBA(0xb3b3b300),
+ .outline = RGBA(0xb3b3b3ff),
.inner = RGBA(0xccccccff),
.inner_sel = RGBA(0x646464b4),
.item = RGBA(0x599eb3ff),
@@ -201,7 +201,7 @@ const bTheme U_theme_default = {
.roundness = 0.25f,
},
.wcol_list_item = {
- .outline = RGBA(0x28292d00),
+ .outline = RGBA(0x28292dff),
.inner = RGBA(0x28292d00),
.inner_sel = RGBA(0x5f616fff),
.item = RGBA(0x599eb3ff),
@@ -210,7 +210,7 @@ const bTheme U_theme_default = {
.roundness = 0.2f,
},
.wcol_pie_menu = {
- .outline = RGBA(0x29282e00),
+ .outline = RGBA(0x29282eff),
.inner = RGBA(0x29282eff),
.inner_sel = RGBA(0x505158ff),
.item = RGBA(0x696a72ff),
@@ -221,7 +221,7 @@ const bTheme U_theme_default = {
.roundness = 0.5f,
},
.wcol_state = {
- .inner_anim = RGBA(0x73be4c00),
+ .inner_anim = RGBA(0x73be4cff),
.inner_anim_sel = RGBA(0x5aa633ff),
.inner_key = RGBA(0xf0eb64ff),
.inner_key_sel = RGBA(0xd7d34bff),
diff --git a/release/scripts/startup/bl_operators/screen_play_rendered_anim.py b/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
index 8e95d2b9ac1..46cf07be0f5 100644
--- a/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
+++ b/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
@@ -75,10 +75,12 @@ class PlayRenderedAnim(Operator):
def execute(self, context):
import subprocess
+ from shlex import quote
scene = context.scene
rd = scene.render
prefs = context.user_preferences
+ fps_final = rd.fps / rd.fps_base
preset = prefs.filepaths.animation_player_preset
player_path = prefs.filepaths.animation_player
@@ -112,7 +114,7 @@ class PlayRenderedAnim(Operator):
file = rd.frame_path(frame=scene.frame_start, preview=scene.use_preview_range)
file = bpy.path.abspath(file) # expand '//'
if not os.path.exists(file):
- self.report({'WARNING'}, "File %r not found" % file)
+ self.report({'WARNING'}, f"File {file!r} not found")
path_valid = False
# one last try for full range if we used preview range
@@ -120,7 +122,7 @@ class PlayRenderedAnim(Operator):
file = rd.frame_path(frame=scene.frame_start, preview=False)
file = bpy.path.abspath(file) # expand '//'
if not os.path.exists(file):
- self.report({'WARNING'}, "File %r not found" % file)
+ self.report({'WARNING'}, f"File {file!r} not found")
cmd = [player_path]
# extra options, fps controls etc.
@@ -131,31 +133,34 @@ class PlayRenderedAnim(Operator):
frame_start = scene.frame_start
frame_end = scene.frame_end
if preset == 'INTERNAL':
- opts = ["-a",
- "-f", str(rd.fps), str(rd.fps_base),
- "-s", str(frame_start),
- "-e", str(frame_end),
- "-j", str(scene.frame_step),
- file]
+ opts = [
+ "-a",
+ "-f", str(rd.fps), str(rd.fps_base),
+ "-s", str(frame_start),
+ "-e", str(frame_end),
+ "-j", str(scene.frame_step),
+ file,
+ ]
cmd.extend(opts)
elif preset == 'DJV':
- opts = [file, "-playback_speed", "%d" % int(rd.fps / rd.fps_base)]
+ opts = [file, "-playback_speed", str(int(fps_final))]
cmd.extend(opts)
elif preset == 'FRAMECYCLER':
- opts = [file, "%d-%d" % (scene.frame_start, scene.frame_end)]
+ opts = [file, f"{scene.frame_start:d}-{scene.frame_end:d}"]
cmd.extend(opts)
elif preset == 'RV':
- opts = ["-fps", str(rd.fps), "-play", "[ %s ]" % file]
+ opts = ["-fps", str(rd.fps), "-play", f"[ {file} ]"]
cmd.extend(opts)
elif preset == 'MPLAYER':
opts = []
if is_movie:
opts.append(file)
else:
- opts += [("mf://%s" % file.replace("#", "?")),
- "-mf",
- "fps=%.4f" % (rd.fps / rd.fps_base),
- ]
+ opts += [
+ ("mf://" + file.replace("#", "?")),
+ "-mf",
+ f"fps={fps_final:4f}"
+ ]
opts += ["-loop", "0", "-really-quiet", "-fs"]
cmd.extend(opts)
@@ -163,7 +168,7 @@ class PlayRenderedAnim(Operator):
cmd.append(file)
# launch it
- print("Executing command:\n %r" % " ".join(cmd))
+ print("Executing command:\n ", " ".join(quote(c) for c in cmd))
# workaround for boost 1.46, can be eventually removed. bug: [#32350]
env_copy = os.environ.copy()
@@ -174,9 +179,11 @@ class PlayRenderedAnim(Operator):
try:
subprocess.Popen(cmd, env=env_copy)
except Exception as e:
- self.report({'ERROR'},
- "Couldn't run external animation player with command "
- "%r\n%s" % (" ".join(cmd), str(e)))
+ self.report(
+ {'ERROR'},
+ "Couldn't run external animation player with command "
+ f"{cmd!r}\n{e!s}",
+ )
return {'CANCELLED'}
return {'FINISHED'}
diff --git a/release/scripts/startup/bl_ui/properties_data_camera.py b/release/scripts/startup/bl_ui/properties_data_camera.py
index 10709676b85..3b5f21d616e 100644
--- a/release/scripts/startup/bl_ui/properties_data_camera.py
+++ b/release/scripts/startup/bl_ui/properties_data_camera.py
@@ -242,7 +242,7 @@ class DATA_PT_camera_dof_aperture(CameraButtonsPanel, Panel):
cam = context.camera
dof_options = cam.gpu_dof
- flow = layout.grid_flow(row_major=True, num_columns=0, even_columns=True, even_rows=False, align=False)
+ flow = layout.grid_flow(row_major=True, columns=0, even_columns=True, even_rows=False, align=False)
if context.engine == 'BLENDER_EEVEE':
col = flow.column()
diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py
index 17034689528..63b708ae059 100644
--- a/release/scripts/startup/bl_ui/properties_object.py
+++ b/release/scripts/startup/bl_ui/properties_object.py
@@ -50,7 +50,7 @@ class OBJECT_PT_transform(ObjectButtonsPanel, Panel):
layout = self.layout
layout.use_property_split = True
- flow = layout.grid_flow(row_major=True, num_columns=0, even_columns=True, even_rows=False, align=False)
+ flow = layout.grid_flow(row_major=True, columns=0, even_columns=True, even_rows=False, align=False)
ob = context.object
@@ -106,7 +106,7 @@ class OBJECT_PT_delta_transform(ObjectButtonsPanel, Panel):
def draw(self, context):
layout = self.layout
layout.use_property_split = True
- flow = layout.grid_flow(row_major=True, num_columns=0, even_columns=True, even_rows=True, align=False)
+ flow = layout.grid_flow(row_major=True, columns=0, even_columns=True, even_rows=True, align=False)
ob = context.object
@@ -136,7 +136,7 @@ class OBJECT_PT_relations(ObjectButtonsPanel, Panel):
def draw(self, context):
layout = self.layout
layout.use_property_split = True
- flow = layout.grid_flow(row_major=True, num_columns=0, even_columns=True, even_rows=False, align=False)
+ flow = layout.grid_flow(row_major=True, columns=0, even_columns=True, even_rows=False, align=False)
ob = context.object
@@ -222,7 +222,7 @@ class OBJECT_PT_display(ObjectButtonsPanel, Panel):
def draw(self, context):
layout = self.layout
layout.use_property_split = True
- flow = layout.grid_flow(row_major=True, num_columns=0, even_columns=True, even_rows=False, align=False)
+ flow = layout.grid_flow(row_major=True, columns=0, even_columns=True, even_rows=False, align=False)
obj = context.object
obj_type = obj.type
@@ -285,7 +285,7 @@ class OBJECT_PT_duplication(ObjectButtonsPanel, Panel):
row.prop(ob, "dupli_type", expand=True)
layout.use_property_split = True
- flow = layout.grid_flow(row_major=True, num_columns=0, even_columns=True, even_rows=False, align=False)
+ flow = layout.grid_flow(row_major=True, columns=0, even_columns=True, even_rows=False, align=False)
if ob.dupli_type == 'FRAMES':
diff --git a/release/scripts/startup/bl_ui/properties_physics_field.py b/release/scripts/startup/bl_ui/properties_physics_field.py
index 7683c953340..3b01015047f 100644
--- a/release/scripts/startup/bl_ui/properties_physics_field.py
+++ b/release/scripts/startup/bl_ui/properties_physics_field.py
@@ -212,7 +212,7 @@ class PHYSICS_PT_collision_particle(PhysicButtonsPanel, Panel):
md = context.collision
layout.use_property_split = True
- flow = layout.grid_flow(row_major=True, num_columns=0, even_columns=True, even_rows=False, align=False)
+ flow = layout.grid_flow(row_major=True, columns=0, even_columns=True, even_rows=False, align=False)
coll = md.settings
@@ -252,7 +252,7 @@ class PHYSICS_PT_collision_softbody(PhysicButtonsPanel, Panel):
layout = self.layout
layout.use_property_split = True
- flow = layout.grid_flow(row_major=True, num_columns=0, even_columns=True, even_rows=False, align=False)
+ flow = layout.grid_flow(row_major=True, columns=0, even_columns=True, even_rows=False, align=False)
md = context.collision
coll = md.settings
diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py
index 0260864cfb3..22c1f17217e 100644
--- a/release/scripts/startup/bl_ui/space_dopesheet.py
+++ b/release/scripts/startup/bl_ui/space_dopesheet.py
@@ -120,7 +120,7 @@ class DopesheetFilterPopoverBase:
# datablock filters
layout.label("Include From Types:")
- flow = layout.grid_flow(row_major=True, num_columns=2, even_rows=False, align=False)
+ flow = layout.grid_flow(row_major=True, columns=2, even_rows=False, align=False)
flow.prop(dopesheet, "show_scenes", text="Scenes")
flow.prop(dopesheet, "show_worlds", text="Worlds")
diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index 19516fda301..94a8bef0b88 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -579,11 +579,53 @@ class INFO_MT_help(Menu):
layout.operator("wm.splash", icon='BLENDER')
+class TOPBAR_MT_file_specials(Menu):
+ bl_label = "File Context Menu"
+
+ def draw(self, context):
+ layout = self.layout
+
+ layout.operator_context = 'INVOKE_AREA'
+ layout.operator("wm.link", text="Link", icon='LINK_BLEND')
+ layout.operator("wm.append", text="Append", icon='APPEND_BLEND')
+
+ layout.separator()
+
+ layout.menu("INFO_MT_file_import", icon='IMPORT')
+ layout.menu("INFO_MT_file_export", icon='EXPORT')
+
+
+class TOPBAR_MT_window_specials(Menu):
+ bl_label = "Window Context Menu"
+
+ def draw(self, context):
+ layout = self.layout
+
+ layout.operator_context = 'EXEC_AREA'
+
+ layout.operator("wm.window_new")
+
+ layout.operator_context = 'INVOKE_AREA'
+
+ layout.operator("screen.area_dupli")
+
+ layout.separator()
+
+ layout.operator("screen.area_split", text="Horizontal Split").direction = 'HORIZONTAL'
+ layout.operator("screen.area_split", text="Vertical Split").direction = 'VERTICAL'
+
+ layout.separator()
+
+ layout.operator("screen.userpref_show", text="User Preferences...", icon='PREFERENCES')
+
+
classes = (
TOPBAR_HT_upper_bar,
TOPBAR_HT_lower_bar,
TOPBAR_PT_pivot_point,
TOPBAR_PT_snapping,
+ TOPBAR_MT_file_specials,
+ TOPBAR_MT_window_specials,
INFO_MT_editor_menus,
INFO_MT_file,
INFO_MT_file_import,
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 6645a1b12ef..8a76963d4a1 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -3658,7 +3658,7 @@ class VIEW3D_PT_shading_lighting(Panel):
sub = row.column()
sub.operator('wm.studiolight_userpref_show', emboss=False, text="", icon='PREFERENCES')
if shading.selected_studio_light.orientation == 'WORLD':
- layout.row().prop(shading, "studiolight_rot_z")
+ layout.row().prop(shading, "studiolight_rotate_z")
elif shading.light == 'MATCAP':
row = layout.row()
@@ -3673,7 +3673,7 @@ class VIEW3D_PT_shading_lighting(Panel):
sub = row.column()
sub.operator('wm.studiolight_userpref_show', emboss=False, text="", icon='PREFERENCES')
if shading.selected_studio_light.orientation == 'WORLD':
- layout.row().prop(shading, "studiolight_rot_z")
+ layout.row().prop(shading, "studiolight_rotate_z")
layout.row().prop(shading, "studiolight_background_alpha")
layout.prop(shading, "use_scene_light")