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 meshes not exporting locked setting

Browse Source
This commit is contained in:
JannisX11 2021-10-09 17:29:33 +03:00
parent 0d61416859
commit 6d28ad47ba
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/outliner/cube.js
View File

@ -96,7 +96,6 @@ class Cube extends OutlinerElement {
Merge.number(this, object, 'autouv')
Merge.number(this, object, 'color')
Merge.boolean(this, object, 'export')
Merge.boolean(this, object, 'locked')
Merge.boolean(this, object, 'visibility')
if (object.from) {
Merge.number(this.from, object.from, 0)
@ -235,7 +234,6 @@ class Cube extends OutlinerElement {
el.autouv = this.autouv;
el.color = this.color;
el.locked = this.locked;
if (!this.visibility) el.visibility = false;
if (!this.export) el.export = false;
if (!this.shade) el.shade = false;
@ -777,8 +775,9 @@ class Cube extends OutlinerElement {
Outliner.buttons.visibility,
];
new Property(Cube, 'string', 'name', {default: 'cube'})
new Property(Cube, 'boolean', 'rescale')
new Property(Cube, 'string', 'name', {default: 'cube'});
new Property(Cube, 'boolean', 'rescale');
new Property(Cube, 'boolean', 'locked');
OutlinerElement.registerType(Cube, 'cube');

3
js/outliner/locator.js
View File

@ -19,7 +19,6 @@ class Locator extends OutlinerElement {
Locator.properties[key].merge(this, object)
}
this.sanitizeName();
Merge.boolean(this, object, 'locked')
Merge.boolean(this, object, 'export');
return this;
}
@ -36,7 +35,6 @@ class Locator extends OutlinerElement {
Locator.properties[key].copy(this, save)
}
save.export = this.export ? undefined : false;
save.locked = this.locked;
save.uuid = this.uuid;
save.type = 'locator';
return save;
@ -120,6 +118,7 @@ new Property(Locator, 'string', 'name', {default: 'locator'})
new Property(Locator, 'vector', 'from')
new Property(Locator, 'vector', 'rotation')
new Property(Locator, 'boolean', 'ignore_inherited_scale')
new Property(NullObject, 'boolean', 'locked');
OutlinerElement.registerType(Locator, 'locator');

1
js/outliner/mesh.js
View File

@ -569,6 +569,7 @@ new Property(Mesh, 'number', 'color', {default: Math.floor(Math.random()*8)});
new Property(Mesh, 'vector', 'origin');
new Property(Mesh, 'vector', 'rotation');
new Property(Mesh, 'boolean', 'visibility', {default: true});
new Property(Mesh, 'boolean', 'locked');
OutlinerElement.registerType(Mesh, 'mesh');

3
js/outliner/null_object.js
View File

@ -21,7 +21,6 @@ class NullObject extends OutlinerElement {
NullObject.properties[key].merge(this, object)
}
this.sanitizeName();
Merge.boolean(this, object, 'locked')
//Merge.boolean(this, object, 'export');
return this;
}
@ -38,7 +37,6 @@ class NullObject extends OutlinerElement {
NullObject.properties[key].copy(this, save)
}
//save.export = this.export ? undefined : false;
save.locked = this.locked;
save.uuid = this.uuid;
save.type = 'null_object';
return save;
@ -103,6 +101,7 @@ class NullObject extends OutlinerElement {
new Property(NullObject, 'vector', 'from')
new Property(NullObject, 'boolean', 'ik_enabled', {condition: () => Format.animation_mode});
new Property(NullObject, 'number', 'ik_chain_length', {condition: () => Format.animation_mode});
new Property(NullObject, 'boolean', 'locked');
OutlinerElement.registerType(NullObject, 'null_object');

1
js/outliner/texture_mesh.js
View File

@ -107,6 +107,7 @@ new Property(TextureMesh, 'vector', 'local_pivot');
new Property(TextureMesh, 'vector', 'rotation');
new Property(TextureMesh, 'vector', 'scale', {default: [1, 1, 1]});
new Property(TextureMesh, 'boolean', 'visibility', {default: true});
new Property(TextureMesh, 'boolean', 'locked');
OutlinerElement.registerType(TextureMesh, 'texture_mesh');