diff options
| author | Fox Caminiti <fox@foxcam.net> | 2023-02-17 17:20:18 -0500 |
|---|---|---|
| committer | Fox Caminiti <fox@foxcam.net> | 2023-02-17 17:20:18 -0500 |
| commit | 02870398a99fab6351182fba407d7d733affa5a1 (patch) | |
| tree | fb5f4744f46e9d7816072e4d01547034bca04bb2 /src/imgui_ui_properties.cpp | |
| parent | fffb3474ee0321d73a47db01dbc4b6b19670ddc5 (diff) | |
blend mode rendering halfway implemented
Diffstat (limited to 'src/imgui_ui_properties.cpp')
| -rw-r--r-- | src/imgui_ui_properties.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/imgui_ui_properties.cpp b/src/imgui_ui_properties.cpp index 345f612..e24ebf2 100644 --- a/src/imgui_ui_properties.cpp +++ b/src/imgui_ui_properties.cpp @@ -311,7 +311,7 @@ ImGui_PropertiesPanel(project_data *File, project_state *State, ui *UI, memory * ImGui::PushID(Property); if ((h - 1) < MainProperties && c == 0) { if (ImGui::Button("K")) { - Property_AddKeyframe(Memory, F_Layers, Property, State->Frame_Current - Layer->Frame_Offset, ArrayLocation); + Property_AddKeyframe_AllSelected(File, State, Memory, F_Layers, SortedLayerArray, SortedCompArray, SortedKeyframeArray, h - 1, State->Frame_Current); } ImGui::SameLine(); #if DEBUG @@ -368,14 +368,14 @@ ImGui_PropertiesPanel(project_data *File, project_state *State, ui *UI, memory * if (EffectHeader->DisplayType == effect_display_type_standard) { if (ChannelHeader.DisplayType == property_display_type_standard) { if (ImGui::Button("K")) { - Property_AddKeyframe(Memory, F_Properties, Property, State->Frame_Current - Layer->Frame_Offset, ArrayLocation); + Property_AddKeyframe(Memory, F_Properties, ArrayLocation, Property, State->Frame_Current - Layer->Frame_Offset); } ImGui::SameLine(); ImGui::DragScalar(Name, ImGuiDataType_Float, &Property->CurrentValue, Property->ScrubVal, &Property->MinVal, &Property->MaxVal, "%f"); ImGui_Properties_Slider(State, Memory, Property, io, WindowMinAbs, WindowMaxAbs, F_Properties); } else if (ChannelHeader.DisplayType == property_display_type_color) { if (ImGui::Button("K")) { - Property_AddKeyframe(Memory, F_Properties, Property, State->Frame_Current - Layer->Frame_Offset, ArrayLocation); + Property_AddKeyframe(Memory, F_Properties, ArrayLocation, Property, State->Frame_Current - Layer->Frame_Offset); } ImGui::SameLine(); ImGui::DragScalar(Name, ImGuiDataType_Float, &Property->CurrentValue, Property->ScrubVal, &Property->MinVal, &Property->MaxVal, "%f"); |