Merge branch 'patch' into next

Author: JannisX11

js/boot_loader.js

@@ -4,9 +4,10 @@ import { loadThemes } from "./interface/themes";
 import { translateUI } from "./languages";
 import { loadInstalledPlugins } from "./plugin_loader";
 import { animate } from "./preview/preview";
-import { ipcRenderer, process, SystemInfo } from "./native_apis";
+import { ipcRenderer, SystemInfo } from "./native_apis";
 import { initializeDesktopApp, loadOpenWithBlockbenchFile } from "./desktop";
 import { AutoBackup } from "./auto_backup";
+import { initReferenceImages } from "./preview/reference_images";
 
 Interface.page_wrapper = document.getElementById('page_wrapper');
 Interface.work_screen = document.getElementById('work_screen');
@@ -57,6 +58,7 @@ BARS.setupVue()
 MenuBar.setup()
 translateUI()
 loadThemes()
+initReferenceImages()
 
 console.log(`Three.js r${THREE.REVISION}`)
 console.log('%cBlockbench ' + Blockbench.version + (isApp

js/native_apis.ts

@@ -55,6 +55,7 @@ const REQUESTABLE_APIS = [
 	'v8',
 	'dialog',
 	'clipboard',
+	'shell',
 ];
 const API_DESCRIPTIONS = {
 	fs: 'access and change files on your computer',
@@ -65,6 +66,7 @@ const API_DESCRIPTIONS = {
 	https: 'create servers and talk to other servers',
 	dialog: 'open native dialogs',
 	clipboard: 'read and write to the clipboard',
+	shell: 'open files, folders, and links, and move objects to trash',
 };
 type PluginPermissions = {
 	allowed: Record<string, boolean|any>
@@ -185,6 +187,8 @@ function getModule(module_name: string, plugin_id: string, plugin: PluginOrDevTo
 		return process;
 	} else if (no_namespace_name == 'clipboard') {
 		return clipboard;
+	} else if (no_namespace_name == 'shell') {
+		return shell;
 	} else if (no_namespace_name == 'dialog') {
 		let api = {};
 		for (let key in dialog) {

js/preview/preview.js

@@ -1481,7 +1481,7 @@ export class Preview {
 		let rect_start = [c.ax, c.ay];
 		let rect_end = [c.bx, c.by];
 		let extend_selection = (event.shiftKey || Pressing.overrides.shift) ||
-				((event.ctrlOrCmd || Pressing.overrides.ctrl) && !Keybinds.extra.preview_area_select.keybind.ctrl)
+				((event.ctrlOrCmd || Pressing.overrides.ctrl) && !Keybinds.extra.preview_area_select.keybind.ctrl && !Keybinds.extra.preview_area_select.keybind.meta)
 		let selection_mode = BarItems.selection_mode.value;
 		let spline_selection_mode = BarItems.spline_selection_mode.value;
 

js/preview/reference_images.js

@@ -922,9 +922,11 @@ ReferenceImage.updateAll = function() {
 }
 
 StateMemory.init('global_reference_images', 'array');
-StateMemory.global_reference_images.forEach(template => {
-	new ReferenceImage(template).addAsGlobalReference();
-});
+export async function initReferenceImages() {
+	StateMemory.global_reference_images.forEach(template => {
+		new ReferenceImage(template).addAsGlobalReference();
+	});
+}
 
 SharedActions.add('delete', {
 	condition: () => ReferenceImageMode.active && ReferenceImage.selected,

js/texturing/painter.js

@@ -116,6 +116,7 @@ export const Painter = {
 			return;
 		}
 		let [x, y] = Painter.getCanvasToolPixelCoords(data.intersects[0].uv, texture);
+		UVEditor.vue.texture = texture;
 
 		Painter.startPaintTool(texture, x, y, data.element.faces[data.face].uv, e, data)
 

js/uv/uv.js

@@ -4626,6 +4626,8 @@ Interface.definePanels(function() {
 							return [x * dir_x, y * dir_y];
 						},
 						onEnd: () => {
+							this.texture.updateLayerChanges(true);
+							this.texture.saved = false;
 							Undo.finishEdit('Resize layer');
 							Blockbench.setCursorTooltip();
 							if (dir_x && dir_y) Interface.removeSuggestedModifierKey('alt', 'modifier_actions.no_uniform_scaling');