[Bf-blender-cvs] [7708a848c96] master: Cleanup: sort cmake file lists

Campbell Barton noreply at git.blender.org
Mon Jan 24 11:24:08 CET 2022 

Commit: 7708a848c96915425b37db937478b4ecd227fc0d
Author: Campbell Barton
Date:   Mon Jan 24 21:23:30 2022 +1100
Branches: master
https://developer.blender.org/rB7708a848c96915425b37db937478b4ecd227fc0d

Cleanup: sort cmake file lists

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

M	source/blender/blenlib/CMakeLists.txt
M	source/blender/compositor/CMakeLists.txt
M	source/blender/draw/CMakeLists.txt
M	source/blender/gpu/CMakeLists.txt
M	source/blender/nodes/composite/CMakeLists.txt

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

diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index 90c6760019a..e9446f36c83 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -252,9 +252,9 @@ set(SRC
   BLI_math_solvers.h
   BLI_math_statistics.h
   BLI_math_time.h
-  BLI_math_vector.h
-  BLI_math_vec_types.hh
   BLI_math_vec_mpq_types.hh
+  BLI_math_vec_types.hh
+  BLI_math_vector.h
   BLI_memarena.h
   BLI_memblock.h
   BLI_memiter.h
diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt
index d5d8154d7ee..b9b365a3175 100644
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -38,8 +38,8 @@ set(INC
   ../render/intern
   ../../../extern/clew/include
   ../../../intern/atomic
-  ../../../intern/guardedalloc
   ../../../intern/clog
+  ../../../intern/guardedalloc
 
   # dna_type_offsets.h
   ${CMAKE_CURRENT_BINARY_DIR}/../makesdna/intern
@@ -140,6 +140,8 @@ set(SRC
   nodes/COM_OutputFileNode.h
   nodes/COM_RenderLayersNode.cc
   nodes/COM_RenderLayersNode.h
+  nodes/COM_SceneTimeNode.cc
+  nodes/COM_SceneTimeNode.h
   nodes/COM_SwitchNode.cc
   nodes/COM_SwitchNode.h
   nodes/COM_SwitchViewNode.cc
@@ -150,8 +152,6 @@ set(SRC
   nodes/COM_TimeNode.h
   nodes/COM_ValueNode.cc
   nodes/COM_ValueNode.h
-  nodes/COM_SceneTimeNode.cc
-  nodes/COM_SceneTimeNode.h
 
   # output nodes
   nodes/COM_CompositorNode.cc
@@ -573,10 +573,10 @@ set(SRC
   operations/COM_IDMaskOperation.cc
   operations/COM_IDMaskOperation.h
 
-  operations/COM_DotproductOperation.cc
-  operations/COM_DotproductOperation.h
   operations/COM_ConvertColorSpaceOperation.cc
   operations/COM_ConvertColorSpaceOperation.h
+  operations/COM_DotproductOperation.cc
+  operations/COM_DotproductOperation.h
 
   # Matte operation
   operations/COM_BoxMaskOperation.cc
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index 8dd7e3d7dbf..f0e2e2bafd1 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -212,8 +212,8 @@ set(SRC
   intern/draw_manager_profiling.h
   intern/draw_manager_testing.h
   intern/draw_manager_text.h
-  intern/draw_shader_shared.h
   intern/draw_shader.h
+  intern/draw_shader_shared.h
   intern/draw_subdivision.h
   intern/draw_texture_pool.h
   intern/draw_view.h
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index bb7e9e8b26f..4bb66b78dd0 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -404,40 +404,40 @@ set(SHADER_CREATE_INFOS
 #../draw/engines/workbench/shaders/workbench_effect_cavity_info.hh
 #../draw/engines/workbench/shaders/workbench_prepass_info.hh
 ../draw/intern/shaders/draw_fullscreen_info.hh
-../draw/intern/shaders/draw_view_info.hh
 ../draw/intern/shaders/draw_object_infos_info.hh
+../draw/intern/shaders/draw_view_info.hh
 
 shaders/infos/gpu_clip_planes_info.hh
-shaders/infos/gpu_srgb_to_framebuffer_space_info.hh
-shaders/infos/gpu_shader_3D_image_modulate_alpha_info.hh
+shaders/infos/gpu_shader_2D_area_borders_info.hh
 shaders/infos/gpu_shader_2D_checker_info.hh
 shaders/infos/gpu_shader_2D_diag_stripes_info.hh
-shaders/infos/gpu_shader_2D_uniform_color_info.hh
 shaders/infos/gpu_shader_2D_flat_color_info.hh
-shaders/infos/gpu_shader_2D_smooth_color_info.hh
-shaders/infos/gpu_shader_2D_image_overlays_merge_info.hh
-shaders/infos/gpu_shader_2D_image_overlays_stereo_merge_info.hh
-shaders/infos/gpu_shader_2D_image_info.hh
 shaders/infos/gpu_shader_2D_image_color_info.hh
 shaders/infos/gpu_shader_2D_image_desaturate_color_info.hh
-shaders/infos/gpu_shader_2D_image_shuffle_color_info.hh
+shaders/infos/gpu_shader_2D_image_info.hh
+shaders/infos/gpu_shader_2D_image_multi_rect_color_info.hh
+shaders/infos/gpu_shader_2D_image_overlays_merge_info.hh
+shaders/infos/gpu_shader_2D_image_overlays_stereo_merge_info.hh
 shaders/infos/gpu_shader_2D_image_rect_color_info.hh
-shaders/infos/gpu_shader_text_info.hh
-shaders/infos/gpu_shader_keyframe_shape_info.hh
-shaders/infos/gpu_shader_3D_flat_color_info.hh
-shaders/infos/gpu_shader_3D_uniform_color_info.hh
-shaders/infos/gpu_shader_3D_smooth_color_info.hh
-shaders/infos/gpu_shader_3D_depth_only_info.hh
-shaders/infos/gpu_shader_2D_point_varying_size_varying_color_info.hh
+shaders/infos/gpu_shader_2D_image_shuffle_color_info.hh
+shaders/infos/gpu_shader_2D_nodelink_info.hh
 shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_aa_info.hh
 shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_outline_aa_info.hh
-shaders/infos/gpu_shader_2D_area_borders_info.hh
-shaders/infos/gpu_shader_2D_image_multi_rect_color_info.hh
-shaders/infos/gpu_shader_instance_varying_color_varying_size_info.hh
+shaders/infos/gpu_shader_2D_point_varying_size_varying_color_info.hh
+shaders/infos/gpu_shader_2D_smooth_color_info.hh
+shaders/infos/gpu_shader_2D_uniform_color_info.hh
+shaders/infos/gpu_shader_3D_depth_only_info.hh
+shaders/infos/gpu_shader_3D_flat_color_info.hh
+shaders/infos/gpu_shader_3D_image_modulate_alpha_info.hh
 shaders/infos/gpu_shader_3D_point_info.hh
-shaders/infos/gpu_shader_2D_nodelink_info.hh
+shaders/infos/gpu_shader_3D_smooth_color_info.hh
+shaders/infos/gpu_shader_3D_uniform_color_info.hh
 shaders/infos/gpu_shader_gpencil_stroke_info.hh
+shaders/infos/gpu_shader_instance_varying_color_varying_size_info.hh
+shaders/infos/gpu_shader_keyframe_shape_info.hh
 shaders/infos/gpu_shader_simple_lighting_info.hh
+shaders/infos/gpu_shader_text_info.hh
+shaders/infos/gpu_srgb_to_framebuffer_space_info.hh
 )
 
 set(SHADER_CREATE_INFOS_CONTENT "")
diff --git a/source/blender/nodes/composite/CMakeLists.txt b/source/blender/nodes/composite/CMakeLists.txt
index aceca617fb4..8d2b2befd1a 100644
--- a/source/blender/nodes/composite/CMakeLists.txt
+++ b/source/blender/nodes/composite/CMakeLists.txt
@@ -54,9 +54,9 @@ set(SRC
   nodes/node_composite_color_spill.cc
   nodes/node_composite_colorbalance.cc
   nodes/node_composite_colorcorrection.cc
-  nodes/node_composite_convert_color_space.cc
   nodes/node_composite_common.cc
   nodes/node_composite_composite.cc
+  nodes/node_composite_convert_color_space.cc
   nodes/node_composite_cornerpin.cc
   nodes/node_composite_crop.cc
   nodes/node_composite_cryptomatte.cc
@@ -105,6 +105,7 @@ set(SRC
   nodes/node_composite_rgb.cc
   nodes/node_composite_rotate.cc
   nodes/node_composite_scale.cc
+  nodes/node_composite_scene_time.cc
   nodes/node_composite_sepcomb_hsva.cc
   nodes/node_composite_sepcomb_rgba.cc
   nodes/node_composite_sepcomb_ycca.cc
@@ -125,7 +126,6 @@ set(SRC
   nodes/node_composite_vec_blur.cc
   nodes/node_composite_viewer.cc
   nodes/node_composite_zcombine.cc
-  nodes/node_composite_scene_time.cc
 
   node_composite_tree.cc
   node_composite_util.cc

More information about the Bf-blender-cvs mailing list