[Bf-blender-cvs] [a9ba86c0469] temp-geometry-nodes-viewer-node: Merge branch 'master' into temp-geometry-nodes-viewer-node

[Jacques Lucke]

Commit: a9ba86c0469a400d91486f5a42162fa544b9871a
Author: Jacques Lucke
Date:   Wed Jun 2 12:17:08 2021 +0200
Branches: temp-geometry-nodes-viewer-node
https://developer.blender.org/rBa9ba86c0469a400d91486f5a42162fa544b9871a

Merge branch 'master' into temp-geometry-nodes-viewer-node

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index 34665806547,00111910d66..daee52028c8
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1430,7 -1430,7 +1430,8 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_INPUT_MATERIAL 1050
  #define GEO_NODE_MATERIAL_REPLACE 1051
  #define GEO_NODE_MESH_TO_CURVE 1052
- #define GEO_NODE_VIEWER 1053
+ #define GEO_NODE_DELETE_GEOMETRY 1053
++#define GEO_NODE_VIEWER 1054
  
  /** \} */