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

Fix error on startup with action conditions

Browse Source 
Fix 3D brush outline staying after unselecting brush
This commit is contained in:
JannisX11 2023-06-26 17:06:40 +02:00
parent dc479ce9ce
commit 96d9393690
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/interface/actions.js
View File

@ -161,7 +161,7 @@ class BarItem {
var scope = this;
if (scope.uniqueNode && scope.toolbars.length) {
for (var i = scope.toolbars.length-1; i >= 0; i--) {
scope.toolbars[i].remove(scope)
scope.toolbars[i].remove(scope, false);
}
}
if (idx !== undefined) {
@ -426,6 +426,9 @@ class Tool extends Action {
if (typeof Toolbox.selected.onUnselect == 'function') {
Toolbox.selected.onUnselect()
}
if (Toolbox.selected.brush?.size && !this.brush?.size) {
scene.remove(Canvas.brush_outline);
}
if (Transformer.dragging) {
Transformer.cancelMovement({}, true);
}
@ -1444,9 +1447,6 @@ class Toolbar {
if (item) {
item.pushToolbar(this);
/*if (BARS.condition(item.condition)) {
content.append(item.getNode())
}*/
this.positionLookup[itemPosition] = item;
} else {
var postloadAction = [items[itemPosition], itemPosition];
@ -1497,14 +1497,14 @@ class Toolbar {
this.update().save();
return this;
}
remove(action) {
remove(action, update = true) {
var i = this.children.length-1;
while (i >= 0) {
var item = this.children[i]
if (item === action || item.id === action) {
item.toolbars.remove(this)
this.children.splice(i, 1)
this.update(true).save();
if (update != false) this.update(true).save();
return this;
}
i--;

1
js/preview/canvas.js
View File

@ -654,7 +654,6 @@ const Canvas = {
alphaTest: 0.2
})
Canvas.brush_outline = new THREE.Mesh(new THREE.PlaneBufferGeometry(1, 1), brush_outline_material);
scene.add(Canvas.brush_outline);
/*
// Vertex gizmos