Merge branch 'master' into gh-pages

Author: JannisX11

.travis.yml

@@ -12,7 +12,7 @@ jobs:
     - name: "Linux"
       os: linux
       script:
-        - npm run prepublish
+        - npm run build-electron
         - sudo apt-get install rpm
         - electron-builder --publish=onTagOrDraft
 

js/interface/keyboard.js

@@ -408,6 +408,7 @@ Keybinds.loadKeymap = function(id, from_start_screen = false) {
 Keybinds.no_overlap = function(k1, k2) {
 	return Condition.mutuallyExclusive(k1.condition, k2.condition);
 }
+const overlap_exempt = [1,2,3];
 export function updateKeybindConflicts() {
 	for (var key in Keybinds.structure) {
 		Keybinds.structure[key].conflict = false;
@@ -427,6 +428,7 @@ export function updateKeybindConflicts() {
 				 && keybind.shift === keybind2.shift
 				 && keybind.alt   === keybind2.alt
 				 && keybind.meta  === keybind2.meta
+				 && overlap_exempt.includes(keybind.key) == false // avoid conflict between click to select, click to drag camera etc.
 				 && !Keybinds.no_overlap(action, Keybinds.actions[i])
 				) {
 					keybind.setConflict();

js/misc.js

@@ -3,6 +3,8 @@ import { currentwindow } from "./native_apis";
 window.osfs = '/'
 window.open_dialog = false;
 window.open_interface = false;
+window.Format = 0;
+window.Project = 0;
 
 export const Pressing = {
 	shift: false,

js/modeling/weight_paint.ts

@@ -116,6 +116,7 @@ new Tool('weight_brush', {
 			if (Math.pow(last_click_pos[0]-click_pos[0], 2) + Math.pow(last_click_pos[1]-click_pos[1], 2) < 30) {
 				return;
 			}
+			if (Preview.selected.controls.hasMoved) return;
 			last_click_pos = click_pos;
 
 			data = data ?? preview.raycast(event);

js/outliner/mesh.js

@@ -749,7 +749,7 @@ export class Mesh extends OutlinerElement {
 		for (let fkey in this.faces) {
 			this.faces[fkey].vertices.replace(this.faces[fkey].getSortedVertices());
 		}
-		this.preview_controller.updateUV(this);
+		this.preview_controller.updateGeometry(this);
 	}
 	forAllFaces(cb) {
 		for (let fkey in this.faces) {

js/outliner/outliner.js

@@ -2083,7 +2083,13 @@ Interface.definePanels(function() {
 		},
 		menu: new Menu([
 			new MenuSeparator('add_element'),
-			'add_element',
+			{
+				id: 'add_element',
+				name: 'action.add_element',
+				description: 'action.add_element.desc',
+				icon: BarItems.add_element.icon,
+				children: BarItems.add_element.side_menu.structure
+			},
 			'add_group',
 			new MenuSeparator('copypaste'),
 			'paste',

js/preview/preview.js

@@ -2299,7 +2299,7 @@ BARS.defineActions(function() {
 			colored_solid: {name: true, icon: 'fas.fa-square-plus', condition: () => (!Toolbox.selected.allowed_view_modes || Toolbox.selected.allowed_view_modes.includes('colored_solid'))},
 			wireframe: {name: true, icon: 'far.fa-square', condition: () => (!Toolbox.selected.allowed_view_modes || Toolbox.selected.allowed_view_modes.includes('wireframe'))},
 			uv: {name: true, icon: 'grid_guides', condition: () => (!Toolbox.selected.allowed_view_modes || Toolbox.selected.allowed_view_modes.includes('uv'))},
-			normal: {name: true, icon: 'fa-square-caret-up', condition: () => ((!Toolbox.selected.allowed_view_modes || Toolbox.selected.allowed_view_modes.includes('normal')) && Mesh.all.length)},
+			normal: {name: true, icon: 'fa-square-caret-up', condition: () => ((!Toolbox.selected.allowed_view_modes || Toolbox.selected.allowed_view_modes.includes('normal')))},
 			vertex_weight: {name: true, icon: 'weight', condition: () => ArmatureBone.all.length && (!Toolbox.selected.allowed_view_modes || Toolbox.selected.allowed_view_modes.includes('vertex_weight'))},
 			weighted_bone_colors: {name: true, icon: 'weight', condition: () => ArmatureBone.all.length && (!Toolbox.selected.allowed_view_modes || Toolbox.selected.allowed_view_modes.includes('weighted_bone_colors'))},
 			material: {name: true, icon: 'pages', condition: () => ((!Toolbox.selected.allowed_view_modes || Toolbox.selected.allowed_view_modes.includes('material')) && TextureGroup.all.find(tg => tg.is_material))},

package.json

@@ -131,6 +131,7 @@
 		"build-test-portable": "npm run build-electron && electron-builder --windows portable",
 		"publish-windows": "npm run build-electron && electron-builder -w --publish=onTagOrDraft && node ./scripts/rename_portable.js && electron-builder --windows portable --publish=onTagOrDraft",
 		"publish-mac": "npm run build-electron && electron-builder --publish=always",
+		"publish-linux": "electron-builder --linux --publish=always",
 		"pwa": "node ./scripts/generate_pwa.js",
 		"prepublish": "npm run build-web && npm run pwa && npm run generate-docs",
 		"prepublish-beta": "node ./scripts/enable_beta.js && npm run build-web && npm run pwa && npm run generate-docs",