oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nodeparamview: fix crash when inserting color keyframe

Browse Source
This commit is contained in:
itsmattkc
2021-05-26 17:03:49 +10:00
parent 2d53e35e7c
commit d0bd5e2142
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp
+8 -6
View File
@@ -197,12 +197,12 @@ void NodeParamViewWidgetBridge::SetInputValue(const QVariant &value, int track)
{ {
MultiUndoCommand* command = new MultiUndoCommand(); MultiUndoCommand* command = new MultiUndoCommand();
SetInputValueInternal(value, track, command); SetInputValueInternal(value, track, command, true);
Core::instance()->undo_stack()->pushIfHasChildren(command); Core::instance()->undo_stack()->pushIfHasChildren(command);
} }
void NodeParamViewWidgetBridge::SetInputValueInternal(const QVariant &value, int track, MultiUndoCommand *command) void NodeParamViewWidgetBridge::SetInputValueInternal(const QVariant &value, int track, MultiUndoCommand *command, bool insert_on_all_tracks_if_no_key)
{ {
rational node_time = GetCurrentTimeAsNodeTime(); rational node_time = GetCurrentTimeAsNodeTime();
@@ -219,6 +219,8 @@ void NodeParamViewWidgetBridge::SetInputValueInternal(const QVariant &value, int
if (i == track) { if (i == track) {
track_value = value; track_value = value;
} else if (!insert_on_all_tracks_if_no_key) {
continue;
} else { } else {
track_value = input_.node()->GetSplitValueAtTimeOnTrack(input_.input(), node_time, i, input_.element()); track_value = input_.node()->GetSplitValueAtTimeOnTrack(input_.input(), node_time, i, input_.element());
} }
@@ -339,10 +341,10 @@ void NodeParamViewWidgetBridge::WidgetCallback()
MultiUndoCommand* command = new MultiUndoCommand(); MultiUndoCommand* command = new MultiUndoCommand();
SetInputValueInternal(c.red(), 0, command); SetInputValueInternal(c.red(), 0, command, false);
SetInputValueInternal(c.green(), 1, command); SetInputValueInternal(c.green(), 1, command, false);
SetInputValueInternal(c.blue(), 2, command); SetInputValueInternal(c.blue(), 2, command, false);
SetInputValueInternal(c.alpha(), 3, command); SetInputValueInternal(c.alpha(), 3, command, false);
Node* n = input_.node(); Node* n = input_.node();
n->blockSignals(true); n->blockSignals(true);
app/widget/nodeparamview/nodeparamviewwidgetbridge.h
+1 -1
View File
@@ -62,7 +62,7 @@ private:
void SetInputValue(const QVariant& value, int track); void SetInputValue(const QVariant& value, int track);
void SetInputValueInternal(const QVariant& value, int track, MultiUndoCommand *command); void SetInputValueInternal(const QVariant& value, int track, MultiUndoCommand *command, bool insert_on_all_tracks_if_no_key);
void ProcessSlider(NumericSliderBase* slider, const QVariant& value); void ProcessSlider(NumericSliderBase* slider, const QVariant& value);