[Bf-blender-cvs] [3059f1743ee] geometry-nodes-simulation: Merge branch 'master' into geometry-nodes-simulation

[Hans Goudey]

Commit: 3059f1743ee839ad469ddce07652aabf85b37336
Author: Hans Goudey
Date:   Thu Dec 1 15:45:46 2022 -0600
Branches: geometry-nodes-simulation
https://developer.blender.org/rB3059f1743ee839ad469ddce07652aabf85b37336

Merge branch 'master' into geometry-nodes-simulation

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index 62ddf695f94,74d6f8becd1..583993bd1ad
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1388,11 -1386,8 +1386,11 @@@ struct TexResult
  /** \name Geometry Nodes
   * \{ */
  
 +#define GEO_NODE_SIMULATION_INPUT 1198
 +#define GEO_NODE_SIMULATION_OUTPUT 1199
 +
  #define GEO_NODE_TRIANGULATE 1000
- #define GEO_NODE_TRANSFORM 1002
+ #define GEO_NODE_TRANSFORM_GEOMETRY 1002
  #define GEO_NODE_MESH_BOOLEAN 1003
  #define GEO_NODE_OBJECT_INFO 1007
  #define GEO_NODE_JOIN_GEOMETRY 1010
diff --cc source/blender/editors/space_node/node_draw.cc
index f30c9b0d563,be778a75039..9bda8e271c8
--- a/source/blender/editors/space_node/node_draw.cc
+++ b/source/blender/editors/space_node/node_draw.cc
@@@ -79,8 -77,8 +79,10 @@@
  #include "FN_field.hh"
  #include "FN_field_cpp_type.hh"
  
 +#include "GEO_fillet_curves.hh"
 +
+ #include "../interface/interface_intern.hh" /* TODO: Remove */
+ 
  #include "node_intern.hh" /* own include */
  
  namespace geo_log = blender::nodes::geo_eval_log;
@@@ -88,20 -86,6 +90,14 @@@
  using blender::GPointer;
  using blender::Vector;
  
- extern "C" {
- /* XXX interface.h */
- extern void ui_draw_dropshadow(
-     const rctf *rct, float radius, float aspect, float alpha, int select);
- }
- 
 +namespace blender::ed::space_node {
 +struct SubContext {
 +  float3 color;
 +  Vector<const bNode *> input_nodes;
 +  Vector<const bNode *> output_nodes;
 +};
 +}  // namespace blender::ed::space_node
 +
  /**
   * This is passed to many functions which draw the node editor.
   */