diff --git a/tests/files/compositor/converter/compositor_renders/node_color_ramp.png b/tests/files/compositor/color/compositor_renders/node_color_ramp.png similarity index 100% rename from tests/files/compositor/converter/compositor_renders/node_color_ramp.png rename to tests/files/compositor/color/compositor_renders/node_color_ramp.png diff --git a/tests/files/compositor/converter/compositor_renders/node_comb_h_s_v_a.png b/tests/files/compositor/color/compositor_renders/node_comb_h_s_v_a.png similarity index 100% rename from tests/files/compositor/converter/compositor_renders/node_comb_h_s_v_a.png rename to tests/files/compositor/color/compositor_renders/node_comb_h_s_v_a.png diff --git a/tests/files/compositor/converter/compositor_renders/node_comb_r_g_b_a.png b/tests/files/compositor/color/compositor_renders/node_comb_r_g_b_a.png similarity index 100% rename from tests/files/compositor/converter/compositor_renders/node_comb_r_g_b_a.png rename to tests/files/compositor/color/compositor_renders/node_comb_r_g_b_a.png diff --git a/tests/files/compositor/converter/compositor_renders/node_comb_y_c_c_a.png b/tests/files/compositor/color/compositor_renders/node_comb_y_c_c_a.png similarity index 100% rename from tests/files/compositor/converter/compositor_renders/node_comb_y_c_c_a.png rename to tests/files/compositor/color/compositor_renders/node_comb_y_c_c_a.png diff --git a/tests/files/compositor/converter/compositor_renders/node_comb_y_u_v_a.png b/tests/files/compositor/color/compositor_renders/node_comb_y_u_v_a.png similarity index 100% rename from tests/files/compositor/converter/compositor_renders/node_comb_y_u_v_a.png rename to tests/files/compositor/color/compositor_renders/node_comb_y_u_v_a.png diff --git a/tests/files/compositor/converter/compositor_renders/node_convert_alpha_premul.png b/tests/files/compositor/color/compositor_renders/node_convert_alpha_premul.png similarity index 100% rename from tests/files/compositor/converter/compositor_renders/node_convert_alpha_premul.png rename to tests/files/compositor/color/compositor_renders/node_convert_alpha_premul.png diff --git a/tests/files/compositor/converter/compositor_renders/node_convert_alpha_straight.png b/tests/files/compositor/color/compositor_renders/node_convert_alpha_straight.png similarity index 100% rename from tests/files/compositor/converter/compositor_renders/node_convert_alpha_straight.png rename to tests/files/compositor/color/compositor_renders/node_convert_alpha_straight.png diff --git a/tests/files/compositor/converter/compositor_renders/node_r_g_b_to_b_w.png b/tests/files/compositor/color/compositor_renders/node_r_g_b_to_b_w.png similarity index 100% rename from tests/files/compositor/converter/compositor_renders/node_r_g_b_to_b_w.png rename to tests/files/compositor/color/compositor_renders/node_r_g_b_to_b_w.png diff --git a/tests/files/compositor/converter/compositor_renders/node_sep_h_s_v_a.png b/tests/files/compositor/color/compositor_renders/node_sep_h_s_v_a.png similarity index 100% rename from tests/files/compositor/converter/compositor_renders/node_sep_h_s_v_a.png rename to tests/files/compositor/color/compositor_renders/node_sep_h_s_v_a.png diff --git a/tests/files/compositor/converter/compositor_renders/node_sep_r_g_b_a.png b/tests/files/compositor/color/compositor_renders/node_sep_r_g_b_a.png similarity index 100% rename from tests/files/compositor/converter/compositor_renders/node_sep_r_g_b_a.png rename to tests/files/compositor/color/compositor_renders/node_sep_r_g_b_a.png diff --git a/tests/files/compositor/converter/compositor_renders/node_sep_y_c_c_a.png b/tests/files/compositor/color/compositor_renders/node_sep_y_c_c_a.png similarity index 100% rename from tests/files/compositor/converter/compositor_renders/node_sep_y_c_c_a.png rename to tests/files/compositor/color/compositor_renders/node_sep_y_c_c_a.png diff --git a/tests/files/compositor/converter/compositor_renders/node_sep_y_u_v_a.png b/tests/files/compositor/color/compositor_renders/node_sep_y_u_v_a.png similarity index 100% rename from tests/files/compositor/converter/compositor_renders/node_sep_y_u_v_a.png rename to tests/files/compositor/color/compositor_renders/node_sep_y_u_v_a.png diff --git a/tests/files/compositor/converter/compositor_renders/node_set_alpha_apply.png b/tests/files/compositor/color/compositor_renders/node_set_alpha_apply.png similarity index 100% rename from tests/files/compositor/converter/compositor_renders/node_set_alpha_apply.png rename to tests/files/compositor/color/compositor_renders/node_set_alpha_apply.png diff --git a/tests/files/compositor/converter/compositor_renders/node_set_alpha_replace.png b/tests/files/compositor/color/compositor_renders/node_set_alpha_replace.png similarity index 100% rename from tests/files/compositor/converter/compositor_renders/node_set_alpha_replace.png rename to tests/files/compositor/color/compositor_renders/node_set_alpha_replace.png diff --git a/tests/files/compositor/vector/compositor_renders/node_utility_blackbody.png b/tests/files/compositor/color/compositor_renders/node_utility_blackbody.png similarity index 100% rename from tests/files/compositor/vector/compositor_renders/node_utility_blackbody.png rename to tests/files/compositor/color/compositor_renders/node_utility_blackbody.png diff --git a/tests/files/compositor/converter/node_color_ramp.blend b/tests/files/compositor/color/node_color_ramp.blend similarity index 100% rename from tests/files/compositor/converter/node_color_ramp.blend rename to tests/files/compositor/color/node_color_ramp.blend diff --git a/tests/files/compositor/converter/node_comb_h_s_v_a.blend b/tests/files/compositor/color/node_comb_h_s_v_a.blend similarity index 100% rename from tests/files/compositor/converter/node_comb_h_s_v_a.blend rename to tests/files/compositor/color/node_comb_h_s_v_a.blend diff --git a/tests/files/compositor/converter/node_comb_r_g_b_a.blend b/tests/files/compositor/color/node_comb_r_g_b_a.blend similarity index 100% rename from tests/files/compositor/converter/node_comb_r_g_b_a.blend rename to tests/files/compositor/color/node_comb_r_g_b_a.blend diff --git a/tests/files/compositor/converter/node_comb_y_c_c_a.blend b/tests/files/compositor/color/node_comb_y_c_c_a.blend similarity index 100% rename from tests/files/compositor/converter/node_comb_y_c_c_a.blend rename to tests/files/compositor/color/node_comb_y_c_c_a.blend diff --git a/tests/files/compositor/converter/node_comb_y_u_v_a.blend b/tests/files/compositor/color/node_comb_y_u_v_a.blend similarity index 100% rename from tests/files/compositor/converter/node_comb_y_u_v_a.blend rename to tests/files/compositor/color/node_comb_y_u_v_a.blend diff --git a/tests/files/compositor/converter/node_convert_alpha_premul.blend b/tests/files/compositor/color/node_convert_alpha_premul.blend similarity index 100% rename from tests/files/compositor/converter/node_convert_alpha_premul.blend rename to tests/files/compositor/color/node_convert_alpha_premul.blend diff --git a/tests/files/compositor/converter/node_convert_alpha_straight.blend b/tests/files/compositor/color/node_convert_alpha_straight.blend similarity index 100% rename from tests/files/compositor/converter/node_convert_alpha_straight.blend rename to tests/files/compositor/color/node_convert_alpha_straight.blend diff --git a/tests/files/compositor/converter/node_r_g_b_to_b_w.blend b/tests/files/compositor/color/node_r_g_b_to_b_w.blend similarity index 100% rename from tests/files/compositor/converter/node_r_g_b_to_b_w.blend rename to tests/files/compositor/color/node_r_g_b_to_b_w.blend diff --git a/tests/files/compositor/converter/node_sep_h_s_v_a.blend b/tests/files/compositor/color/node_sep_h_s_v_a.blend similarity index 100% rename from tests/files/compositor/converter/node_sep_h_s_v_a.blend rename to tests/files/compositor/color/node_sep_h_s_v_a.blend diff --git a/tests/files/compositor/converter/node_sep_r_g_b_a.blend b/tests/files/compositor/color/node_sep_r_g_b_a.blend similarity index 100% rename from tests/files/compositor/converter/node_sep_r_g_b_a.blend rename to tests/files/compositor/color/node_sep_r_g_b_a.blend diff --git a/tests/files/compositor/converter/node_sep_y_c_c_a.blend b/tests/files/compositor/color/node_sep_y_c_c_a.blend similarity index 100% rename from tests/files/compositor/converter/node_sep_y_c_c_a.blend rename to tests/files/compositor/color/node_sep_y_c_c_a.blend diff --git a/tests/files/compositor/converter/node_sep_y_u_v_a.blend b/tests/files/compositor/color/node_sep_y_u_v_a.blend similarity index 100% rename from tests/files/compositor/converter/node_sep_y_u_v_a.blend rename to tests/files/compositor/color/node_sep_y_u_v_a.blend diff --git a/tests/files/compositor/converter/node_set_alpha_apply.blend b/tests/files/compositor/color/node_set_alpha_apply.blend similarity index 100% rename from tests/files/compositor/converter/node_set_alpha_apply.blend rename to tests/files/compositor/color/node_set_alpha_apply.blend diff --git a/tests/files/compositor/converter/node_set_alpha_replace.blend b/tests/files/compositor/color/node_set_alpha_replace.blend similarity index 100% rename from tests/files/compositor/converter/node_set_alpha_replace.blend rename to tests/files/compositor/color/node_set_alpha_replace.blend diff --git a/tests/files/compositor/vector/node_utility_blackbody.blend b/tests/files/compositor/color/node_utility_blackbody.blend similarity index 100% rename from tests/files/compositor/vector/node_utility_blackbody.blend rename to tests/files/compositor/color/node_utility_blackbody.blend diff --git a/tests/files/compositor/matte/compositor_renders/node_channel_matte.png b/tests/files/compositor/keying/compositor_renders/node_channel_matte.png similarity index 100% rename from tests/files/compositor/matte/compositor_renders/node_channel_matte.png rename to tests/files/compositor/keying/compositor_renders/node_channel_matte.png diff --git a/tests/files/compositor/matte/compositor_renders/node_chroma_matte.png b/tests/files/compositor/keying/compositor_renders/node_chroma_matte.png similarity index 100% rename from tests/files/compositor/matte/compositor_renders/node_chroma_matte.png rename to tests/files/compositor/keying/compositor_renders/node_chroma_matte.png diff --git a/tests/files/compositor/matte/compositor_renders/node_color_matte.png b/tests/files/compositor/keying/compositor_renders/node_color_matte.png similarity index 100% rename from tests/files/compositor/matte/compositor_renders/node_color_matte.png rename to tests/files/compositor/keying/compositor_renders/node_color_matte.png diff --git a/tests/files/compositor/matte/compositor_renders/node_color_spill.png b/tests/files/compositor/keying/compositor_renders/node_color_spill.png similarity index 100% rename from tests/files/compositor/matte/compositor_renders/node_color_spill.png rename to tests/files/compositor/keying/compositor_renders/node_color_spill.png diff --git a/tests/files/compositor/matte/compositor_renders/node_diff_matte.png b/tests/files/compositor/keying/compositor_renders/node_diff_matte.png similarity index 100% rename from tests/files/compositor/matte/compositor_renders/node_diff_matte.png rename to tests/files/compositor/keying/compositor_renders/node_diff_matte.png diff --git a/tests/files/compositor/matte/compositor_renders/node_distance_matte.png b/tests/files/compositor/keying/compositor_renders/node_distance_matte.png similarity index 100% rename from tests/files/compositor/matte/compositor_renders/node_distance_matte.png rename to tests/files/compositor/keying/compositor_renders/node_distance_matte.png diff --git a/tests/files/compositor/matte/compositor_renders/node_keying.png b/tests/files/compositor/keying/compositor_renders/node_keying.png similarity index 100% rename from tests/files/compositor/matte/compositor_renders/node_keying.png rename to tests/files/compositor/keying/compositor_renders/node_keying.png diff --git a/tests/files/compositor/matte/compositor_renders/node_keying_edge.png b/tests/files/compositor/keying/compositor_renders/node_keying_edge.png similarity index 100% rename from tests/files/compositor/matte/compositor_renders/node_keying_edge.png rename to tests/files/compositor/keying/compositor_renders/node_keying_edge.png diff --git a/tests/files/compositor/matte/compositor_renders/node_keying_matte.png b/tests/files/compositor/keying/compositor_renders/node_keying_matte.png similarity index 100% rename from tests/files/compositor/matte/compositor_renders/node_keying_matte.png rename to tests/files/compositor/keying/compositor_renders/node_keying_matte.png diff --git a/tests/files/compositor/matte/compositor_renders/node_keying_screen.png b/tests/files/compositor/keying/compositor_renders/node_keying_screen.png similarity index 100% rename from tests/files/compositor/matte/compositor_renders/node_keying_screen.png rename to tests/files/compositor/keying/compositor_renders/node_keying_screen.png diff --git a/tests/files/compositor/matte/compositor_renders/node_luma_matte.png b/tests/files/compositor/keying/compositor_renders/node_luma_matte.png similarity index 100% rename from tests/files/compositor/matte/compositor_renders/node_luma_matte.png rename to tests/files/compositor/keying/compositor_renders/node_luma_matte.png diff --git a/tests/files/compositor/matte/node_channel_matte.blend b/tests/files/compositor/keying/node_channel_matte.blend similarity index 100% rename from tests/files/compositor/matte/node_channel_matte.blend rename to tests/files/compositor/keying/node_channel_matte.blend diff --git a/tests/files/compositor/matte/node_chroma_matte.blend b/tests/files/compositor/keying/node_chroma_matte.blend similarity index 100% rename from tests/files/compositor/matte/node_chroma_matte.blend rename to tests/files/compositor/keying/node_chroma_matte.blend diff --git a/tests/files/compositor/matte/node_color_matte.blend b/tests/files/compositor/keying/node_color_matte.blend similarity index 100% rename from tests/files/compositor/matte/node_color_matte.blend rename to tests/files/compositor/keying/node_color_matte.blend diff --git a/tests/files/compositor/matte/node_color_spill.blend b/tests/files/compositor/keying/node_color_spill.blend similarity index 100% rename from tests/files/compositor/matte/node_color_spill.blend rename to tests/files/compositor/keying/node_color_spill.blend diff --git a/tests/files/compositor/matte/node_diff_matte.blend b/tests/files/compositor/keying/node_diff_matte.blend similarity index 100% rename from tests/files/compositor/matte/node_diff_matte.blend rename to tests/files/compositor/keying/node_diff_matte.blend diff --git a/tests/files/compositor/matte/node_distance_matte.blend b/tests/files/compositor/keying/node_distance_matte.blend similarity index 100% rename from tests/files/compositor/matte/node_distance_matte.blend rename to tests/files/compositor/keying/node_distance_matte.blend diff --git a/tests/files/compositor/matte/node_keying.blend b/tests/files/compositor/keying/node_keying.blend similarity index 100% rename from tests/files/compositor/matte/node_keying.blend rename to tests/files/compositor/keying/node_keying.blend diff --git a/tests/files/compositor/matte/node_keying_edge.blend b/tests/files/compositor/keying/node_keying_edge.blend similarity index 100% rename from tests/files/compositor/matte/node_keying_edge.blend rename to tests/files/compositor/keying/node_keying_edge.blend diff --git a/tests/files/compositor/matte/node_keying_matte.blend b/tests/files/compositor/keying/node_keying_matte.blend similarity index 100% rename from tests/files/compositor/matte/node_keying_matte.blend rename to tests/files/compositor/keying/node_keying_matte.blend diff --git a/tests/files/compositor/matte/node_keying_screen.blend b/tests/files/compositor/keying/node_keying_screen.blend similarity index 100% rename from tests/files/compositor/matte/node_keying_screen.blend rename to tests/files/compositor/keying/node_keying_screen.blend diff --git a/tests/files/compositor/matte/node_luma_matte.blend b/tests/files/compositor/keying/node_luma_matte.blend similarity index 100% rename from tests/files/compositor/matte/node_luma_matte.blend rename to tests/files/compositor/keying/node_luma_matte.blend diff --git a/tests/files/compositor/matte/compositor_renders/double_edge_mask_adjacent_bleed_out.png b/tests/files/compositor/mask/compositor_renders/double_edge_mask_adjacent_bleed_out.png similarity index 100% rename from tests/files/compositor/matte/compositor_renders/double_edge_mask_adjacent_bleed_out.png rename to tests/files/compositor/mask/compositor_renders/double_edge_mask_adjacent_bleed_out.png diff --git a/tests/files/compositor/matte/compositor_renders/double_edge_mask_adjacent_keep_in.png b/tests/files/compositor/mask/compositor_renders/double_edge_mask_adjacent_keep_in.png similarity index 100% rename from tests/files/compositor/matte/compositor_renders/double_edge_mask_adjacent_keep_in.png rename to tests/files/compositor/mask/compositor_renders/double_edge_mask_adjacent_keep_in.png diff --git a/tests/files/compositor/matte/compositor_renders/double_edge_mask_all_bleed_out.png b/tests/files/compositor/mask/compositor_renders/double_edge_mask_all_bleed_out.png similarity index 100% rename from tests/files/compositor/matte/compositor_renders/double_edge_mask_all_bleed_out.png rename to tests/files/compositor/mask/compositor_renders/double_edge_mask_all_bleed_out.png diff --git a/tests/files/compositor/matte/compositor_renders/double_edge_mask_all_keep_in.png b/tests/files/compositor/mask/compositor_renders/double_edge_mask_all_keep_in.png similarity index 100% rename from tests/files/compositor/matte/compositor_renders/double_edge_mask_all_keep_in.png rename to tests/files/compositor/mask/compositor_renders/double_edge_mask_all_keep_in.png diff --git a/tests/files/compositor/matte/compositor_renders/node_box_mask.png b/tests/files/compositor/mask/compositor_renders/node_box_mask.png similarity index 100% rename from tests/files/compositor/matte/compositor_renders/node_box_mask.png rename to tests/files/compositor/mask/compositor_renders/node_box_mask.png diff --git a/tests/files/compositor/matte/compositor_renders/node_cryptomatte.png b/tests/files/compositor/mask/compositor_renders/node_cryptomatte.png similarity index 100% rename from tests/files/compositor/matte/compositor_renders/node_cryptomatte.png rename to tests/files/compositor/mask/compositor_renders/node_cryptomatte.png diff --git a/tests/files/compositor/matte/compositor_renders/node_cryptomatte_legacy.png b/tests/files/compositor/mask/compositor_renders/node_cryptomatte_legacy.png similarity index 100% rename from tests/files/compositor/matte/compositor_renders/node_cryptomatte_legacy.png rename to tests/files/compositor/mask/compositor_renders/node_cryptomatte_legacy.png diff --git a/tests/files/compositor/matte/compositor_renders/node_ellipse_mask.png b/tests/files/compositor/mask/compositor_renders/node_ellipse_mask.png similarity index 100% rename from tests/files/compositor/matte/compositor_renders/node_ellipse_mask.png rename to tests/files/compositor/mask/compositor_renders/node_ellipse_mask.png diff --git a/tests/files/compositor/converter/compositor_renders/node_i_d_mask.png b/tests/files/compositor/mask/compositor_renders/node_i_d_mask.png similarity index 100% rename from tests/files/compositor/converter/compositor_renders/node_i_d_mask.png rename to tests/files/compositor/mask/compositor_renders/node_i_d_mask.png diff --git a/tests/files/compositor/matte/double_edge_mask_adjacent_bleed_out.blend b/tests/files/compositor/mask/double_edge_mask_adjacent_bleed_out.blend similarity index 100% rename from tests/files/compositor/matte/double_edge_mask_adjacent_bleed_out.blend rename to tests/files/compositor/mask/double_edge_mask_adjacent_bleed_out.blend diff --git a/tests/files/compositor/matte/double_edge_mask_adjacent_keep_in.blend b/tests/files/compositor/mask/double_edge_mask_adjacent_keep_in.blend similarity index 100% rename from tests/files/compositor/matte/double_edge_mask_adjacent_keep_in.blend rename to tests/files/compositor/mask/double_edge_mask_adjacent_keep_in.blend diff --git a/tests/files/compositor/matte/double_edge_mask_all_bleed_out.blend b/tests/files/compositor/mask/double_edge_mask_all_bleed_out.blend similarity index 100% rename from tests/files/compositor/matte/double_edge_mask_all_bleed_out.blend rename to tests/files/compositor/mask/double_edge_mask_all_bleed_out.blend diff --git a/tests/files/compositor/matte/double_edge_mask_all_keep_in.blend b/tests/files/compositor/mask/double_edge_mask_all_keep_in.blend similarity index 100% rename from tests/files/compositor/matte/double_edge_mask_all_keep_in.blend rename to tests/files/compositor/mask/double_edge_mask_all_keep_in.blend diff --git a/tests/files/compositor/matte/node_box_mask.blend b/tests/files/compositor/mask/node_box_mask.blend similarity index 100% rename from tests/files/compositor/matte/node_box_mask.blend rename to tests/files/compositor/mask/node_box_mask.blend diff --git a/tests/files/compositor/matte/node_cryptomatte.blend b/tests/files/compositor/mask/node_cryptomatte.blend similarity index 100% rename from tests/files/compositor/matte/node_cryptomatte.blend rename to tests/files/compositor/mask/node_cryptomatte.blend diff --git a/tests/files/compositor/matte/node_cryptomatte_legacy.blend b/tests/files/compositor/mask/node_cryptomatte_legacy.blend similarity index 100% rename from tests/files/compositor/matte/node_cryptomatte_legacy.blend rename to tests/files/compositor/mask/node_cryptomatte_legacy.blend diff --git a/tests/files/compositor/matte/node_ellipse_mask.blend b/tests/files/compositor/mask/node_ellipse_mask.blend similarity index 100% rename from tests/files/compositor/matte/node_ellipse_mask.blend rename to tests/files/compositor/mask/node_ellipse_mask.blend diff --git a/tests/files/compositor/converter/node_i_d_mask.blend b/tests/files/compositor/mask/node_i_d_mask.blend similarity index 100% rename from tests/files/compositor/converter/node_i_d_mask.blend rename to tests/files/compositor/mask/node_i_d_mask.blend diff --git a/tests/files/compositor/distort/compositor_renders/node_plane_track_motion_plane.png b/tests/files/compositor/tracking/compositor_renders/node_plane_track_motion_plane.png similarity index 100% rename from tests/files/compositor/distort/compositor_renders/node_plane_track_motion_plane.png rename to tests/files/compositor/tracking/compositor_renders/node_plane_track_motion_plane.png diff --git a/tests/files/compositor/distort/compositor_renders/node_plane_track_plane.png b/tests/files/compositor/tracking/compositor_renders/node_plane_track_plane.png similarity index 100% rename from tests/files/compositor/distort/compositor_renders/node_plane_track_plane.png rename to tests/files/compositor/tracking/compositor_renders/node_plane_track_plane.png diff --git a/tests/files/compositor/distort/compositor_renders/node_stabilize_2d.png b/tests/files/compositor/tracking/compositor_renders/node_stabilize_2d.png similarity index 100% rename from tests/files/compositor/distort/compositor_renders/node_stabilize_2d.png rename to tests/files/compositor/tracking/compositor_renders/node_stabilize_2d.png diff --git a/tests/files/compositor/distort/compositor_renders/node_stabilize_2d_bicubic.png b/tests/files/compositor/tracking/compositor_renders/node_stabilize_2d_bicubic.png similarity index 100% rename from tests/files/compositor/distort/compositor_renders/node_stabilize_2d_bicubic.png rename to tests/files/compositor/tracking/compositor_renders/node_stabilize_2d_bicubic.png diff --git a/tests/files/compositor/distort/compositor_renders/node_stabilize_2d_invert.png b/tests/files/compositor/tracking/compositor_renders/node_stabilize_2d_invert.png similarity index 100% rename from tests/files/compositor/distort/compositor_renders/node_stabilize_2d_invert.png rename to tests/files/compositor/tracking/compositor_renders/node_stabilize_2d_invert.png diff --git a/tests/files/compositor/distort/node_plane_track_motion_plane.blend b/tests/files/compositor/tracking/node_plane_track_motion_plane.blend similarity index 100% rename from tests/files/compositor/distort/node_plane_track_motion_plane.blend rename to tests/files/compositor/tracking/node_plane_track_motion_plane.blend diff --git a/tests/files/compositor/distort/node_plane_track_plane.blend b/tests/files/compositor/tracking/node_plane_track_plane.blend similarity index 100% rename from tests/files/compositor/distort/node_plane_track_plane.blend rename to tests/files/compositor/tracking/node_plane_track_plane.blend diff --git a/tests/files/compositor/distort/node_stabilize_2d.blend b/tests/files/compositor/tracking/node_stabilize_2d.blend similarity index 100% rename from tests/files/compositor/distort/node_stabilize_2d.blend rename to tests/files/compositor/tracking/node_stabilize_2d.blend diff --git a/tests/files/compositor/distort/node_stabilize_2d_bicubic.blend b/tests/files/compositor/tracking/node_stabilize_2d_bicubic.blend similarity index 100% rename from tests/files/compositor/distort/node_stabilize_2d_bicubic.blend rename to tests/files/compositor/tracking/node_stabilize_2d_bicubic.blend diff --git a/tests/files/compositor/distort/node_stabilize_2d_invert.blend b/tests/files/compositor/tracking/node_stabilize_2d_invert.blend similarity index 100% rename from tests/files/compositor/distort/node_stabilize_2d_invert.blend rename to tests/files/compositor/tracking/node_stabilize_2d_invert.blend diff --git a/tests/files/compositor/multiple_node_setups/compositor_renders/flip_scalerotate.png b/tests/files/compositor/transform/compositor_renders/flip_scalerotate.png similarity index 100% rename from tests/files/compositor/multiple_node_setups/compositor_renders/flip_scalerotate.png rename to tests/files/compositor/transform/compositor_renders/flip_scalerotate.png diff --git a/tests/files/compositor/distort/compositor_renders/node_corner_pin_plane.png b/tests/files/compositor/transform/compositor_renders/node_corner_pin_plane.png similarity index 100% rename from tests/files/compositor/distort/compositor_renders/node_corner_pin_plane.png rename to tests/files/compositor/transform/compositor_renders/node_corner_pin_plane.png diff --git a/tests/files/compositor/distort/compositor_renders/node_crop.png b/tests/files/compositor/transform/compositor_renders/node_crop.png similarity index 100% rename from tests/files/compositor/distort/compositor_renders/node_crop.png rename to tests/files/compositor/transform/compositor_renders/node_crop.png diff --git a/tests/files/compositor/distort/compositor_renders/node_flip.png b/tests/files/compositor/transform/compositor_renders/node_flip.png similarity index 100% rename from tests/files/compositor/distort/compositor_renders/node_flip.png rename to tests/files/compositor/transform/compositor_renders/node_flip.png diff --git a/tests/files/compositor/distort/compositor_renders/node_lens_distortion_negative.png b/tests/files/compositor/transform/compositor_renders/node_lens_distortion_negative.png similarity index 100% rename from tests/files/compositor/distort/compositor_renders/node_lens_distortion_negative.png rename to tests/files/compositor/transform/compositor_renders/node_lens_distortion_negative.png diff --git a/tests/files/compositor/distort/compositor_renders/node_lens_distortion_positive.png b/tests/files/compositor/transform/compositor_renders/node_lens_distortion_positive.png similarity index 100% rename from tests/files/compositor/distort/compositor_renders/node_lens_distortion_positive.png rename to tests/files/compositor/transform/compositor_renders/node_lens_distortion_positive.png diff --git a/tests/files/compositor/distort/compositor_renders/node_lens_distortion_projector.png b/tests/files/compositor/transform/compositor_renders/node_lens_distortion_projector.png similarity index 100% rename from tests/files/compositor/distort/compositor_renders/node_lens_distortion_projector.png rename to tests/files/compositor/transform/compositor_renders/node_lens_distortion_projector.png diff --git a/tests/files/compositor/anisotropic_filtering/compositor_renders/node_map_u_v.png b/tests/files/compositor/transform/compositor_renders/node_map_u_v.png similarity index 100% rename from tests/files/compositor/anisotropic_filtering/compositor_renders/node_map_u_v.png rename to tests/files/compositor/transform/compositor_renders/node_map_u_v.png diff --git a/tests/files/compositor/distort/compositor_renders/node_movie_distortion_distort.png b/tests/files/compositor/transform/compositor_renders/node_movie_distortion_distort.png similarity index 100% rename from tests/files/compositor/distort/compositor_renders/node_movie_distortion_distort.png rename to tests/files/compositor/transform/compositor_renders/node_movie_distortion_distort.png diff --git a/tests/files/compositor/distort/compositor_renders/node_movie_distortion_undistort.png b/tests/files/compositor/transform/compositor_renders/node_movie_distortion_undistort.png similarity index 100% rename from tests/files/compositor/distort/compositor_renders/node_movie_distortion_undistort.png rename to tests/files/compositor/transform/compositor_renders/node_movie_distortion_undistort.png diff --git a/tests/files/compositor/distort/compositor_renders/node_rotate.png b/tests/files/compositor/transform/compositor_renders/node_rotate.png similarity index 100% rename from tests/files/compositor/distort/compositor_renders/node_rotate.png rename to tests/files/compositor/transform/compositor_renders/node_rotate.png diff --git a/tests/files/compositor/distort/compositor_renders/node_rotate_bicubic.png b/tests/files/compositor/transform/compositor_renders/node_rotate_bicubic.png similarity index 100% rename from tests/files/compositor/distort/compositor_renders/node_rotate_bicubic.png rename to tests/files/compositor/transform/compositor_renders/node_rotate_bicubic.png diff --git a/tests/files/compositor/distort/compositor_renders/node_rotate_bilinear.png b/tests/files/compositor/transform/compositor_renders/node_rotate_bilinear.png similarity index 100% rename from tests/files/compositor/distort/compositor_renders/node_rotate_bilinear.png rename to tests/files/compositor/transform/compositor_renders/node_rotate_bilinear.png diff --git a/tests/files/compositor/distort/compositor_renders/node_scale.png b/tests/files/compositor/transform/compositor_renders/node_scale.png similarity index 100% rename from tests/files/compositor/distort/compositor_renders/node_scale.png rename to tests/files/compositor/transform/compositor_renders/node_scale.png diff --git a/tests/files/compositor/distort/compositor_renders/node_transform.png b/tests/files/compositor/transform/compositor_renders/node_transform.png similarity index 100% rename from tests/files/compositor/distort/compositor_renders/node_transform.png rename to tests/files/compositor/transform/compositor_renders/node_transform.png diff --git a/tests/files/compositor/distort/compositor_renders/node_transform_bicubic.png b/tests/files/compositor/transform/compositor_renders/node_transform_bicubic.png similarity index 100% rename from tests/files/compositor/distort/compositor_renders/node_transform_bicubic.png rename to tests/files/compositor/transform/compositor_renders/node_transform_bicubic.png diff --git a/tests/files/compositor/distort/compositor_renders/node_transform_bilinear.png b/tests/files/compositor/transform/compositor_renders/node_transform_bilinear.png similarity index 100% rename from tests/files/compositor/distort/compositor_renders/node_transform_bilinear.png rename to tests/files/compositor/transform/compositor_renders/node_transform_bilinear.png diff --git a/tests/files/compositor/distort/compositor_renders/node_translate.png b/tests/files/compositor/transform/compositor_renders/node_translate.png similarity index 100% rename from tests/files/compositor/distort/compositor_renders/node_translate.png rename to tests/files/compositor/transform/compositor_renders/node_translate.png diff --git a/tests/files/compositor/multiple_node_setups/flip_scalerotate.blend b/tests/files/compositor/transform/flip_scalerotate.blend similarity index 100% rename from tests/files/compositor/multiple_node_setups/flip_scalerotate.blend rename to tests/files/compositor/transform/flip_scalerotate.blend diff --git a/tests/files/compositor/distort/node_corner_pin_plane.blend b/tests/files/compositor/transform/node_corner_pin_plane.blend similarity index 100% rename from tests/files/compositor/distort/node_corner_pin_plane.blend rename to tests/files/compositor/transform/node_corner_pin_plane.blend diff --git a/tests/files/compositor/distort/node_crop.blend b/tests/files/compositor/transform/node_crop.blend similarity index 100% rename from tests/files/compositor/distort/node_crop.blend rename to tests/files/compositor/transform/node_crop.blend diff --git a/tests/files/compositor/distort/node_flip.blend b/tests/files/compositor/transform/node_flip.blend similarity index 100% rename from tests/files/compositor/distort/node_flip.blend rename to tests/files/compositor/transform/node_flip.blend diff --git a/tests/files/compositor/distort/node_lens_distortion_negative.blend b/tests/files/compositor/transform/node_lens_distortion_negative.blend similarity index 100% rename from tests/files/compositor/distort/node_lens_distortion_negative.blend rename to tests/files/compositor/transform/node_lens_distortion_negative.blend diff --git a/tests/files/compositor/distort/node_lens_distortion_positive.blend b/tests/files/compositor/transform/node_lens_distortion_positive.blend similarity index 100% rename from tests/files/compositor/distort/node_lens_distortion_positive.blend rename to tests/files/compositor/transform/node_lens_distortion_positive.blend diff --git a/tests/files/compositor/distort/node_lens_distortion_projector.blend b/tests/files/compositor/transform/node_lens_distortion_projector.blend similarity index 100% rename from tests/files/compositor/distort/node_lens_distortion_projector.blend rename to tests/files/compositor/transform/node_lens_distortion_projector.blend diff --git a/tests/files/compositor/anisotropic_filtering/node_map_u_v.blend b/tests/files/compositor/transform/node_map_u_v.blend similarity index 100% rename from tests/files/compositor/anisotropic_filtering/node_map_u_v.blend rename to tests/files/compositor/transform/node_map_u_v.blend diff --git a/tests/files/compositor/distort/node_movie_distortion_distort.blend b/tests/files/compositor/transform/node_movie_distortion_distort.blend similarity index 100% rename from tests/files/compositor/distort/node_movie_distortion_distort.blend rename to tests/files/compositor/transform/node_movie_distortion_distort.blend diff --git a/tests/files/compositor/distort/node_movie_distortion_undistort.blend b/tests/files/compositor/transform/node_movie_distortion_undistort.blend similarity index 100% rename from tests/files/compositor/distort/node_movie_distortion_undistort.blend rename to tests/files/compositor/transform/node_movie_distortion_undistort.blend diff --git a/tests/files/compositor/distort/node_rotate.blend b/tests/files/compositor/transform/node_rotate.blend similarity index 100% rename from tests/files/compositor/distort/node_rotate.blend rename to tests/files/compositor/transform/node_rotate.blend diff --git a/tests/files/compositor/distort/node_rotate_bicubic.blend b/tests/files/compositor/transform/node_rotate_bicubic.blend similarity index 100% rename from tests/files/compositor/distort/node_rotate_bicubic.blend rename to tests/files/compositor/transform/node_rotate_bicubic.blend diff --git a/tests/files/compositor/distort/node_rotate_bilinear.blend b/tests/files/compositor/transform/node_rotate_bilinear.blend similarity index 100% rename from tests/files/compositor/distort/node_rotate_bilinear.blend rename to tests/files/compositor/transform/node_rotate_bilinear.blend diff --git a/tests/files/compositor/distort/node_scale.blend b/tests/files/compositor/transform/node_scale.blend similarity index 100% rename from tests/files/compositor/distort/node_scale.blend rename to tests/files/compositor/transform/node_scale.blend diff --git a/tests/files/compositor/distort/node_transform.blend b/tests/files/compositor/transform/node_transform.blend similarity index 100% rename from tests/files/compositor/distort/node_transform.blend rename to tests/files/compositor/transform/node_transform.blend diff --git a/tests/files/compositor/distort/node_transform_bicubic.blend b/tests/files/compositor/transform/node_transform_bicubic.blend similarity index 100% rename from tests/files/compositor/distort/node_transform_bicubic.blend rename to tests/files/compositor/transform/node_transform_bicubic.blend diff --git a/tests/files/compositor/distort/node_transform_bilinear.blend b/tests/files/compositor/transform/node_transform_bilinear.blend similarity index 100% rename from tests/files/compositor/distort/node_transform_bilinear.blend rename to tests/files/compositor/transform/node_transform_bilinear.blend diff --git a/tests/files/compositor/distort/node_translate.blend b/tests/files/compositor/transform/node_translate.blend similarity index 100% rename from tests/files/compositor/distort/node_translate.blend rename to tests/files/compositor/transform/node_translate.blend diff --git a/tests/files/compositor/output/compositor_renders/node_levels.png b/tests/files/compositor/utilities/compositor_renders/node_levels.png similarity index 100% rename from tests/files/compositor/output/compositor_renders/node_levels.png rename to tests/files/compositor/utilities/compositor_renders/node_levels.png diff --git a/tests/files/compositor/output/compositor_renders/node_levels_cascade.png b/tests/files/compositor/utilities/compositor_renders/node_levels_cascade.png similarity index 100% rename from tests/files/compositor/output/compositor_renders/node_levels_cascade.png rename to tests/files/compositor/utilities/compositor_renders/node_levels_cascade.png diff --git a/tests/files/compositor/output/compositor_renders/node_levels_std.png b/tests/files/compositor/utilities/compositor_renders/node_levels_std.png similarity index 100% rename from tests/files/compositor/output/compositor_renders/node_levels_std.png rename to tests/files/compositor/utilities/compositor_renders/node_levels_std.png diff --git a/tests/files/compositor/vector/compositor_renders/node_map_range.png b/tests/files/compositor/utilities/compositor_renders/node_map_range.png similarity index 100% rename from tests/files/compositor/vector/compositor_renders/node_map_range.png rename to tests/files/compositor/utilities/compositor_renders/node_map_range.png diff --git a/tests/files/compositor/converter/compositor_renders/node_math.png b/tests/files/compositor/utilities/compositor_renders/node_math.png similarity index 100% rename from tests/files/compositor/converter/compositor_renders/node_math.png rename to tests/files/compositor/utilities/compositor_renders/node_math.png diff --git a/tests/files/compositor/converter/compositor_renders/node_split_2_linked.png b/tests/files/compositor/utilities/compositor_renders/node_split_2_linked.png similarity index 100% rename from tests/files/compositor/converter/compositor_renders/node_split_2_linked.png rename to tests/files/compositor/utilities/compositor_renders/node_split_2_linked.png diff --git a/tests/files/compositor/converter/compositor_renders/node_split_first_linked.png b/tests/files/compositor/utilities/compositor_renders/node_split_first_linked.png similarity index 100% rename from tests/files/compositor/converter/compositor_renders/node_split_first_linked.png rename to tests/files/compositor/utilities/compositor_renders/node_split_first_linked.png diff --git a/tests/files/compositor/converter/compositor_renders/node_switch.png b/tests/files/compositor/utilities/compositor_renders/node_switch.png similarity index 100% rename from tests/files/compositor/converter/compositor_renders/node_switch.png rename to tests/files/compositor/utilities/compositor_renders/node_switch.png diff --git a/tests/files/compositor/converter/compositor_renders/node_switch_view.png b/tests/files/compositor/utilities/compositor_renders/node_switch_view.png similarity index 100% rename from tests/files/compositor/converter/compositor_renders/node_switch_view.png rename to tests/files/compositor/utilities/compositor_renders/node_switch_view.png diff --git a/tests/files/compositor/vector/compositor_renders/node_utility_clamp_min_max.png b/tests/files/compositor/utilities/compositor_renders/node_utility_clamp_min_max.png similarity index 100% rename from tests/files/compositor/vector/compositor_renders/node_utility_clamp_min_max.png rename to tests/files/compositor/utilities/compositor_renders/node_utility_clamp_min_max.png diff --git a/tests/files/compositor/vector/compositor_renders/node_utility_clamp_range.png b/tests/files/compositor/utilities/compositor_renders/node_utility_clamp_range.png similarity index 100% rename from tests/files/compositor/vector/compositor_renders/node_utility_clamp_range.png rename to tests/files/compositor/utilities/compositor_renders/node_utility_clamp_range.png diff --git a/tests/files/compositor/vector/compositor_renders/node_utility_float_curve.png b/tests/files/compositor/utilities/compositor_renders/node_utility_float_curve.png similarity index 100% rename from tests/files/compositor/vector/compositor_renders/node_utility_float_curve.png rename to tests/files/compositor/utilities/compositor_renders/node_utility_float_curve.png diff --git a/tests/files/compositor/output/node_levels_cascade.blend b/tests/files/compositor/utilities/node_levels_cascade.blend similarity index 100% rename from tests/files/compositor/output/node_levels_cascade.blend rename to tests/files/compositor/utilities/node_levels_cascade.blend diff --git a/tests/files/compositor/output/node_levels_std.blend b/tests/files/compositor/utilities/node_levels_std.blend similarity index 100% rename from tests/files/compositor/output/node_levels_std.blend rename to tests/files/compositor/utilities/node_levels_std.blend diff --git a/tests/files/compositor/vector/node_map_range.blend b/tests/files/compositor/utilities/node_map_range.blend similarity index 100% rename from tests/files/compositor/vector/node_map_range.blend rename to tests/files/compositor/utilities/node_map_range.blend diff --git a/tests/files/compositor/converter/node_math.blend b/tests/files/compositor/utilities/node_math.blend similarity index 100% rename from tests/files/compositor/converter/node_math.blend rename to tests/files/compositor/utilities/node_math.blend diff --git a/tests/files/compositor/converter/node_split_2_linked.blend b/tests/files/compositor/utilities/node_split_2_linked.blend similarity index 100% rename from tests/files/compositor/converter/node_split_2_linked.blend rename to tests/files/compositor/utilities/node_split_2_linked.blend diff --git a/tests/files/compositor/converter/node_split_first_linked.blend b/tests/files/compositor/utilities/node_split_first_linked.blend similarity index 100% rename from tests/files/compositor/converter/node_split_first_linked.blend rename to tests/files/compositor/utilities/node_split_first_linked.blend diff --git a/tests/files/compositor/converter/node_switch.blend b/tests/files/compositor/utilities/node_switch.blend similarity index 100% rename from tests/files/compositor/converter/node_switch.blend rename to tests/files/compositor/utilities/node_switch.blend diff --git a/tests/files/compositor/converter/node_switch_view.blend b/tests/files/compositor/utilities/node_switch_view.blend similarity index 100% rename from tests/files/compositor/converter/node_switch_view.blend rename to tests/files/compositor/utilities/node_switch_view.blend diff --git a/tests/files/compositor/vector/node_utility_clamp_min_max.blend b/tests/files/compositor/utilities/node_utility_clamp_min_max.blend similarity index 100% rename from tests/files/compositor/vector/node_utility_clamp_min_max.blend rename to tests/files/compositor/utilities/node_utility_clamp_min_max.blend diff --git a/tests/files/compositor/vector/node_utility_clamp_range.blend b/tests/files/compositor/utilities/node_utility_clamp_range.blend similarity index 100% rename from tests/files/compositor/vector/node_utility_clamp_range.blend rename to tests/files/compositor/utilities/node_utility_clamp_range.blend diff --git a/tests/files/compositor/vector/node_utility_float_curve.blend b/tests/files/compositor/utilities/node_utility_float_curve.blend similarity index 100% rename from tests/files/compositor/vector/node_utility_float_curve.blend rename to tests/files/compositor/utilities/node_utility_float_curve.blend diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt index 56a2b7d511e..c3d39dfa375 100644 --- a/tests/python/CMakeLists.txt +++ b/tests/python/CMakeLists.txt @@ -907,11 +907,11 @@ endif() if(TEST_SRC_DIR_EXISTS) set(compositor_tests - color - converter - filter input output + color + filter + utilities vector pixel_nodes @@ -919,7 +919,7 @@ if(TEST_SRC_DIR_EXISTS) ) if(WITH_LIBMV) - list(APPEND compositor_tests distort matte anisotropic_filtering) + list(APPEND compositor_tests keying mask tracking transform anisotropic_filtering) endif() foreach(comp_test ${compositor_tests}) @@ -942,11 +942,11 @@ endif() if(WITH_GPU_COMPOSITOR_TESTS AND TEST_SRC_DIR_EXISTS) set(compositor_tests - color - converter - filter input output + color + filter + utilities vector pixel_nodes @@ -954,7 +954,7 @@ if(WITH_GPU_COMPOSITOR_TESTS AND TEST_SRC_DIR_EXISTS) ) if(WITH_LIBMV) - list(APPEND compositor_tests distort matte) + list(APPEND compositor_tests keying mask tracking transform) endif() if(WITH_OPENGL_BACKEND) diff --git a/tests/python/compositor_render_tests.py b/tests/python/compositor_render_tests.py index 0b3aa6f191f..3d579f8bdac 100644 --- a/tests/python/compositor_render_tests.py +++ b/tests/python/compositor_render_tests.py @@ -65,7 +65,7 @@ def main(): if os.path.basename(args.testdir) == 'filter': # Temporary change to pass OpenImageDenoise test with both 1.3 and 1.4. report.set_fail_threshold(0.05) - elif os.path.basename(args.testdir) == 'matte': + elif os.path.basename(args.testdir) == 'mask' or os.path.basename(args.testdir) == 'keying': # The node_keying_matte.blend test is very sensitive to the exact values in the # input image. It makes it hard to precisely match results on different systems # (with and without SSE, i.e.), especially when OCIO has different precision for