Merge branch 'blender-v4.2-release'

source/blender/gpu/shaders/gpu_shader_sequencer_strips_frag.glsl

@@ -192,8 +192,8 @@ void main()
     }
 
     /* Active, but not selected strips get a thin inner line. */
-    bool active = (strip.flags & GPU_SEQ_FLAG_ACTIVE) != 0;
-    if (active && !selected) {
+    bool active_strip = (strip.flags & GPU_SEQ_FLAG_ACTIVE) != 0;
+    if (active_strip && !selected) {
       col = add_outline(sdf, 1.0, 2.0, col, col_outline);
     }
 

source/blender/makesrna/intern/rna_node_socket.cc

@@ -271,7 +271,11 @@ static void rna_NodeSocket_type_set(PointerRNA *ptr, int value)
   blender::bke::nodeFindNode(ntree, sock, &node, nullptr);
   if (node->type != NODE_CUSTOM) {
     /* Can't change the socket type on built-in nodes like this. */
-    return;
+    if (!node->is_reroute()) {
+      /* TODO: Refactor reroute node to avoid direct change of the socket type in built-in node and
+       * use proper node method for this. */
+      return;
+    }
   }
   blender::bke::nodeModifySocketTypeStatic(ntree, node, sock, value, 0);
 }