[Bf-blender-cvs] [1e29f64987a] geometry-nodes-mesh-primitives: Merge branch 'master' into geometry-nodes-mesh-primitives

[Hans Goudey]

Commit: 1e29f64987aaf26dccc798e12c037fa7313194eb
Author: Hans Goudey
Date:   Sat Mar 13 15:17:53 2021 -0500
Branches: geometry-nodes-mesh-primitives
https://developer.blender.org/rB1e29f64987aaf26dccc798e12c037fa7313194eb

Merge branch 'master' into geometry-nodes-mesh-primitives

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index 7da4c8c1f4e,0379dea9e8c..d65c7e81009
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1373,12 -1373,7 +1373,13 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_ATTRIBUTE_SEPARATE_XYZ 1028
  #define GEO_NODE_SUBDIVIDE 1029
  #define GEO_NODE_ATTRIBUTE_REMOVE 1030
- #define GEO_NODE_MESH_PRIMITIVE_CUBE 1031
- #define GEO_NODE_MESH_PRIMITIVE_CIRCLE 1032
- #define GEO_NODE_MESH_PRIMITIVE_UV_SPHERE 1033
- #define GEO_NODE_MESH_PRIMITIVE_CYLINDER 1034
- #define GEO_NODE_MESH_PRIMITIVE_ICO_SPHERE 1035
- #define GEO_NODE_MESH_PRIMITIVE_CONE 1036
+ #define GEO_NODE_ATTRIBUTE_CONVERT 1031
++#define GEO_NODE_MESH_PRIMITIVE_CUBE 1032
++#define GEO_NODE_MESH_PRIMITIVE_CIRCLE 1033
++#define GEO_NODE_MESH_PRIMITIVE_UV_SPHERE 1034
++#define GEO_NODE_MESH_PRIMITIVE_CYLINDER 1035
++#define GEO_NODE_MESH_PRIMITIVE_ICO_SPHERE 1036
++#define GEO_NODE_MESH_PRIMITIVE_CONE 1037
  
  /** \} */
  
diff --cc source/blender/makesdna/DNA_node_types.h
index e09a1ef38cf,ad1def0f3ec..96f1d9e25de
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@@ -1221,26 -1221,19 +1221,34 @@@ typedef struct NodeAttributeCombineXYZ 
    char _pad[1];
  } NodeAttributeCombineXYZ;
  
 -typedef struct NodeAttributeSeparateXYZ {
 -  /* GeometryNodeAttributeInputMode. */
 -  uint8_t input_type;
 -} NodeAttributeSeparateXYZ;
 -
+ typedef struct NodeAttributeConvert {
+   /* CustomDataType. */
+   uint8_t data_type;
+   char _pad[1];
+   /* AttributeDomain. */
+   int16_t domain;
+ } NodeAttributeConvert;
+ 
 +typedef struct NodeAttributeSeparateXYZ {
 +  /* GeometryNodeAttributeInputMode. */
 +  uint8_t input_type;
 +} NodeAttributeSeparateXYZ;
 +
 +typedef struct NodeGeometryMeshCircle {
 +  /* GeometryNodeMeshCircleFillType. */
 +  uint8_t fill_type;
 +} NodeGeometryMeshCircle;
 +
 +typedef struct NodeGeometryMeshCylinder {
 +  /* GeometryNodeMeshCircleFillType. */
 +  uint8_t fill_type;
 +} NodeGeometryMeshCylinder;
 +
 +typedef struct NodeGeometryMeshCone {
 +  /* GeometryNodeMeshCircleFillType. */
 +  uint8_t fill_type;
 +} NodeGeometryMeshCone;
 +
  /* script node mode */
  #define NODE_SCRIPT_INTERNAL 0
  #define NODE_SCRIPT_EXTERNAL 1
diff --cc source/blender/nodes/NOD_static_types.h
index cc05c221820,493aaa05675..147a4a496b0
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@@ -300,12 -300,7 +300,13 @@@ DefNode(GeometryNode, GEO_NODE_ATTRIBUT
  DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_SEPARATE_XYZ, def_geo_attribute_separate_xyz, "ATTRIBUTE_SEPARATE_XYZ", AttributeSeparateXYZ, "Attribute Separate XYZ", "")
  DefNode(GeometryNode, GEO_NODE_SUBDIVIDE, 0, "SUBDIVIDE", Subdivide, "Subdivide", "")
  DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_REMOVE, 0, "ATTRIBUTE_REMOVE", AttributeRemove, "Attribute Remove", "")
+ DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_CONVERT, def_geo_attribute_convert, "ATTRIBUTE_CONVERT", AttributeConvert, "Attribute Convert", "")
 +DefNode(GeometryNode, GEO_NODE_MESH_PRIMITIVE_CUBE, 0, "MESH_PRIMITIVE_CUBE", MeshCube, "Cube", "")
 +DefNode(GeometryNode, GEO_NODE_MESH_PRIMITIVE_CIRCLE, def_geo_mesh_circle, "MESH_PRIMITIVE_CIRCLE", MeshCircle, "Circle", "")
 +DefNode(GeometryNode, GEO_NODE_MESH_PRIMITIVE_UV_SPHERE, 0, "MESH_PRIMITIVE_UV_SPHERE", MeshUVSphere, "UV Sphere", "")
 +DefNode(GeometryNode, GEO_NODE_MESH_PRIMITIVE_CYLINDER, def_geo_mesh_cylinder, "MESH_PRIMITIVE_CYLINDER", MeshCylinder, "Cylinder", "")
 +DefNode(GeometryNode, GEO_NODE_MESH_PRIMITIVE_ICO_SPHERE, 0, "MESH_PRIMITIVE_ICO_SPHERE", MeshIcoSphere, "Ico Sphere", "")
 +DefNode(GeometryNode, GEO_NODE_MESH_PRIMITIVE_CONE, def_geo_mesh_cone, "MESH_PRIMITIVE_CONE", MeshCone, "Cone", "")
  
  /* undefine macros */
  #undef DefNode