[Bf-blender-cvs] [4bdb67d5c0d] geometry-nodes-point-separate-node: Merge branch 'master' into geometry-nodes-point-separate-node

[Hans Goudey]

Commit: 4bdb67d5c0d4d88646f617e2f8f3be766edfad9f
Author: Hans Goudey
Date:   Thu Dec 10 08:55:44 2020 -0600
Branches: geometry-nodes-point-separate-node
https://developer.blender.org/rB4bdb67d5c0d4d88646f617e2f8f3be766edfad9f

Merge branch 'master' into geometry-nodes-point-separate-node

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



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

diff --cc release/scripts/startup/nodeitems_builtins.py
index e624b4e5d1b,df98645aee0..85f0f035a9c
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@@ -483,7 -483,7 +483,8 @@@ geometry_node_categories = 
      GeometryNodeCategory("GEO_ATTRIBUTE", "Attribute", items=[
          NodeItem("GeometryNodeRandomAttribute"),
          NodeItem("GeometryNodeAttributeMath"),
 +        NodeItem("GeometryNodeAttributeCompare"),
+         NodeItem("GeometryNodeAttributeFill"),
      ]),
      GeometryNodeCategory("GEO_COLOR", "Color", items=[
          NodeItem("ShaderNodeValToRGB"),
diff --cc source/blender/blenkernel/BKE_node.h
index 9f15b7f5d62,56ed60c1f67..84ceed49674
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1350,8 -1350,7 +1350,9 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_RANDOM_ATTRIBUTE 1008
  #define GEO_NODE_ATTRIBUTE_MATH 1009
  #define GEO_NODE_JOIN_GEOMETRY 1010
- #define GEO_NODE_POINT_SEPARATE 1011
- #define GEO_NODE_ATTRIBUTE_COMPARE 1012
+ #define GEO_NODE_ATTRIBUTE_FILL 1011
++#define GEO_NODE_POINT_SEPARATE 1012
++#define GEO_NODE_ATTRIBUTE_COMPARE 1013
  
  /** \} */
  
diff --cc source/blender/editors/space_node/drawnode.c
index 2f84bc668e6,2ff32a4a82e..606583922f8
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@@ -3209,9 -3208,9 +3217,12 @@@ static void node_geometry_set_butfunc(b
      case GEO_NODE_ATTRIBUTE_MATH:
        ntype->draw_buttons = node_geometry_buts_attribute_math;
        break;
 +    case GEO_NODE_ATTRIBUTE_COMPARE:
 +      ntype->draw_buttons = node_geometry_buts_attribute_compare;
 +      break;
+     case GEO_NODE_ATTRIBUTE_FILL:
+       ntype->draw_buttons = node_geometry_buts_attribute_fill;
+       break;
    }
  }
  
diff --cc source/blender/nodes/CMakeLists.txt
index af34e1ec786,d09b1a8534d..3b2987d8fa8
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@@ -138,7 -138,7 +138,8 @@@ set(SR
    function/nodes/node_fn_switch.cc
    function/node_function_util.cc
  
 +  geometry/nodes/node_geo_attribute_compare.cc
+   geometry/nodes/node_geo_attribute_fill.cc
    geometry/nodes/node_geo_attribute_math.cc
    geometry/nodes/node_geo_common.cc
    geometry/nodes/node_geo_boolean.cc
diff --cc source/blender/nodes/NOD_static_types.h
index 982fe2bf05a,8ca978d1339..90a5ddc54dc
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@@ -277,8 -277,7 +277,9 @@@ DefNode(GeometryNode, GEO_NODE_OBJECT_I
  DefNode(GeometryNode, GEO_NODE_RANDOM_ATTRIBUTE, def_geo_random_attribute, "RANDOM_ATTRIBUTE", RandomAttribute, "Random Attribute", "")
  DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_MATH, def_geo_attribute_math, "ATTRIBUTE_MATH", AttributeMath, "Attribute Math", "")
  DefNode(GeometryNode, GEO_NODE_JOIN_GEOMETRY, 0, "JOIN_GEOMETRY", JoinGeometry, "Join Geometry", "")
+ DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_FILL, def_geo_attribute_fill, "ATTRIBUTE_FILL", AttributeFill, "Attribute Fill", "")
 +DefNode(GeometryNode, GEO_NODE_POINT_SEPARATE, 0, "POINT_SEPARATE", PointSeparate, "Point Separate", "")
 +DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_COMPARE, def_geo_attribute_attribute_compare, "ATTRIBUTE_COMPARE", AttributeCompare, "Attribute Compare", "")
  
  /* undefine macros */
  #undef DefNode