Commit: 9b2b6674ba18cedc836a7b50450485334d6e028d Author: Hans Goudey Date: Sat Mar 13 09:14:22 2021 -0500 Branches: geometry-nodes-mesh-primitives https://developer.blender.org/rB9b2b6674ba18cedc836a7b50450485334d6e028d
Merge branch 'master' into geometry-nodes-mesh-primitives =================================================================== =================================================================== diff --cc source/blender/blenkernel/BKE_node.h index ba55b2bc02a,2c543a0a014..7da4c8c1f4e --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@@ -1372,12 -1372,7 +1372,13 @@@ int ntreeTexExecTree(struct bNodeTree * #define GEO_NODE_ATTRIBUTE_COMBINE_XYZ 1027 #define GEO_NODE_ATTRIBUTE_SEPARATE_XYZ 1028 #define GEO_NODE_SUBDIVIDE 1029 - #define GEO_NODE_MESH_PRIMITIVE_CUBE 1030 - #define GEO_NODE_MESH_PRIMITIVE_CIRCLE 1031 - #define GEO_NODE_MESH_PRIMITIVE_UV_SPHERE 1032 - #define GEO_NODE_MESH_PRIMITIVE_CYLINDER 1033 - #define GEO_NODE_MESH_PRIMITIVE_ICO_SPHERE 1034 - #define GEO_NODE_MESH_PRIMITIVE_CONE 1035 + #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 /** \} */ diff --cc source/blender/nodes/NOD_static_types.h index c5a1ec1a786,6669f47c6aa..cc05c221820 --- a/source/blender/nodes/NOD_static_types.h +++ b/source/blender/nodes/NOD_static_types.h @@@ -299,12 -299,7 +299,13 @@@ DefNode(GeometryNode, GEO_NODE_VOLUME_T DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_COMBINE_XYZ, def_geo_attribute_combine_xyz, "ATTRIBUTE_COMBINE_XYZ", AttributeCombineXYZ, "Attribute Combine XYZ", "") 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_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 _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
