Merge branch 'blender-v4.3-release'

source/blender/editors/include/ED_node.hh

@@ -25,6 +25,9 @@ struct uiLayout;
 
 namespace blender::ed::space_node {
 
+/** Update the active node tree based on the context. */
+void snode_set_context(const bContext &C);
+
 VectorSet<bNode *> get_selected_nodes(bNodeTree &node_tree);
 
 /**

source/blender/editors/space_node/node_intern.hh

@@ -336,8 +336,6 @@ float2 node_link_calculate_multi_input_position(const float2 &socket_position,
 
 float node_socket_calculate_height(const bNodeSocket &socket);
 
-void snode_set_context(const bContext &C);
-
 bool composite_node_active(bContext *C);
 /** Operator poll callback. */
 bool composite_node_editable(bContext *C);

source/blender/makesrna/intern/rna_screen.cc

@@ -19,6 +19,7 @@
 #include "DNA_workspace_types.h"
 
 #include "ED_info.hh"
+#include "ED_node.hh"
 
 const EnumPropertyItem rna_enum_region_type_items[] = {
     {RGN_TYPE_WINDOW, "WINDOW", 0, "Window", ""},
@@ -171,6 +172,9 @@ static void rna_Area_type_update(bContext *C, PointerRNA *ptr)
       if (area->spacetype == SPACE_VIEW3D) {
         DEG_tag_on_visible_update(CTX_data_main(C), false);
       }
+      else if (area->spacetype == SPACE_NODE) {
+        blender::ed::space_node::snode_set_context(*C);
+      }
 
       CTX_wm_window_set(C, prevwin);
       CTX_wm_area_set(C, prevsa);