mirror/blockbench
2
0
Fork 0
mirror of https://github.com/JannisX11/blockbench.git synced 2025-02-17 16:20:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1280 Cut shotcut not updating molang inputs

Browse Source 
Wrong interpolation when creating keyframe between discontinuous keyframes
Timeline graph axis now changes while not open when focusing an input
This commit is contained in:
JannisX11 2022-02-11 19:29:44 +01:00
parent cd4b366e7a
commit 9f90b69e7e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/animations/keyframe.js
View File

@ -169,7 +169,7 @@ class Keyframe {
let this_data_point = (this.data_points.length > 1 && this.time < other.time) ? 1 : 0;
let other_data_point = (other.data_points.length > 1 && this.time > other.time) ? 1 : 0;
if (allow_expression && this.get(axis, this_data_point) === other.get(axis, other_data_point)) {
return this.get(axis)
return this.get(axis, this_data_point);
} else {
let calc = this.calc(axis, this_data_point);
return calc + (other.calc(axis, other_data_point) - calc) * amount;
@ -1001,7 +1001,7 @@ Interface.definePanels(function() {
})
},
focusAxis(axis) {
if (Timeline.vue.graph_editor_open && 'xyz'.includes(axis)) {
if ('xyz'.includes(axis)) {
Timeline.vue.graph_editor_axis = axis;
}
},

2
js/texturing/texture_generator.js
View File

@ -29,7 +29,7 @@ const TextureGenerator = {
form: {
name: {label: 'generic.name', value: 'texture'},
folder: {label: 'dialog.create_texture.folder', condition: Format.id == 'java_block'},
type: {label: 'dialog.create_texture.type', type: 'select', condition: Cube.all.length || Mesh.all.length, options: type_options},
type: {label: 'dialog.create_texture.type', type: 'select', options: type_options},
section2: "_",
resolution: {label: 'dialog.create_texture.pixel_density', description: 'dialog.create_texture.pixel_density.desc', type: 'select', value: 16, condition: (form) => (form.type == 'template'), options: {

2
lib/VuePrismEditor.min.js vendored
View File

File diff suppressed because one or more lines are too long