diff options
-rw-r--r-- | release/datafiles/blender_icons.svg | 149 | ||||
-rw-r--r-- | release/datafiles/blender_icons16/icon16_mouse_drag.dat | bin | 0 -> 1048 bytes | |||
-rw-r--r-- | release/datafiles/blender_icons16/icon16_mouse_lmb.dat | bin | 0 -> 1048 bytes | |||
-rw-r--r-- | release/datafiles/blender_icons16/icon16_mouse_mmb.dat | bin | 0 -> 1048 bytes | |||
-rw-r--r-- | release/datafiles/blender_icons16/icon16_mouse_rmb.dat | bin | 0 -> 1048 bytes | |||
-rw-r--r-- | release/datafiles/blender_icons32/icon32_mouse_drag.dat | bin | 0 -> 4120 bytes | |||
-rw-r--r-- | release/datafiles/blender_icons32/icon32_mouse_lmb.dat | bin | 0 -> 4120 bytes | |||
-rw-r--r-- | release/datafiles/blender_icons32/icon32_mouse_mmb.dat | bin | 0 -> 4120 bytes | |||
-rw-r--r-- | release/datafiles/blender_icons32/icon32_mouse_rmb.dat | bin | 0 -> 4120 bytes | |||
-rw-r--r-- | source/blender/editors/datafiles/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/editors/include/UI_icons.h | 12 |
11 files changed, 161 insertions, 4 deletions
diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg index 7379dee3573..fe4e2015e79 100644 --- a/release/datafiles/blender_icons.svg +++ b/release/datafiles/blender_icons.svg @@ -92897,6 +92897,155 @@ id="path36201-6-9" inkscape:connector-curvature="0" /> </g> + <g + transform="translate(-564,-55.99997)" + id="g10320" + 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="rect10310" + 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,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" + id="rect10312" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cssssssc" /> + <g + id="g10318" + 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" + id="rect10312-0" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cssccc" /> + </g> + <g + style="display:inline;enable-background:new" + id="g10350"> + <rect + y="451.5" + x="152.5" + height="15" + width="10" + id="rect10334" + 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 + id="g10338" + transform="translate(-523,-55.999969)"> + <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="path10336" /> + </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)"> + <rect + transform="scale(-1,1)" + y="506.99997" + x="-669" + height="15.999999" + width="15.999999" + id="rect10424" + 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="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" + 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)" + id="g10428" /> + <path + 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" + 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)" + id="g10308-9" + 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="rect10296-2" + width="15.999999" + height="15.999999" + x="673" + y="485.99997" /> + <rect + 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" + id="rect10298-7" + width="10" + height="14.999969" + x="675.5" + y="486.5" + rx="2.9835341" + ry="2.9835341" /> + <rect + ry="0.546875" + rx="0.546875" + y="489.49997" + x="679.5" + height="5.0000005" + width="2" + id="rect10300-9" + 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" /> + <g + transform="translate(0,-21)" + id="g10306-4" /> + </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 Binary files differnew file mode 100644 index 00000000000..751421684b1 --- /dev/null +++ b/release/datafiles/blender_icons16/icon16_mouse_drag.dat diff --git a/release/datafiles/blender_icons16/icon16_mouse_lmb.dat b/release/datafiles/blender_icons16/icon16_mouse_lmb.dat Binary files differnew file mode 100644 index 00000000000..2a0c42f4a6a --- /dev/null +++ b/release/datafiles/blender_icons16/icon16_mouse_lmb.dat diff --git a/release/datafiles/blender_icons16/icon16_mouse_mmb.dat b/release/datafiles/blender_icons16/icon16_mouse_mmb.dat Binary files differnew file mode 100644 index 00000000000..300f6be4ee3 --- /dev/null +++ b/release/datafiles/blender_icons16/icon16_mouse_mmb.dat diff --git a/release/datafiles/blender_icons16/icon16_mouse_rmb.dat b/release/datafiles/blender_icons16/icon16_mouse_rmb.dat Binary files differnew file mode 100644 index 00000000000..3f13b167eff --- /dev/null +++ b/release/datafiles/blender_icons16/icon16_mouse_rmb.dat diff --git a/release/datafiles/blender_icons32/icon32_mouse_drag.dat b/release/datafiles/blender_icons32/icon32_mouse_drag.dat Binary files differnew file mode 100644 index 00000000000..96d3e23181c --- /dev/null +++ b/release/datafiles/blender_icons32/icon32_mouse_drag.dat diff --git a/release/datafiles/blender_icons32/icon32_mouse_lmb.dat b/release/datafiles/blender_icons32/icon32_mouse_lmb.dat Binary files differnew file mode 100644 index 00000000000..5cb01a4199b --- /dev/null +++ b/release/datafiles/blender_icons32/icon32_mouse_lmb.dat diff --git a/release/datafiles/blender_icons32/icon32_mouse_mmb.dat b/release/datafiles/blender_icons32/icon32_mouse_mmb.dat Binary files differnew file mode 100644 index 00000000000..2c0bc4e1873 --- /dev/null +++ b/release/datafiles/blender_icons32/icon32_mouse_mmb.dat diff --git a/release/datafiles/blender_icons32/icon32_mouse_rmb.dat b/release/datafiles/blender_icons32/icon32_mouse_rmb.dat Binary files differnew file mode 100644 index 00000000000..3e8bf43d306 --- /dev/null +++ b/release/datafiles/blender_icons32/icon32_mouse_rmb.dat diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index 98b57fcbd71..640239ccc60 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -202,6 +202,10 @@ set(ICON_NAMES group_uvs rna rna_add + mouse_lmb + mouse_mmb + mouse_rmb + mouse_drag outliner_ob_empty outliner_ob_mesh outliner_ob_curve diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index 03c99bb7f0d..75e835ff1d3 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -273,10 +273,14 @@ DEF_ICON(RNA_ADD) DEF_ICON(BLANK093) DEF_ICON(BLANK094) DEF_ICON(BLANK095) - DEF_ICON(BLANK096) - DEF_ICON(BLANK097) - DEF_ICON(BLANK098) - DEF_ICON(BLANK099) +#endif + +DEF_ICON(MOUSE_LMB) +DEF_ICON(MOUSE_MMB) +DEF_ICON(MOUSE_RMB) +DEF_ICON(MOUSE_DRAG) + +#ifndef DEF_ICON_BLANK_SKIP DEF_ICON(BLANK100) DEF_ICON(BLANK101) DEF_ICON(BLANK102) |