[Bf-blender-cvs] [36de2908079] temp-geometry-nodes-fields-prototype: Fix incorrect SOCK_FIELD cases

[Hans Goudey]

Commit: 36de2908079531850876a260d8331ce4bae95127
Author: Hans Goudey
Date:   Fri Aug 6 16:58:24 2021 -0500
Branches: temp-geometry-nodes-fields-prototype
https://developer.blender.org/rB36de2908079531850876a260d8331ce4bae95127

Fix incorrect SOCK_FIELD cases

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

M	source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc
M	source/blender/nodes/geometry/nodes/node_geo_point_instance.cc

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

diff --git a/source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc b/source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc
index b76c1f8f955..a8c9fcea717 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc
@@ -42,7 +42,7 @@ using blender::bke::GeometryInstanceGroup;
 static bNodeSocketTemplate geo_node_point_distribute_in[] = {
     {SOCK_GEOMETRY, N_("Geometry")},
     {SOCK_FLOAT, N_("Distance Min"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 100000.0f, PROP_DISTANCE},
-    {SOCK_FLOAT, N_("Density"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 100000.0f, PROP_NONE | SOCK_FIELD},
+    {SOCK_FLOAT, N_("Density"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 100000.0f, PROP_NONE, SOCK_FIELD},
     {SOCK_INT, N_("Seed"), 0, 0, 0, 0, -10000, 10000},
     {-1, ""},
 };
diff --git a/source/blender/nodes/geometry/nodes/node_geo_point_instance.cc b/source/blender/nodes/geometry/nodes/node_geo_point_instance.cc
index 23d3a73112c..ea810295f70 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_point_instance.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_point_instance.cc
@@ -56,17 +56,10 @@ static bNodeSocketTemplate geo_node_point_instance_in[] = {
      0.0f,
      -10000.0f,
      10000.0f,
-     PROP_EULER | SOCK_FIELD},
-    {SOCK_VECTOR,
-     N_("Scale"),
-     1.0f,
-     1.0f,
-     1.0f,
-     0.0f,
-     -10000.0f,
-     10000.0f,
-     PROP_NONE | SOCK_FIELD},
-    {SOCK_INT, N_("ID"), -1.0f, 0.0f, 0.0f, 0.0f, -10000.0f, 10000.0f, PROP_NONE | SOCK_FIELD},
+     PROP_EULER,
+     SOCK_FIELD},
+    {SOCK_VECTOR, N_("Scale"), 1.0f, 1.0f, 1.0f, 0.0f, -10000.0f, 10000.0f, PROP_NONE, SOCK_FIELD},
+    {SOCK_INT, N_("ID"), -1.0f, 0.0f, 0.0f, 0.0f, -10000.0f, 10000.0f, PROP_NONE, SOCK_FIELD},
     {-1, ""},
 };