diff --git a/addon_common/common/human_readable.py b/addon_common/common/human_readable.py
index 0d12205c1..302b8a682 100644
--- a/addon_common/common/human_readable.py
+++ b/addon_common/common/human_readable.py
@@ -125,7 +125,7 @@
'DOUBLE': 'Double',
'CLICK': 'Click',
},{
- 'SPACE': ' ',
+ 'SPACE': 'Space',
}
]
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index c55f03de4..bbd4ad935 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -9,6 +9,7 @@ GEM
zeitwerk (~> 2.2, >= 2.2.2)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
+ base64 (0.2.0)
coffee-script (2.4.1)
coffee-script-source
execjs
@@ -24,12 +25,13 @@ GEM
ethon (0.16.0)
ffi (>= 1.15.0)
eventmachine (1.2.7)
- execjs (2.8.1)
- faraday (2.7.10)
+ execjs (2.9.1)
+ faraday (2.7.12)
+ base64
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-net_http (3.0.2)
- ffi (1.15.5)
+ ffi (1.16.3)
forwardable-extended (2.6.0)
gemoji (3.0.1)
github-pages (228)
@@ -210,8 +212,8 @@ GEM
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
- minitest (5.19.0)
- nokogiri (1.15.4-x86_64-linux)
+ minitest (5.20.0)
+ nokogiri (1.15.5-x86_64-linux)
racc (~> 1.4)
octokit (4.25.1)
faraday (>= 1, < 3)
@@ -219,7 +221,7 @@ GEM
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (4.0.7)
- racc (1.7.1)
+ racc (1.7.3)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
@@ -238,7 +240,7 @@ GEM
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
thread_safe (0.3.6)
- typhoeus (1.4.0)
+ typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (1.2.11)
thread_safe (~> 0.1)
@@ -246,11 +248,11 @@ GEM
tzinfo (>= 1.0.0)
unf (0.1.4)
unf_ext
- unf_ext (0.0.8.2)
+ unf_ext (0.0.9.1)
unicode-display_width (1.8.0)
wdm (0.1.1)
webrick (1.8.1)
- zeitwerk (2.6.11)
+ zeitwerk (2.6.12)
PLATFORMS
x86_64-linux
diff --git a/docs/_data/keymaps.yml b/docs/_data/keymaps.yml
index d898c6572..add9b507d 100644
--- a/docs/_data/keymaps.yml
+++ b/docs/_data/keymaps.yml
@@ -24,6 +24,7 @@ reload_css: "F12"
autosave: "TIMER_AUTOSAVE"
cancel: "Escape, RMB"
confirm: "Enter, LMB+Click, NumEnter"
+confirm_quick: "Space"
confirm_drag: "LMB+Drag"
done: "Tab"
done_alt0: "Escape"
@@ -34,6 +35,7 @@ rotate: "R"
scale: "S"
delete: "Backspace, Delete, X"
delete_pie_menu: "Ctrl+Backspace, Ctrl+Delete, Ctrl+X"
+merge: "M"
smooth_edge_flow: "Shift+S"
rip: "V"
rip_fill: "Alt+V"
@@ -61,6 +63,8 @@ pie_menu_confirm: "LMB+Click, LMB+Drag"
pin: "P"
unpin: "Alt+P"
unpin_all: "Shift+Alt+P"
+mark_seam: "Ctrl+E"
+clear_seam: "Ctrl+Shift+E"
contours_tool: "1, Ctrl+Alt+C"
polystrips_tool: "2, Ctrl+Alt+P"
strokes_tool: "3, Ctrl+Alt+B"
diff --git a/docs/_data/options.yml b/docs/_data/options.yml
index 2f440ccd8..cacceb1c0 100644
--- a/docs/_data/options.yml
+++ b/docs/_data/options.yml
@@ -1,3 +1,3 @@
warning_max_sources: '1m'
warning_max_target: '20k'
-rf_version: 3.4.1
\ No newline at end of file
+rf_version: 3.4.2
\ No newline at end of file
diff --git a/docs/changelist.md b/docs/changelist.md
index 2344fd40a..c4149f8ea 100644
--- a/docs/changelist.md
+++ b/docs/changelist.md
@@ -2,6 +2,17 @@
This document contains details about what has changed in RetopoFlow since version 2.x.
+### RetopoFlow 3.4.1→3.4.2
+
+- Worked around issue of "locking" Blender interface on Windows machines with Blender >3.6
+- Strokes now shows counts for selected verts, selected edges, new spans, new loops
+- Improved clarity for target geometry that is pinned, seam, non-manifold
+- Disabling visualization of pinned or seam geometry will disable pinning
+- Added keymap for marking/clearing seams, confirming quick tools
+- Added keymap for confirming quick tools
+- Added Merge options to Delete / Dissolve pie menu
+- Many minor bug fixes
+
### RetopoFlow 3.4.0→3.4.1
- Improved visualization and editing when working on "wrong" side of symmetry
diff --git a/docs/general.md b/docs/general.md
index 90e91cecc..d0a1782eb 100644
--- a/docs/general.md
+++ b/docs/general.md
@@ -93,6 +93,11 @@ For example, pressing `G` in Contours will slide the selected loop.
| {{ site.data.keymaps.delete_pie_menu }} | : | delete / dissolve pie menu
| {{ site.data.keymaps.blender_undo }} | : | undo |
| {{ site.data.keymaps.blender_redo }} | : | redo |
+| {{ site.data.keymaps.pin }} | : | pin selected geometry |
+| {{ site.data.keymaps.unpin }} | : | unpin selected geometry |
+| {{ site.data.keymaps.unpin_all }} | : | unpin all pinned geometry |
+| {{ site.data.keymaps.mark_seam }} | : | mark selected edges as seam |
+| {{ site.data.keymaps.clear_seam }} | : | unmark selected edges as seam |
General selection has a few options to help with selecting troublesome vertices (ex: just below surface of source).
diff --git a/help/changelist.md b/help/changelist.md
index 54a76ecfa..fbd6b0fd9 100644
--- a/help/changelist.md
+++ b/help/changelist.md
@@ -4,12 +4,14 @@ This document contains details about what has changed in RetopoFlow since versio
### RetopoFlow 3.4.1→3.4.2
+- Worked around issue of "locking" Blender interface on Windows machines with Blender >3.6
- Strokes now shows counts for selected verts, selected edges, new spans, new loops
- Improved clarity for target geometry that is pinned, seam, non-manifold
- Disabling visualization of pinned or seam geometry will disable pinning
- Added keymap for marking/clearing seams, confirming quick tools
+- Added keymap for confirming quick tools
- Added Merge options to Delete / Dissolve pie menu
-- Minor bug fixes
+- Many minor bug fixes
### RetopoFlow 3.4.0→3.4.1