 Lukas Sneyd
|
9a2d765f34
|
Merge branch 'main' into automatic-xray
|
2023-08-21 06:30:47 +02:00 |
|
Lukas Sneyd
|
acdd0c6522
|
Merge branch 'main' into automatic-xray
|
2023-08-13 10:03:12 +02:00 |
|
Lukas Sneyd
|
d7d02c087d
|
add deconflicted stuff back to gesture_ops
|
2023-08-05 23:31:58 -07:00 |
|
Lukas Sneyd
|
0c7cb1443b
|
Merge branch 'main' into automatic-xray
|
2023-08-06 08:18:49 +02:00 |
|
Lukas Sneyd
|
d89746164e
|
Revert "add deconflicted stuff back to gesture ops"
This reverts commit 4221838e11.
forgot to update by merge first
|
2023-08-05 23:18:00 -07:00 |
|
Lukas Sneyd
|
4221838e11
|
add deconflicted stuff back to gesture ops
|
2023-08-05 23:15:57 -07:00 |
|
Lukas Sneyd
|
d7ab1bee23
|
Merge branch 'automatic-xray' of projects.blender.org:lcas/blender into automatic-xray
|
2023-08-05 23:02:00 -07:00 |
|
Lukas Sneyd
|
4ac8c7f486
|
remove gesutre_ops conflict
|
2023-08-05 23:00:53 -07:00 |
|
Lukas Sneyd
|
29d3f1aff4
|
Merge branch 'main' into automatic-xray
|
2023-08-01 10:09:03 +02:00 |
|
Lukas Sneyd
|
59da79a442
|
add gesture ops changes back
|
2023-07-23 09:18:45 -07:00 |
|
Lukas Sneyd
|
1638436dc9
|
Revert "add newline to remove final gesture ops conflict"
This reverts commit 255a71dd76.
1 of 2 reverts to attempt to fix missing fork info
|
2023-07-23 08:53:51 -07:00 |
|
Lukas Sneyd
|
a80fd39c05
|
Merge branch 'main' into automatic-xray
|
2023-07-23 16:46:30 +02:00 |
|
Lukas Sneyd
|
255a71dd76
|
add newline to remove final gesture ops conflict
|
2023-07-23 07:44:12 -07:00 |
|
Lukas Sneyd
|
9743d5ced2
|
remove gesture ops conflict
|
2023-07-23 07:42:32 -07:00 |
|
Lukas Sneyd
|
a0926493e0
|
Merge branch 'main' into automatic-xray
|
2023-07-15 23:44:19 +02:00 |
|
Lukas Sneyd
|
539aed627f
|
Merge branch 'main' into automatic-xray
|
2023-07-11 08:48:33 +02:00 |
|
Lukas Sneyd
|
18a76db9ba
|
add rna_scene changes back
|
2023-07-05 03:30:27 -07:00 |
|
Lukas Sneyd
|
10d9c79251
|
Merge branch 'main' into automatic-xray
|
2023-07-05 12:19:45 +02:00 |
|
Lukas Sneyd
|
1913ec36b4
|
remove conflict in rna_scene
|
2023-07-05 03:18:18 -07:00 |
|
Lukas Sneyd
|
08a83ea0c5
|
turns on xray during drag select
|
2023-06-24 01:11:25 -07:00 |