mirror/blockbench
2
0
Fork 0
mirror of https://github.com/JannisX11/blockbench.git synced 2024-11-21 01:13:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add titles to sides in gimbal controls

Browse Source 
Fix issue with local transform space and groups
Set eraser alt tool to color picker
Bundle files
This commit is contained in:
JannisX11 2021-02-28 16:16:37 +01:00
parent 6a8b955afe
commit d04aebd0ec
5 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/preview/preview.js
View File

@ -1272,6 +1272,7 @@ class GimbalControls {
side.node = document.createElement('div');
side.node.classList.add('gimbal_controls_side');
side.node.setAttribute('axis', side.axis);
side.node.title = tl(`direction.${key}`);
if (side.label) side.node.innerText = side.label;
side.node.addEventListener('click', e => {

3
js/preview/transformer.js
View File

@ -805,7 +805,7 @@
}
if (is_local) return 2;
}
if (input_space === 'local' && Format.bone_rig && Group.selected) {
if (input_space === 'local' && Format.bone_rig && Group.selected && Toolbox.selected == BarItems.rotate_tool) {
// Local Space
return 2;
}
@ -827,6 +827,7 @@
}
return bone;
}
// Global Space
return 0;
}

1
js/texturing/painter.js
View File

@ -855,6 +855,7 @@ BARS.defineActions(function() {
icon: 'fa-eraser',
category: 'tools',
toolbar: 'brush',
alt_tool: 'color_picker',
selectFace: true,
transformerMode: 'hidden',
cursor: 'crosshair',

2
js/webpack/bundle.js
View File

File diff suppressed because one or more lines are too long

2
service_worker.js
View File

File diff suppressed because one or more lines are too long