[Bf-blender-cvs] [fbc5b6b2069] temp-geometry-nodes-mix-attributes: fix merge conflict

[Jacques Lucke]

Commit: fbc5b6b2069efd2e7952785de0eda8fb67fe9946
Author: Jacques Lucke
Date:   Wed Dec 9 16:35:10 2020 +0100
Branches: temp-geometry-nodes-mix-attributes
https://developer.blender.org/rBfbc5b6b2069efd2e7952785de0eda8fb67fe9946

fix merge conflict

===================================================================

M	source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc

===================================================================

diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc
index 2635538a73d..f96bc9f9e15 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc
@@ -194,9 +194,12 @@ static void geo_node_attribute_mix_init(bNodeTree *UNUSED(ntree), bNode *node)
 static void geo_node_attribute_mix_update(bNodeTree *UNUSED(ntree), bNode *node)
 {
   NodeAttributeMix *node_storage = (NodeAttributeMix *)node->storage;
-  update_attribute_input_socket_availabilities(*node, "Factor", node_storage->input_type_factor);
-  update_attribute_input_socket_availabilities(*node, "A", node_storage->input_type_a);
-  update_attribute_input_socket_availabilities(*node, "B", node_storage->input_type_b);
+  update_attribute_input_socket_availabilities(
+      *node, "Factor", (GeometryNodeAttributeInputMode)node_storage->input_type_factor);
+  update_attribute_input_socket_availabilities(
+      *node, "A", (GeometryNodeAttributeInputMode)node_storage->input_type_a);
+  update_attribute_input_socket_availabilities(
+      *node, "B", (GeometryNodeAttributeInputMode)node_storage->input_type_b);
 }
 
 }  // namespace blender::nodes