 Lukas Sneyd
|
9be619a93a
|
Merge branch 'main' into drag-select-edge-face-keymap-options
|
2023-08-21 06:28:52 +02:00 |
|
Lukas Sneyd
|
ed40e8e5fa
|
Merge branch 'main' into drag-select-edge-face-keymap-options
|
2023-08-13 10:03:09 +02:00 |
|
Lukas Sneyd
|
39c704b0e4
|
add deconflicted back
|
2023-08-05 23:55:30 -07:00 |
|
Lukas Sneyd
|
b2ad0174c2
|
Merge branch 'main' into drag-select-edge-face-keymap-options
|
2023-08-06 08:37:05 +02:00 |
|
Lukas Sneyd
|
3e53a3fb6c
|
remove conflicts
|
2023-08-05 23:36:16 -07:00 |
|
Lukas Sneyd
|
1af4a37584
|
add conflicted changes back
|
2023-08-01 01:06:51 -07:00 |
|
Lukas Sneyd
|
4c80e2e5bc
|
Merge branch 'main' into drag-select-edge-face-keymap-options
|
2023-08-01 08:04:08 +02:00 |
|
Lukas Sneyd
|
15f3f563a6
|
remove newline conflict
|
2023-07-31 23:02:58 -07:00 |
|
Lukas Sneyd
|
d445c88208
|
remove newline conflict
|
2023-07-31 22:59:37 -07:00 |
|
Lukas Sneyd
|
11e6eae66b
|
remove conflicts ed_view3d.h v3d_iterators and v3d_select
|
2023-07-31 22:54:24 -07:00 |
|
Lukas Sneyd
|
122155e493
|
add operator prop changes back
|
2023-07-23 07:25:51 -07:00 |
|
Lukas Sneyd
|
9424986960
|
Merge branch 'main' into drag-select-edge-face-keymap-options
|
2023-07-23 15:56:39 +02:00 |
|
Lukas Sneyd
|
2d41c48154
|
remove operator props conflict
|
2023-07-23 06:55:18 -07:00 |
|
Lukas Sneyd
|
16e686f1d2
|
Merge branch 'main' into drag-select-edge-face-keymap-options
|
2023-07-15 23:44:08 +02:00 |
|
Lukas Sneyd
|
9f991c1739
|
Merge branch 'main' into drag-select-edge-face-keymap-options
|
2023-07-11 08:47:25 +02:00 |
|
Lukas Sneyd
|
61bc27c477
|
Merge branch 'main' into drag-select-edge-face-keymap-options
|
2023-07-05 12:42:37 +02:00 |
|
Lukas Sneyd
|
582b81882d
|
third times a charm?
|
2023-07-05 03:12:51 -07:00 |
|
Lukas Sneyd
|
b1975d8cff
|
Merge branch 'main' into drag-select-edge-face-keymap-options
|
2023-07-05 12:09:49 +02:00 |
|
Lukas Sneyd
|
21e30f66d1
|
Revert "try to add scene types in again"
This reverts commit 1c3be7f077.
still not working
|
2023-07-05 03:08:39 -07:00 |
|
Lukas Sneyd
|
1c3be7f077
|
try to add scene types in again
|
2023-07-05 02:54:54 -07:00 |
|
Lukas Sneyd
|
31705b7d1c
|
Revert "add scene-types back"
This reverts commit 5f91071cc9.
didn't work
|
2023-07-05 02:11:34 -07:00 |
|
Lukas Sneyd
|
5f91071cc9
|
add scene-types back
|
2023-07-05 02:07:20 -07:00 |
|
Lukas Sneyd
|
0fce9b00f1
|
remove conflict in scene types
|
2023-07-05 01:54:22 -07:00 |
|
Lukas Sneyd
|
e12216c208
|
Merge branch 'main' into drag-select-edge-face-keymap-options
|
2023-06-23 22:00:31 +02:00 |
|
Lukas Sneyd
|
3872a555e4
|
More ways to box circle and lasso select edges and faces accessed from
the keymap
|
2023-06-23 01:53:29 -07:00 |