mirror of
https://github.com/JannisX11/blockbench.git
synced 2025-04-06 17:31:09 +08:00
Merge branch 'next' into boolean
This commit is contained in:
commit
7c729b56bf
@ -123,7 +123,7 @@
|
||||
font-family: 'Material Icons';
|
||||
font-style: normal;
|
||||
font-weight: 400;
|
||||
src: url(../font/material-icons.woff2) format('woff');
|
||||
src: url(../font/material-icons.woff2?4) format('woff');
|
||||
}
|
||||
@font-face {
|
||||
font-family: 'icomoon';
|
||||
|
Binary file not shown.
@ -125,6 +125,9 @@ export class OutlinerNode {
|
||||
get preview_controller() {
|
||||
return this.constructor.preview_controller;
|
||||
}
|
||||
getTypeBehavior(flag) {
|
||||
return OutlinerElement.types[this.type]?.behavior[flag];
|
||||
}
|
||||
//Sorting
|
||||
sortInBefore(element, index_mod = 0) {
|
||||
var index = -1;
|
||||
@ -381,9 +384,6 @@ export class OutlinerElement extends OutlinerNode {
|
||||
Project.elements.remove(this);
|
||||
return this;
|
||||
}
|
||||
getTypeBehavior(flag) {
|
||||
return OutlinerElement.types[this.type]?.behavior[flag];
|
||||
}
|
||||
showContextMenu(event) {
|
||||
if (this.locked) return this;
|
||||
if (!this.selected) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user