Merge branch 'master' into blender2.8

1 files changed, 11 insertions, 0 deletions

diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c b/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
index d712f921ba3..27b1fff321e 100644
--- a/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
+++ b/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
@@ -46,6 +46,10 @@ static bNodeSocketTemplate cmp_node_sepycca_out[] = {
 	{  -1, 0, ""   }
 };
 
+static void node_composit_init_mode_sepycca(bNodeTree *UNUSED(ntree), bNode *node)
+{
+	node->custom1 = 1; /* BLI_YCC_ITU_BT709 */
+}
 
 void register_node_type_cmp_sepycca(void)
 {
@@ -53,6 +57,7 @@ void register_node_type_cmp_sepycca(void)
 
 	cmp_node_type_base(&ntype, CMP_NODE_SEPYCCA, "Separate YCbCrA", NODE_CLASS_CONVERTOR, 0);
 	node_type_socket_templates(&ntype, cmp_node_sepycca_in, cmp_node_sepycca_out);
+	node_type_init(&ntype, node_composit_init_mode_sepycca);
 
 	nodeRegisterType(&ntype);
 }
@@ -72,12 +77,18 @@ static bNodeSocketTemplate cmp_node_combycca_out[] = {
 	{	-1, 0, ""	}
 };
 
+static void node_composit_init_mode_combycca(bNodeTree *UNUSED(ntree), bNode *node)
+{
+	node->custom1 = 1; /* BLI_YCC_ITU_BT709 */
+}
+
 void register_node_type_cmp_combycca(void)
 {
 	static bNodeType ntype;
 
 	cmp_node_type_base(&ntype, CMP_NODE_COMBYCCA, "Combine YCbCrA", NODE_CLASS_CONVERTOR, 0);
 	node_type_socket_templates(&ntype, cmp_node_combycca_in, cmp_node_combycca_out);
+	node_type_init(&ntype, node_composit_init_mode_combycca);
 
 	nodeRegisterType(&ntype);
 }