[mixer] #600 Removed is_still handling completely which fixes the incorrect 25p anima...

[casparcg] / core / frame / frame_transform.cpp

diff --git a/core/frame/frame_transform.cpp b/core/frame/frame_transform.cpp
index aba667b59324e8fa71ad9e9d690ad36c30c470e4..a7a4ea186ea7f0f354d57035f64f315d36844ee4 100644 (file)
--- a/core/frame/frame_transform.cpp
+++ b/core/frame/frame_transform.cpp
@@ -103,7 +103,6 @@ image_transform& image_transform::operator*=(const image_transform &other)
        field_mode                                                       = field_mode & other.field_mode;
        is_key                                                          |= other.is_key;
        is_mix                                                          |= other.is_mix;
-       is_still                                                        |= other.is_still;
        use_mipmap                                                      |= other.use_mipmap;
        blend_mode                                                       = std::max(blend_mode, other.blend_mode);
        layer_depth                                                     += other.layer_depth;
@@ -176,7 +175,6 @@ image_transform image_transform::tween(double time, const image_transform& sourc
        result.field_mode                                               = source.field_mode & dest.field_mode;
        result.is_key                                                   = source.is_key | dest.is_key;
        result.is_mix                                                   = source.is_mix | dest.is_mix;
-       result.is_still                                                 = source.is_still | dest.is_still;
        result.use_mipmap                                               = source.use_mipmap | dest.use_mipmap;
        result.blend_mode                                               = std::max(source.blend_mode, dest.blend_mode);
        result.layer_depth                                              = dest.layer_depth;
@@ -224,7 +222,6 @@ bool operator==(const image_transform& lhs, const image_transform& rhs)
                lhs.field_mode == rhs.field_mode &&
                lhs.is_key == rhs.is_key &&
                lhs.is_mix == rhs.is_mix &&
-               lhs.is_still == rhs.is_still &&
                lhs.use_mipmap == rhs.use_mipmap &&
                lhs.blend_mode == rhs.blend_mode &&
                lhs.layer_depth == rhs.layer_depth &&