X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fproducer%2Fframe%2Fframe_transform.cpp;h=a608973ab6acce6b5f2669960cde72476c4c96eb;hb=116e09a218cf056e4de868454b0fe26dc4db1413;hp=60d93a1aaa8b4424efc63701ff65b646c93f74d0;hpb=a8e71e9b2452413398ac10f0b6e2dea41cecdec5;p=casparcg

diff --git a/core/producer/frame/frame_transform.cpp b/core/producer/frame/frame_transform.cpp
index 60d93a1aa..a608973ab 100644
--- a/core/producer/frame/frame_transform.cpp
+++ b/core/producer/frame/frame_transform.cpp
@@ -34,6 +34,7 @@ frame_transform::frame_transform()
 	, saturation(1.0)
 	, field_mode(field_mode::progressive)
 	, is_key(false)
+	, is_mix(false)
 {
 	std::fill(fill_translation.begin(), fill_translation.end(), 0.0);
 	std::fill(fill_scale.begin(), fill_scale.end(), 1.0);
@@ -63,6 +64,7 @@ frame_transform& frame_transform::operator*=(const frame_transform &other)
 	levels.gamma			*= other.levels.gamma;
 	field_mode				 = static_cast<field_mode::type>(field_mode & other.field_mode);
 	is_key					|= other.is_key;
+	is_mix					|= other.is_mix;
 	return *this;
 }
 
@@ -99,6 +101,7 @@ frame_transform tween(double time, const frame_transform& source, const frame_tr
 	result.levels.gamma			= do_tween(time, source.levels.gamma,			dest.levels.gamma,			duration, tweener);
 	result.field_mode			= static_cast<field_mode::type>(source.field_mode & dest.field_mode);
 	result.is_key				= source.is_key | dest.is_key;
+	result.is_mix				= source.is_mix | dest.is_mix;
 	
 	return result;
 }