blender
/
blender
134
401
Fork 584
Code Issues 6.3k Pull Requests 760 Projects 19 Wiki Activity

Cleanup: Use shorter enum names 

With the full node name at the beginning, these names can get quite long.
Slightly different words shorten them just a bit.
This commit is contained in:
Hans Goudey 2021-02-22 23:33:04 -06:00
parent 82605093e9
commit bfb2e87a9e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/makesdna/DNA_node_types.h
View File

@ -1203,7 +1203,7 @@ typedef struct NodeGeometryCollectionInfo {
} NodeGeometryCollectionInfo;
typedef struct NodeGeometryAttributeProximity {
/* GeometryNodeAttributeProximityTargetGeometryElement. */
/* GeometryNodeAttributeProximityTargetType. */
uint8_t target_geometry_element;
} NodeGeometryAttributeProximity;
@ -1613,11 +1613,11 @@ typedef enum NodeShaderOutputTarget {
/* Geometry Nodes */
typedef enum GeometryNodeAttributeProximityTargetGeometryElement {
typedef enum GeometryNodeAttributeProximityTargetType {
GEO_NODE_ATTRIBUTE_PROXIMITY_TARGET_GEOMETRY_ELEMENT_POINTS = 0,
GEO_NODE_ATTRIBUTE_PROXIMITY_TARGET_GEOMETRY_ELEMENT_EDGES = 1,
GEO_NODE_ATTRIBUTE_PROXIMITY_TARGET_GEOMETRY_ELEMENT_FACES = 2,
} GeometryNodeAttributeProximityTargetGeometryElement;
} GeometryNodeAttributeProximityTargetType;
/* Boolean Node */
typedef enum GeometryNodeBooleanOperation {
@ -1657,10 +1657,10 @@ typedef enum GeometryNodeAttributeInputMode {
GEO_NODE_ATTRIBUTE_INPUT_INTEGER = 5,
} GeometryNodeAttributeInputMode;
typedef enum GeometryNodePointDistributeMethod {
typedef enum GeometryNodePointDistributeMode {
GEO_NODE_POINT_DISTRIBUTE_RANDOM = 0,
GEO_NODE_POINT_DISTRIBUTE_POISSON = 1,
} GeometryNodePointDistributeMethod;
} GeometryNodePointDistributeMode;
typedef enum GeometryNodeRotatePointsType {
GEO_NODE_POINT_ROTATE_TYPE_EULER = 0,

4
source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc
View File

@ -425,8 +425,8 @@ static void geo_node_point_distribute_exec(GeoNodeExecParams params)
/* TODO: This node only needs read-only access to input instances. */
geometry_set = geometry_set_realize_instances(geometry_set);
GeometryNodePointDistributeMethod distribute_method =
static_cast<GeometryNodePointDistributeMethod>(params.node().custom1);
GeometryNodePointDistributeMode distribute_method = static_cast<GeometryNodePointDistributeMode>(
params.node().custom1);
if (!geometry_set.has_mesh()) {
params.error_message_add(NodeWarningType::Error, "Geometry must contain a mesh.");