Merge branch 'patch' into next

JannisX11 · Dec 19, 2024 · a503b3f · a503b3f
2 parents 27e9dd2 + 913beac
commit a503b3f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/js/modeling/mesh_editing.js b/js/modeling/mesh_editing.js
@@ -1074,7 +1074,7 @@ SharedActions.add('delete', {
 			let selected_edges = mesh.getSelectedEdges();
 			let selected_faces = mesh.getSelectedFaces();
 
-			if (BarItems.selection_mode.value == 'face' && selected_faces.length < Object.keys(mesh.faces).length) {
+			if ((BarItems.selection_mode.value == 'face' || BarItems.selection_mode.value == 'cluster') && selected_faces.length < Object.keys(mesh.faces).length) {
 				let affected_vertices = [];
 				selected_faces.forEach(fkey => {
 					affected_vertices.safePush(...mesh.faces[fkey].vertices);
@@ -1669,6 +1669,7 @@ BARS.defineActions(function() {
 		icon_mode: true,
 		condition: () => Modes.edit && Mesh.hasAny() && Toolbox.selected.id != 'knife_tool',
 		onChange({value}) {
+			if (value == 'cluster') value = 'face';
 			if (value === previous_selection_mode) return;
 			if (value === 'object') {
 				Mesh.selected.forEach(mesh => {

diff --git a/js/texturing/painter.js b/js/texturing/painter.js
@@ -2117,7 +2117,12 @@ SharedActions.add('paste', {
 				texture.flags.add('temporary_layers');
 				texture.activateLayers(false);
 			}
-			let offset = Clipbench.image ? [Math.clamp(Clipbench.image.x, 0, texture.width), Math.clamp(Clipbench.image.y, 0, texture.height)] : undefined;
+			let offset;
+			if (Clipbench.image) {
+				offset = [Math.clamp(Clipbench.image.x, 0, texture.width), Math.clamp(Clipbench.image.y, 0, texture.height)];
+				offset[0] = Math.clamp(offset[0], 0, texture.width-frame.width);
+				offset[1] = Math.clamp(offset[1], 0, texture.height-frame.height);
+			}
 			let old_frame = Clipbench.image?.frame || 0;
 			if (old_frame || texture.currentFrame) {
 				offset[1] += texture.display_height * ((texture.currentFrame||0) - old_frame);