mirror/blockbench
2
0
Fork 0
mirror of https://github.com/JannisX11/blockbench.git synced 2025-01-18 15:26:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1613 Duplicate texture ids when merging projects

Browse Source 
Fix locators and null objects not being selectable via area select
This commit is contained in:
JannisX11 2022-11-05 20:32:38 +01:00
parent 91df921b25
commit 9a82da08e2
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/io/formats/bbmodel.js
View File

@ -450,6 +450,11 @@ var codec = new Codec('project', {
tex.uuid = tex_uuid_map[tex.uuid]; tex.uuid = tex_uuid_map[tex.uuid];
} }
var tex_copy = new Texture(tex, tex.uuid).add(false); var tex_copy = new Texture(tex, tex.uuid).add(false);
let c = 0;
while (Texture.all.find(t => t !== tex_copy && t.id == c)) {
c++;
tex_copy.id = c.toString();
}
if (isApp && tex.path && fs.existsSync(tex.path) && !model.meta.backup) { if (isApp && tex.path && fs.existsSync(tex.path) && !model.meta.backup) {
tex_copy.fromPath(tex.path) tex_copy.fromPath(tex.path)
return tex_copy; return tex_copy;

2
js/preview/preview.js
View File

@ -1156,7 +1156,7 @@ class Preview {
isSelected = true isSelected = true
} else if (element.visibility) { } else if (element.visibility) {
if (element.mesh && element.mesh.geometry) { if (element.mesh && element.resizable) {
let {mesh} = element; let {mesh} = element;
if (element instanceof Mesh && (selection_mode == 'object' || scope.selection.old_selected.includes(element))) { if (element instanceof Mesh && (selection_mode == 'object' || scope.selection.old_selected.includes(element))) {