mirror/blockbench
2
0
Fork 0
mirror of https://github.com/JannisX11/blockbench.git synced 2024-11-27 04:21:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue with mixing linear and smooth keyframes

Browse Source 
Closes #1417, closes #1430
Hide data point button when keyframe is smooth
This commit is contained in:
JannisX11 2022-05-20 17:00:28 +02:00
parent 300ddd4f50
commit ee49e72ed7
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/animations/keyframe.js
View File

@ -243,8 +243,11 @@ class Keyframe {
if (this.transform) {
if (this.interpolation != 'linear' && this.interpolation != 'step') {
let previous = this.getPreviousKeyframe();
let include_pre = (!previous && this.time > 0) || (previous && previous.interpolation != 'catmullrom')
return {
post: this.getArray(),
pre: include_pre ? this.getArray(0) : undefined,
post: this.getArray(include_pre ? 1 : 0),
lerp_mode: this.interpolation,
}
} else if (this.data_points.length == 1) {
@ -1102,7 +1105,7 @@ Interface.definePanels(function() {
<label>{{ tl('panel.keyframe.type', [getKeyframeInfos()]) }}</label>
<div
class="in_list_button"
v-if="keyframes[0].animator.channels[channel] && keyframes[0].data_points.length < keyframes[0].animator.channels[channel].max_data_points"
v-if="keyframes[0].animator.channels[channel] && keyframes[0].data_points.length < keyframes[0].animator.channels[channel].max_data_points && keyframes[0].interpolation !== 'catmullrom'"
v-on:click.stop="addDataPoint()"
title="${ tl('panel.keyframe.add_data_point') }"
>