Merge pull request #3338 from SIsilicon/patch-1

Update condition check in animator channel bar

Author: JannisX11

js/animations/timeline.js

@@ -1778,7 +1778,7 @@ Interface.definePanels(() => {
 								<div class="animator_channel_bar"
 									v-bind:style="{width: (size*length + head_width)+'px'}"
 									v-for="(channel_options, channel) in animator.channels"
-									v-if="animator.expanded && channels[channel] != false && Condition(channel_options.condition) && (!channels.hide_empty || animator[channel].length)"
+									v-if="animator.expanded && channels[channel] != false && Condition(channel_options.condition, animator) && (!channels.hide_empty || animator[channel].length)"
 								>
 									<div class="channel_head"
 										:class="{selected: graph_editor_open && animator.selected && graph_editor_channel == channel}"

types/custom/animation.d.ts

@@ -174,14 +174,15 @@ interface AddChannelOptions {
 	transform?: boolean
 	mutable?: boolean
 	max_data_points?: number
-	condition?: ConditionResolvable
+	condition?: ConditionResolvable<GeneralAnimator>
 	displayFrame?: (animator: GeneralAnimator, multiplier: number) => void
 }
 interface Channel {
 	name: string
 	transform: boolean
 	mutable: boolean
 	max_data_points: number
+	condition?: ConditionResolvable<GeneralAnimator>
 }
 declare class GeneralAnimator {
 	constructor(uuid: string | null, animation: _Animation, name: string)