[Bf-blender-cvs] [0617efd51b0] master: Merge branch 'blender-v3.1-release'

[Philipp Oeser]

Commit: 0617efd51b0ae3fa387ee0366a453040d899f318
Author: Philipp Oeser
Date:   Tue Feb 8 10:26:42 2022 +0100
Branches: master
https://developer.blender.org/rB0617efd51b0ae3fa387ee0366a453040d899f318

Merge branch 'blender-v3.1-release'

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



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

diff --cc source/blender/editors/space_node/node_intern.hh
index f6397baf9f2,95f771cc00b..51825f5bd39
--- a/source/blender/editors/space_node/node_intern.hh
+++ b/source/blender/editors/space_node/node_intern.hh
@@@ -130,7 -114,15 +130,9 @@@ ENUM_OPERATORS(NodeResizeDirection, NOD
   */
  float2 space_node_group_offset(const SpaceNode &snode);
  
 -float node_socket_calculate_height(const bNodeSocket &socket);
 -float2 node_link_calculate_multi_input_position(const float2 &socket_position,
 -                                                int index,
 -                                                int total_inputs);
 -
+ rctf node_frame_rect_inside(const bNode &node);
+ 
  int node_get_resize_cursor(NodeResizeDirection directions);
 -NodeResizeDirection node_get_resize_direction(const bNode *node, int x, int y);
  /**
   * Usual convention here would be #node_socket_get_color(),
   * but that's already used (for setting a color property socket).