Mirrors/flowframes
1
0
Fork 0
mirror of https://github.com/n00mkrad/flowframes.git synced 2025-12-24 04:09:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed scene blending when using integer factors

Browse Source
This commit is contained in:
n00mkrad
2022-08-03 21:57:46 +02:00
parent 233f037716
commit 8bfe5304d2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Code/Magick/Blend.cs
View File

@@ -50,7 +50,7 @@ namespace Flowframes.Magick
string[] values = trimmedLine.Split('>'); string[] values = trimmedLine.Split('>');
string frameFrom = FrameRename.framesAreRenamed ? values[0] : frames[values[0].GetInt()]; string frameFrom = FrameRename.framesAreRenamed ? values[0] : frames[values[0].GetInt()];
string frameTo = FrameRename.framesAreRenamed ? values[1] : frames[values[1].GetInt()]; string frameTo = FrameRename.framesAreRenamed ? values[1] : frames[values[1].GetInt()];
int amountOfBlendFrames = values[2].GetInt(); int amountOfBlendFrames = values.Count() == 3 ? values[2].GetInt() : (int)Interpolate.currentSettings.interpFactor - 1;
string img1 = Path.Combine(Interpolate.currentSettings.framesFolder, frameFrom); string img1 = Path.Combine(Interpolate.currentSettings.framesFolder, frameFrom);
string img2 = Path.Combine(Interpolate.currentSettings.framesFolder, frameTo); string img2 = Path.Combine(Interpolate.currentSettings.framesFolder, frameTo);
@@ -87,7 +87,7 @@ namespace Flowframes.Magick
} }
catch (Exception e) catch (Exception e)
{ {
Logger.Log("Failed to blend scene changes: " + e.Message, true); Logger.Log($"Failed to blend scene changes: {e.Message}\n{e.StackTrace}", true);
} }
} }