mirror/blockbench
2
0
Fork 0
mirror of https://github.com/JannisX11/blockbench.git synced 2025-02-17 16:20:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue with mobile tool bar in display mode

Browse Source 
Fix undo issue when rotating mesh on X axis
This commit is contained in:
JannisX11 2022-07-07 23:49:10 +02:00
parent 21b741ad5c
commit 027a52942f
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/preview/preview.js
View File

@ -1404,7 +1404,7 @@ class Preview {
}
Preview.selected = this;
quad_previews.enabled = false;
$('#preview').empty()
$('#preview > .quad_canvas_wrapper, #preview > .single_canvas_wrapper').remove()
var wrapper = $('<div class="single_canvas_wrapper"></div>')
wrapper.append(this.node)

12
js/transform.js
View File

@ -1281,7 +1281,7 @@ BARS.defineActions(function() {
Canvas.updatePositions()
},
onBefore: function() {
Undo.initEdit({elements: Cube.selected, group: Group.selected})
Undo.initEdit({elements: Outliner.selected.filter(el => el.rotatable), group: Group.selected})
},
onAfter: function() {
Undo.finishEdit(getRotationObject() instanceof Group ? 'Rotate group' : 'Rotate elements');
@ -1308,7 +1308,7 @@ BARS.defineActions(function() {
Canvas.updatePositions()
},
onBefore: function() {
Undo.initEdit({elements: selected, group: Group.selected})
Undo.initEdit({elements: Outliner.selected.filter(el => el.rotatable), group: Group.selected})
},
onAfter: function() {
Undo.finishEdit(getRotationObject() instanceof Group ? 'Rotate group' : 'Rotate elements');
@ -1335,19 +1335,13 @@ BARS.defineActions(function() {
Canvas.updatePositions()
},
onBefore: function() {
Undo.initEdit({elements: selected, group: Group.selected})
Undo.initEdit({elements: Outliner.selected.filter(el => el.rotatable), group: Group.selected})
},
onAfter: function() {
Undo.finishEdit(getRotationObject() instanceof Group ? 'Rotate group' : 'Rotate elements');
},
getInterval: getRotationInterval
})
function rotateCondition() {
return (Modes.edit && (
(Format.bone_rig && Group.selected) ||
(Format.rotate_cubes && Cube.selected.length)
))
}
//Origin
function moveOriginOnAxis(modify, axis) {