mirror of
https://github.com/JannisX11/blockbench.git
synced 2024-11-27 04:21:46 +08:00
Fix top/bottom slot panels in image editor
Allow model merging in new bedrock format
This commit is contained in:
parent
acd048022b
commit
124dd86405
@ -1137,7 +1137,7 @@ var codec = new Codec('bedrock', {
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (data && index !== undefined) {
|
||||
if (data) {
|
||||
|
||||
if (Group.all.find(group => group.bedrock_binding)) {
|
||||
data.format_version = '1.16.0';
|
||||
|
@ -2102,7 +2102,7 @@ Interface.definePanels(function() {
|
||||
: Math.floor(Math.clamp(UVEditor.panel.width - 8, 64, 1e5));
|
||||
this.width = size;
|
||||
if (Format.image_editor) {
|
||||
this.height = Interface.center_screen.clientHeight - 38;
|
||||
this.height = Interface.preview.clientHeight - 38;
|
||||
if (Blockbench.isMobile) {
|
||||
let panel = Interface.getBottomPanel();
|
||||
if (panel) this.height -= panel.height;
|
||||
|
Loading…
Reference in New Issue
Block a user