From 3a6a7b8fd564d02a714883a6e153971764c02b0c Mon Sep 17 00:00:00 2001 From: JannisX11 Date: Sat, 3 Jun 2023 23:17:45 +0200 Subject: [PATCH] Fix texture apply tools visible in single texture format --- js/outliner/cube.js | 2 +- js/outliner/mesh.js | 2 +- js/outliner/texture_mesh.js | 2 +- js/texturing/textures.js | 6 +++--- js/texturing/uv.js | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/js/outliner/cube.js b/js/outliner/cube.js index ac22046f..60950357 100644 --- a/js/outliner/cube.js +++ b/js/outliner/cube.js @@ -823,7 +823,7 @@ class Cube extends OutlinerElement { } }}); }}, - {name: 'menu.cube.texture', icon: 'collections', condition: () => !Project.single_texture, children: function() { + {name: 'menu.cube.texture', icon: 'collections', condition: () => !Format.single_texture, children: function() { var arr = [ {icon: 'crop_square', name: 'menu.cube.texture.blank', click: function(cube) { cube.forSelected(function(obj) { diff --git a/js/outliner/mesh.js b/js/outliner/mesh.js index 74098204..1e3730fa 100644 --- a/js/outliner/mesh.js +++ b/js/outliner/mesh.js @@ -725,7 +725,7 @@ class Mesh extends OutlinerElement { } }}) }}, - {name: 'menu.cube.texture', icon: 'collections', condition: () => !Project.single_texture, children: function() { + {name: 'menu.cube.texture', icon: 'collections', condition: () => !Format.single_texture, children: function() { var arr = [ {icon: 'crop_square', name: 'menu.cube.texture.blank', click: function(cube) { cube.forSelected(function(obj) { diff --git a/js/outliner/texture_mesh.js b/js/outliner/texture_mesh.js index a4d5eadc..ce955004 100644 --- a/js/outliner/texture_mesh.js +++ b/js/outliner/texture_mesh.js @@ -79,7 +79,7 @@ class TextureMesh extends OutlinerElement { ...Outliner.control_menu_group, '_', 'rename', - {name: 'menu.texture_mesh.texture_name', icon: 'collections', condition: () => !Project.single_texture, click(context) { + {name: 'menu.texture_mesh.texture_name', icon: 'collections', condition: () => !Format.single_texture, click(context) { Blockbench.textPrompt('menu.texture_mesh.texture_name', context.texture_name, value => { Undo.initEdit({elements: TextureMesh.all}), TextureMesh.all.forEach(element => { diff --git a/js/texturing/textures.js b/js/texturing/textures.js index 1b210710..5cc863c1 100644 --- a/js/texturing/textures.js +++ b/js/texturing/textures.js @@ -1440,19 +1440,19 @@ class Texture { { icon: 'crop_original', name: 'menu.texture.face', - condition() {return !Project.single_texture && Outliner.selected.length > 0}, + condition() {return !Format.single_texture && Outliner.selected.length > 0}, click(texture) {texture.apply()} }, { icon: 'texture', name: 'menu.texture.blank', - condition() {return !Project.single_texture && Outliner.selected.length > 0}, + condition() {return !Format.single_texture && Outliner.selected.length > 0}, click(texture) {texture.apply('blank')} }, { icon: 'fa-cube', name: 'menu.texture.elements', - condition() {return !Project.single_texture && Outliner.selected.length > 0}, + condition() {return !Format.single_texture && Outliner.selected.length > 0}, click(texture) {texture.apply(true)} }, { diff --git a/js/texturing/uv.js b/js/texturing/uv.js index 31cd37f8..ab8b3f07 100644 --- a/js/texturing/uv.js +++ b/js/texturing/uv.js @@ -1424,7 +1424,7 @@ const UVEditor = { 'auto_cullface' ] }}, - {icon: 'collections', name: 'menu.uv.texture', condition: () => UVEditor.getReferenceFace() && !Project.single_texture, children: function() { + {icon: 'collections', name: 'menu.uv.texture', condition: () => UVEditor.getReferenceFace() && !Format.single_texture, children: function() { let arr = [ {icon: 'crop_square', name: 'menu.cube.texture.blank', click: function(context, event) { let elements = UVEditor.vue.mappable_elements;