[Bf-blender-cvs] [dc0c71d3ae7] temp-geometry-nodes-curve-sample: Merge branch 'master' into temp-geometry-nodes-curve-sample

[Hans Goudey]

Commit: dc0c71d3ae772c9afdec0718ae135b9b91f57e8b
Author: Hans Goudey
Date:   Wed Jul 14 16:07:36 2021 -0400
Branches: temp-geometry-nodes-curve-sample
https://developer.blender.org/rBdc0c71d3ae772c9afdec0718ae135b9b91f57e8b

Merge branch 'master' into temp-geometry-nodes-curve-sample

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index 61d26379052,b1a38ec5700..5e977fbc0cd
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1458,7 -1458,7 +1458,8 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_VIEWER 1067
  #define GEO_NODE_CURVE_PRIMITIVE_LINE 1068
  #define GEO_NODE_CURVE_ENDPOINTS 1069
- #define GEO_NODE_CURVE_SAMPLE 1070
+ #define GEO_NODE_CURVE_PRIMITIVE_QUADRILATERAL 1070
++#define GEO_NODE_CURVE_SAMPLE 1071
  
  /** \} */
  
diff --cc source/blender/blenkernel/intern/node.cc
index 55882f961a2,e4c259ec9fc..715c2fa91d2
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@@ -5121,11 -5112,9 +5112,12 @@@ static void registerGeometryNodes(
    register_node_type_geo_curve_primitive_circle();
    register_node_type_geo_curve_primitive_line();
    register_node_type_geo_curve_primitive_quadratic_bezier();
+   register_node_type_geo_curve_primitive_quadrilateral();
    register_node_type_geo_curve_primitive_spiral();
    register_node_type_geo_curve_primitive_star();
 +  register_node_type_geo_curve_sample();
 +  register_node_type_geo_curve_to_mesh();
 +  register_node_type_geo_curve_to_points();
    register_node_type_geo_curve_resample();
    register_node_type_geo_curve_reverse();
    register_node_type_geo_curve_subdivide();
diff --cc source/blender/makesdna/DNA_node_types.h
index 9af77949fe2,5e4692481ba..1f75006bd07
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@@ -1373,8 -1370,13 +1370,13 @@@ typedef struct NodeGeometryCurvePrimiti
    uint8_t mode;
  } NodeGeometryCurvePrimitiveCircle;
  
+ typedef struct NodeGeometryCurvePrimitiveQuad {
+   /* GeometryNodeCurvePrimitiveQuadMode. */
+   uint8_t mode;
+ } NodeGeometryCurvePrimitiveQuad;
+ 
  typedef struct NodeGeometryCurveResample {
 -  /* GeometryNodeCurveSampleMode. */
 +  /* GeometryNodeCurveResampleMode. */
    uint8_t mode;
  } NodeGeometryCurveResample;
  
diff --cc source/blender/nodes/CMakeLists.txt
index a7640d6cacd,dc19508be04..09085ac8799
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@@ -170,11 -170,9 +170,12 @@@ set(SR
    geometry/nodes/node_geo_curve_primitive_circle.cc
    geometry/nodes/node_geo_curve_primitive_line.cc
    geometry/nodes/node_geo_curve_primitive_quadratic_bezier.cc
+   geometry/nodes/node_geo_curve_primitive_quadrilateral.cc
    geometry/nodes/node_geo_curve_primitive_spiral.cc
    geometry/nodes/node_geo_curve_primitive_star.cc
 +  geometry/nodes/node_geo_curve_sample.cc
 +  geometry/nodes/node_geo_curve_to_mesh.cc
 +  geometry/nodes/node_geo_curve_to_points.cc
    geometry/nodes/node_geo_curve_resample.cc
    geometry/nodes/node_geo_curve_reverse.cc
    geometry/nodes/node_geo_curve_subdivide.cc
diff --cc source/blender/nodes/NOD_geometry.h
index 9346a3ae5a8,ad3a838f4c0..8a2b77118e5
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@@ -57,11 -57,9 +57,12 @@@ void register_node_type_geo_curve_primi
  void register_node_type_geo_curve_primitive_circle(void);
  void register_node_type_geo_curve_primitive_line(void);
  void register_node_type_geo_curve_primitive_quadratic_bezier(void);
+ void register_node_type_geo_curve_primitive_quadrilateral(void);
  void register_node_type_geo_curve_primitive_spiral(void);
  void register_node_type_geo_curve_primitive_star(void);
 +void register_node_type_geo_curve_sample(void);
 +void register_node_type_geo_curve_to_mesh(void);
 +void register_node_type_geo_curve_to_points(void);
  void register_node_type_geo_curve_resample(void);
  void register_node_type_geo_curve_reverse(void);
  void register_node_type_geo_curve_subdivide(void);