# Conflicts: # source/blender/editors/space_node/node_draw.c # source/blender/editors/space_sequencer/sequencer_draw.c