[Bf-blender-cvs] [402422e8ab9] soc-2021-porting-modifiers-to-nodes-decimate: Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-decimate

[Fabian Schempp]

Commit: 402422e8ab9495d951cff8386c5cfefc2528ebf8
Author: Fabian Schempp
Date:   Tue Jul 6 22:26:09 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-decimate
https://developer.blender.org/rB402422e8ab9495d951cff8386c5cfefc2528ebf8

Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-decimate

# Conflicts:
#	source/blender/blenkernel/BKE_node.h
#	source/blender/blenkernel/intern/node.cc
#	source/blender/nodes/CMakeLists.txt
#	source/blender/nodes/NOD_geometry.h
#	source/blender/nodes/NOD_static_types.h

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index fb8361dbaf0,301fe875d79..76d7cef88ce
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1444,9 -1455,9 +1455,11 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_CURVE_PRIMITIVE_QUADRATIC_BEZIER 1064
  #define GEO_NODE_CURVE_PRIMITIVE_BEZIER_SEGMENT 1065
  #define GEO_NODE_CURVE_PRIMITIVE_CIRCLE 1066
- #define GEO_NODE_COLLAPSE 1067
- #define GEO_NODE_UNSUBDIVIDE 1068
- #define GEO_NODE_DISSOLVE 1069
+ #define GEO_NODE_VIEWER 1067
+ #define GEO_NODE_CURVE_PRIMITIVE_LINE 1068
 -
++#define GEO_NODE_COLLAPSE 1069
++#define GEO_NODE_UNSUBDIVIDE 1070
++#define GEO_NODE_DISSOLVE 1071
  /** \} */
  
  /* -------------------------------------------------------------------- */
diff --cc source/blender/blenkernel/intern/node.cc
index ed8049e602e,6a6cc3ffaad..d872a520207
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@@ -5099,7 -5160,7 +5162,8 @@@ static void registerGeometryNodes(
    register_node_type_geo_switch();
    register_node_type_geo_transform();
    register_node_type_geo_triangulate();
 +  register_node_type_geo_unsubdivide();
+   register_node_type_geo_viewer();
    register_node_type_geo_volume_to_mesh();
  }
  
diff --cc source/blender/makesrna/intern/rna_modifier.c
index c37e1158614,7def9bdb636..18a70578aa4
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@@ -2243,21 -2244,20 +2244,21 @@@ static void rna_def_modifier_mirror(Ble
    RNA_define_lib_overridable(false);
  }
  
 +const EnumPropertyItem modifier_decim_mode_items[] = {
 +    {MOD_DECIM_MODE_COLLAPSE, "COLLAPSE", 0, "Collapse", "Use edge collapsing"},
 +    {MOD_DECIM_MODE_UNSUBDIV, "UNSUBDIV", 0, "Un-Subdivide", "Use un-subdivide face reduction"},
 +    {MOD_DECIM_MODE_DISSOLVE,
 +                              "DISSOLVE",
 +                                          0,
 +                                             "Planar",
 +        "Dissolve geometry to form planar polygons"},
 +    {0, NULL, 0, NULL, NULL},
 +};
 +
  static void rna_def_modifier_decimate(BlenderRNA *brna)
  {
 -  static const EnumPropertyItem modifier_decim_mode_items[] = {
 -      {MOD_DECIM_MODE_COLLAPSE, "COLLAPSE", 0, "Collapse", "Use edge collapsing"},
 -      {MOD_DECIM_MODE_UNSUBDIV, "UNSUBDIV", 0, "Un-Subdivide", "Use un-subdivide face reduction"},
 -      {MOD_DECIM_MODE_DISSOLVE,
 -       "DISSOLVE",
 -       0,
 -       "Planar",
 -       "Dissolve geometry to form planar polygons"},
 -      {0, NULL, 0, NULL, NULL},
 -  };
  
-   /* Note, keep in sync with operator 'MESH_OT_decimate' */
+   /* NOTE: keep in sync with operator 'MESH_OT_decimate'. */
  
    StructRNA *srna;
    PropertyRNA *prop;
diff --cc source/blender/nodes/CMakeLists.txt
index 65077264000,74ba85426c6..ac7ffca8f59
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@@ -208,7 -208,7 +210,8 @@@ set(SR
    geometry/nodes/node_geo_switch.cc
    geometry/nodes/node_geo_transform.cc
    geometry/nodes/node_geo_triangulate.cc
 +  geometry/nodes/node_geo_unsubdivide.cc
+   geometry/nodes/node_geo_viewer.cc
    geometry/nodes/node_geo_volume_to_mesh.cc
    geometry/node_geometry_exec.cc
    geometry/node_geometry_tree.cc
diff --cc source/blender/nodes/NOD_geometry.h
index a4f22012538,99f95e7f07e..e341006ec1c
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@@ -98,7 -96,7 +99,8 @@@ void register_node_type_geo_subdivision
  void register_node_type_geo_switch(void);
  void register_node_type_geo_transform(void);
  void register_node_type_geo_triangulate(void);
 +void register_node_type_geo_unsubdivide(void);
+ void register_node_type_geo_viewer(void);
  void register_node_type_geo_volume_to_mesh(void);
  
  #ifdef __cplusplus
diff --cc source/blender/nodes/NOD_static_types.h
index d1e0974a766,2d15fcca24b..f0981eb2df8
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@@ -335,7 -335,7 +337,8 @@@ DefNode(GeometryNode, GEO_NODE_SUBDIVIS
  DefNode(GeometryNode, GEO_NODE_SWITCH, def_geo_switch, "SWITCH", Switch, "Switch", "")
  DefNode(GeometryNode, GEO_NODE_TRANSFORM, 0, "TRANSFORM", Transform, "Transform", "")
  DefNode(GeometryNode, GEO_NODE_TRIANGULATE, def_geo_triangulate, "TRIANGULATE", Triangulate, "Triangulate", "")
 +DefNode(GeometryNode, GEO_NODE_UNSUBDIVIDE, 0, "UNSUBDIVIDE", Unsubdivide, "Unsubdivide", "")
+ DefNode(GeometryNode, GEO_NODE_VIEWER, 0, "VIEWER", Viewer, "Viewer", "")
  DefNode(GeometryNode, GEO_NODE_VOLUME_TO_MESH, def_geo_volume_to_mesh, "VOLUME_TO_MESH", VolumeToMesh, "Volume to Mesh", "")
  
  /* undefine macros */