[Bf-blender-cvs] [bb960c85a55] geometry-nodes: Merge branch 'master' into geometry-nodes

[Jacques Lucke]

Commit: bb960c85a55b823ee2c76911992043ac8c4eedda
Author: Jacques Lucke
Date:   Thu Nov 19 17:38:48 2020 +0100
Branches: geometry-nodes
https://developer.blender.org/rBbb960c85a55b823ee2c76911992043ac8c4eedda

Merge branch 'master' into geometry-nodes

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



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

diff --cc source/blender/makesdna/DNA_node_types.h
index 35fc1b81ecf,a5869a74ffc..6de72fd996e
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@@ -1433,24 -1436,18 +1437,28 @@@ typedef enum NodeShaderOutputTarget 
    SHD_OUTPUT_CYCLES = 2,
  } NodeShaderOutputTarget;
  
 -/* Particle Time Step Event node */
 -typedef enum NodeSimParticleTimeStepEventType {
 -  NODE_PARTICLE_TIME_STEP_EVENT_BEGIN = 0,
 -  NODE_PARTICLE_TIME_STEP_EVENT_END = 1,
 -} NodeSimParticleTimeStepEventType;
 -
 -/* Simulation Time node */
 -typedef enum NodeSimInputTimeType {
 -  NODE_SIM_INPUT_SIMULATION_TIME = 0,
 -  NODE_SIM_INPUT_SCENE_TIME = 1,
 -} NodeSimInputTimeType;
 +/* Geometry Nodes */
 +
 +/* Boolean Node */
 +typedef enum GeometryNodeBooleanOperation {
 +  GEO_NODE_BOOLEAN_INTERSECT = 0,
 +  GEO_NODE_BOOLEAN_UNION = 1,
 +  GEO_NODE_BOOLEAN_DIFFERENCE = 2,
 +} GeometryNodeBooleanOperation;
 +
 +/* Triangulate Node */
 +typedef enum GeometryNodeTriangulateNGons {
 +  GEO_NODE_TRIANGULATE_NGON_BEAUTY = 0,
 +  GEO_NODE_TRIANGULATE_NGON_EARCLIP = 1,
 +} GeometryNodeTriangulateNGons;
 +
 +typedef enum GeometryNodeTriangulateQuads {
 +  GEO_NODE_TRIANGULATE_QUAD_BEAUTY = 0,
 +  GEO_NODE_TRIANGULATE_QUAD_FIXED = 1,
 +  GEO_NODE_TRIANGULATE_QUAD_ALTERNATE = 2,
 +  GEO_NODE_TRIANGULATE_QUAD_SHORTEDGE = 3,
 +} GeometryNodeTriangulateQuads;
+ 
+ #ifdef __cplusplus
+ }
+ #endif