diff options
Diffstat (limited to 'source/blender/draw')
47 files changed, 98 insertions, 98 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_data.c b/source/blender/draw/engines/eevee/eevee_data.c index e586fc7b1db..6874947de55 100644 --- a/source/blender/draw/engines/eevee/eevee_data.c +++ b/source/blender/draw/engines/eevee/eevee_data.c @@ -24,8 +24,8 @@ #include "DRW_render.h" -#include "eevee_private.h" #include "eevee_lightcache.h" +#include "eevee_private.h" void EEVEE_view_layer_data_free(void *storage) { diff --git a/source/blender/draw/engines/eevee/eevee_depth_of_field.c b/source/blender/draw/engines/eevee/eevee_depth_of_field.c index 572e38a9395..ec6770e4549 100644 --- a/source/blender/draw/engines/eevee/eevee_depth_of_field.c +++ b/source/blender/draw/engines/eevee/eevee_depth_of_field.c @@ -34,9 +34,9 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "eevee_private.h" #include "GPU_framebuffer.h" #include "GPU_texture.h" +#include "eevee_private.h" static struct { /* Depth Of Field */ diff --git a/source/blender/draw/engines/eevee/eevee_effects.c b/source/blender/draw/engines/eevee/eevee_effects.c index 90bfad45f60..05b18da4374 100644 --- a/source/blender/draw/engines/eevee/eevee_effects.c +++ b/source/blender/draw/engines/eevee/eevee_effects.c @@ -26,11 +26,11 @@ #include "BKE_global.h" /* for G.debug_value */ -#include "eevee_private.h" -#include "GPU_texture.h" #include "GPU_extensions.h" #include "GPU_platform.h" #include "GPU_state.h" +#include "GPU_texture.h" +#include "eevee_private.h" static struct { /* Downsample Depth */ diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c index 1e08741db26..9816632c0c3 100644 --- a/source/blender/draw/engines/eevee/eevee_lightprobes.c +++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c @@ -22,22 +22,22 @@ #include "DRW_render.h" -#include "BLI_utildefines.h" #include "BLI_rand.h" +#include "BLI_utildefines.h" -#include "DNA_world_types.h" -#include "DNA_texture_types.h" #include "DNA_image_types.h" #include "DNA_lightprobe_types.h" +#include "DNA_texture_types.h" #include "DNA_view3d_types.h" +#include "DNA_world_types.h" #include "BKE_collection.h" #include "BKE_object.h" #include "MEM_guardedalloc.h" +#include "GPU_extensions.h" #include "GPU_material.h" #include "GPU_texture.h" -#include "GPU_extensions.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/draw/engines/eevee/eevee_lookdev.c b/source/blender/draw/engines/eevee/eevee_lookdev.c index a725a3583f3..b33be750d80 100644 --- a/source/blender/draw/engines/eevee/eevee_lookdev.c +++ b/source/blender/draw/engines/eevee/eevee_lookdev.c @@ -24,8 +24,8 @@ #include "BKE_camera.h" #include "BKE_studiolight.h" -#include "BLI_rect.h" #include "BLI_rand.h" +#include "BLI_rect.h" #include "DNA_screen_types.h" #include "DNA_world_types.h" @@ -36,8 +36,8 @@ #include "UI_resources.h" -#include "eevee_private.h" #include "eevee_lightcache.h" +#include "eevee_private.h" #include "draw_common.h" diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c index bb64fe32bc3..2062f4d83c9 100644 --- a/source/blender/draw/engines/eevee/eevee_materials.c +++ b/source/blender/draw/engines/eevee/eevee_materials.c @@ -22,9 +22,9 @@ #include "DRW_render.h" +#include "BLI_alloca.h" #include "BLI_dynstr.h" #include "BLI_ghash.h" -#include "BLI_alloca.h" #include "BLI_math_bits.h" #include "BLI_rand.h" #include "BLI_string_utils.h" diff --git a/source/blender/draw/engines/eevee/eevee_motion_blur.c b/source/blender/draw/engines/eevee/eevee_motion_blur.c index 80c38839b71..13927cd5124 100644 --- a/source/blender/draw/engines/eevee/eevee_motion_blur.c +++ b/source/blender/draw/engines/eevee/eevee_motion_blur.c @@ -24,9 +24,9 @@ #include "DRW_render.h" +#include "BKE_animsys.h" #include "BKE_camera.h" #include "BKE_object.h" -#include "BKE_animsys.h" #include "DNA_anim_types.h" #include "DNA_camera_types.h" @@ -37,8 +37,8 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "eevee_private.h" #include "GPU_texture.h" +#include "eevee_private.h" static struct { /* Motion Blur */ diff --git a/source/blender/draw/engines/eevee/eevee_render.c b/source/blender/draw/engines/eevee/eevee_render.c index c8357b56b18..255c6c50c2d 100644 --- a/source/blender/draw/engines/eevee/eevee_render.c +++ b/source/blender/draw/engines/eevee/eevee_render.c @@ -38,8 +38,8 @@ #include "DEG_depsgraph_query.h" -#include "GPU_framebuffer.h" #include "GPU_extensions.h" +#include "GPU_framebuffer.h" #include "GPU_state.h" #include "RE_pipeline.h" diff --git a/source/blender/draw/engines/eevee/eevee_screen_raytrace.c b/source/blender/draw/engines/eevee/eevee_screen_raytrace.c index e875187bdbf..2e467fe8535 100644 --- a/source/blender/draw/engines/eevee/eevee_screen_raytrace.c +++ b/source/blender/draw/engines/eevee/eevee_screen_raytrace.c @@ -29,8 +29,8 @@ #include "DEG_depsgraph_query.h" -#include "eevee_private.h" #include "GPU_texture.h" +#include "eevee_private.h" /* SSR shader variations */ enum { diff --git a/source/blender/draw/engines/eevee/eevee_shadows.c b/source/blender/draw/engines/eevee/eevee_shadows.c index f5b98d464dd..fb338d85fde 100644 --- a/source/blender/draw/engines/eevee/eevee_shadows.c +++ b/source/blender/draw/engines/eevee/eevee_shadows.c @@ -20,8 +20,8 @@ * \ingroup EEVEE */ -#include "BLI_sys_types.h" /* bool */ #include "BLI_string_utils.h" +#include "BLI_sys_types.h" /* bool */ // #include "BLI_dynstr.h" // #include "BLI_rand.h" diff --git a/source/blender/draw/engines/eevee/eevee_subsurface.c b/source/blender/draw/engines/eevee/eevee_subsurface.c index bab89a8a87b..3f4008eb8b9 100644 --- a/source/blender/draw/engines/eevee/eevee_subsurface.c +++ b/source/blender/draw/engines/eevee/eevee_subsurface.c @@ -28,9 +28,9 @@ #include "DEG_depsgraph_query.h" -#include "eevee_private.h" -#include "GPU_texture.h" #include "GPU_extensions.h" +#include "GPU_texture.h" +#include "eevee_private.h" static struct { struct GPUShader *sss_sh[3]; diff --git a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c index bd77279eb4a..1f44b815a42 100644 --- a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c +++ b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c @@ -30,8 +30,8 @@ #include "DEG_depsgraph_query.h" -#include "eevee_private.h" #include "GPU_texture.h" +#include "eevee_private.h" #define FILTER_CDF_TABLE_SIZE 512 diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c index 7c17b7098d2..5ea7aaa7207 100644 --- a/source/blender/draw/engines/eevee/eevee_volumes.c +++ b/source/blender/draw/engines/eevee/eevee_volumes.c @@ -27,8 +27,8 @@ #include "BLI_rand.h" #include "BLI_string_utils.h" -#include "DNA_object_force_types.h" #include "DNA_fluid_types.h" +#include "DNA_object_force_types.h" #include "DNA_volume_types.h" #include "DNA_world_types.h" @@ -43,11 +43,11 @@ #include "DEG_depsgraph_query.h" -#include "eevee_private.h" #include "GPU_draw.h" #include "GPU_extensions.h" -#include "GPU_texture.h" #include "GPU_material.h" +#include "GPU_texture.h" +#include "eevee_private.h" static struct { char *volumetric_common_lib; diff --git a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c index 3459685f504..a5f67b7831e 100644 --- a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c +++ b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c @@ -29,12 +29,12 @@ #include "DNA_gpencil_types.h" #include "DNA_view3d_types.h" -#include "BKE_lib_id.h" #include "BKE_gpencil.h" +#include "BKE_lib_id.h" #include "BKE_object.h" -#include "BLI_memblock.h" #include "BLI_link_utils.h" +#include "BLI_memblock.h" #include "gpencil_engine.h" diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c index 37aef5a633a..0270b1a1d8c 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine.c +++ b/source/blender/draw/engines/gpencil/gpencil_engine.c @@ -47,8 +47,8 @@ #include "DEG_depsgraph_query.h" -#include "ED_view3d.h" #include "ED_screen.h" +#include "ED_view3d.h" #include "UI_resources.h" diff --git a/source/blender/draw/engines/gpencil/gpencil_shader_fx.c b/source/blender/draw/engines/gpencil/gpencil_shader_fx.c index 9467efcd18c..7ce7a726bb7 100644 --- a/source/blender/draw/engines/gpencil/gpencil_shader_fx.c +++ b/source/blender/draw/engines/gpencil/gpencil_shader_fx.c @@ -19,10 +19,10 @@ /** \file * \ingroup draw */ +#include "DNA_camera_types.h" #include "DNA_gpencil_types.h" #include "DNA_shader_fx_types.h" #include "DNA_view3d_types.h" -#include "DNA_camera_types.h" #include "BKE_gpencil.h" diff --git a/source/blender/draw/engines/overlay/overlay_armature.c b/source/blender/draw/engines/overlay/overlay_armature.c index 3bf91b0d0be..49dece13869 100644 --- a/source/blender/draw/engines/overlay/overlay_armature.c +++ b/source/blender/draw/engines/overlay/overlay_armature.c @@ -20,15 +20,15 @@ * \ingroup draw_engine */ +#include <math.h> #include <stdlib.h> #include <string.h> -#include <math.h> #include "DNA_armature_types.h" #include "DNA_constraint_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_view3d_types.h" -#include "DNA_object_types.h" #include "DRW_render.h" diff --git a/source/blender/draw/engines/overlay/overlay_background.c b/source/blender/draw/engines/overlay/overlay_background.c index 286a9311989..f1ffa9035e0 100644 --- a/source/blender/draw/engines/overlay/overlay_background.c +++ b/source/blender/draw/engines/overlay/overlay_background.c @@ -24,8 +24,8 @@ #include "UI_resources.h" -#include "overlay_private.h" #include "draw_manager_text.h" +#include "overlay_private.h" #define BG_SOLID 0 #define BG_GRADIENT 1 diff --git a/source/blender/draw/engines/overlay/overlay_extra.c b/source/blender/draw/engines/overlay/overlay_extra.c index 4c525acd5be..bc0797eff0d 100644 --- a/source/blender/draw/engines/overlay/overlay_extra.c +++ b/source/blender/draw/engines/overlay/overlay_extra.c @@ -31,21 +31,21 @@ #include "BKE_global.h" #include "BKE_mball.h" #include "BKE_mesh.h" -#include "BKE_movieclip.h" #include "BKE_modifier.h" +#include "BKE_movieclip.h" #include "BKE_object.h" #include "BKE_tracking.h" #include "DNA_camera_types.h" #include "DNA_constraint_types.h" #include "DNA_curve_types.h" +#include "DNA_fluid_types.h" #include "DNA_lightprobe_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" #include "DNA_modifier_types.h" #include "DNA_object_force_types.h" #include "DNA_rigidbody_types.h" -#include "DNA_fluid_types.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/draw/engines/overlay/overlay_facing.c b/source/blender/draw/engines/overlay/overlay_facing.c index 74d82262019..872fa0e8796 100644 --- a/source/blender/draw/engines/overlay/overlay_facing.c +++ b/source/blender/draw/engines/overlay/overlay_facing.c @@ -20,8 +20,8 @@ * \ingroup draw_engine */ -#include "DRW_render.h" #include "BKE_paint.h" +#include "DRW_render.h" #include "overlay_private.h" diff --git a/source/blender/draw/engines/overlay/overlay_sculpt.c b/source/blender/draw/engines/overlay/overlay_sculpt.c index ba37f56800b..391c49e0695 100644 --- a/source/blender/draw/engines/overlay/overlay_sculpt.c +++ b/source/blender/draw/engines/overlay/overlay_sculpt.c @@ -24,8 +24,8 @@ #include "overlay_private.h" -#include "BKE_pbvh.h" #include "BKE_paint.h" +#include "BKE_pbvh.h" #include "BKE_subdiv_ccg.h" void OVERLAY_sculpt_cache_init(OVERLAY_Data *vedata) diff --git a/source/blender/draw/engines/overlay/overlay_wireframe.c b/source/blender/draw/engines/overlay/overlay_wireframe.c index cdf8005b827..3e4e3478e18 100644 --- a/source/blender/draw/engines/overlay/overlay_wireframe.c +++ b/source/blender/draw/engines/overlay/overlay_wireframe.c @@ -33,8 +33,8 @@ #include "BLI_hash.h" -#include "GPU_shader.h" #include "DRW_render.h" +#include "GPU_shader.h" #include "ED_view3d.h" diff --git a/source/blender/draw/engines/select/select_engine.c b/source/blender/draw/engines/select/select_engine.c index 389133b0d84..f357beb0bd8 100644 --- a/source/blender/draw/engines/select/select_engine.c +++ b/source/blender/draw/engines/select/select_engine.c @@ -32,8 +32,8 @@ #include "draw_cache_impl.h" #include "draw_manager.h" -#include "select_private.h" #include "select_engine.h" +#include "select_private.h" #define SELECT_ENGINE "SELECT_ENGINE" diff --git a/source/blender/draw/engines/workbench/workbench_data.c b/source/blender/draw/engines/workbench/workbench_data.c index bc052e60009..f000028562f 100644 --- a/source/blender/draw/engines/workbench/workbench_data.c +++ b/source/blender/draw/engines/workbench/workbench_data.c @@ -26,8 +26,8 @@ #include "DNA_userdef_types.h" -#include "ED_view3d.h" #include "ED_screen.h" +#include "ED_view3d.h" #include "UI_resources.h" diff --git a/source/blender/draw/engines/workbench/workbench_materials.c b/source/blender/draw/engines/workbench/workbench_materials.c index 246f5f88045..45f14c52ec5 100644 --- a/source/blender/draw/engines/workbench/workbench_materials.c +++ b/source/blender/draw/engines/workbench/workbench_materials.c @@ -30,8 +30,8 @@ #include "BLI_dynstr.h" #include "BLI_hash.h" -#include "DNA_node_types.h" #include "DNA_mesh_types.h" +#include "DNA_node_types.h" #include "GPU_uniformbuffer.h" diff --git a/source/blender/draw/engines/workbench/workbench_private.h b/source/blender/draw/engines/workbench/workbench_private.h index 49becf93f48..1fa49c8f818 100644 --- a/source/blender/draw/engines/workbench/workbench_private.h +++ b/source/blender/draw/engines/workbench/workbench_private.h @@ -26,9 +26,9 @@ #include "BKE_studiolight.h" #include "DNA_image_types.h" +#include "DNA_userdef_types.h" #include "DNA_view3d_types.h" #include "DNA_world_types.h" -#include "DNA_userdef_types.h" #include "DRW_render.h" diff --git a/source/blender/draw/engines/workbench/workbench_volume.c b/source/blender/draw/engines/workbench/workbench_volume.c index b9ea61fd013..951712d6ba3 100644 --- a/source/blender/draw/engines/workbench/workbench_volume.c +++ b/source/blender/draw/engines/workbench/workbench_volume.c @@ -27,8 +27,8 @@ #include "DNA_object_force_types.h" #include "DNA_volume_types.h" -#include "BLI_rand.h" #include "BLI_dynstr.h" +#include "BLI_rand.h" #include "BLI_string_utils.h" #include "BKE_fluid.h" diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h index 6c767102803..382e7313f21 100644 --- a/source/blender/draw/intern/DRW_render.h +++ b/source/blender/draw/intern/DRW_render.h @@ -39,23 +39,23 @@ #include "BLT_translation.h" -#include "DNA_object_types.h" #include "DNA_light_types.h" #include "DNA_material_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_world_types.h" #include "GPU_framebuffer.h" #include "GPU_primitive.h" -#include "GPU_texture.h" #include "GPU_shader.h" +#include "GPU_texture.h" -#include "draw_common.h" #include "draw_cache.h" +#include "draw_common.h" #include "draw_view.h" -#include "draw_manager_profiling.h" #include "draw_debug.h" +#include "draw_manager_profiling.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/draw/intern/draw_cache.c b/source/blender/draw/intern/draw_cache.c index 1f76b5ac431..ffd3be9280f 100644 --- a/source/blender/draw/intern/draw_cache.c +++ b/source/blender/draw/intern/draw_cache.c @@ -18,22 +18,22 @@ * \ingroup draw */ -#include "DNA_scene_types.h" +#include "DNA_curve_types.h" #include "DNA_hair_types.h" +#include "DNA_lattice_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" -#include "DNA_curve_types.h" #include "DNA_modifier_types.h" -#include "DNA_lattice_types.h" #include "DNA_object_types.h" #include "DNA_particle_types.h" #include "DNA_pointcloud_types.h" +#include "DNA_scene_types.h" #include "DNA_volume_types.h" #include "UI_resources.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_object.h" #include "BKE_paint.h" diff --git a/source/blender/draw/intern/draw_cache_extract_mesh.c b/source/blender/draw/intern/draw_cache_extract_mesh.c index 852a57f9a97..b86287a03e8 100644 --- a/source/blender/draw/intern/draw_cache_extract_mesh.c +++ b/source/blender/draw/intern/draw_cache_extract_mesh.c @@ -25,16 +25,16 @@ #include "MEM_guardedalloc.h" +#include "BLI_alloca.h" #include "BLI_bitmap.h" #include "BLI_buffer.h" -#include "BLI_utildefines.h" -#include "BLI_math_vector.h" +#include "BLI_edgehash.h" +#include "BLI_jitter_2d.h" #include "BLI_math_bits.h" +#include "BLI_math_vector.h" #include "BLI_string.h" -#include "BLI_alloca.h" -#include "BLI_edgehash.h" #include "BLI_task.h" -#include "BLI_jitter_2d.h" +#include "BLI_utildefines.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" @@ -45,12 +45,12 @@ #include "BKE_customdata.h" #include "BKE_deform.h" #include "BKE_editmesh.h" +#include "BKE_editmesh_bvh.h" #include "BKE_editmesh_cache.h" #include "BKE_editmesh_tangent.h" -#include "BKE_editmesh_bvh.h" #include "BKE_mesh.h" -#include "BKE_mesh_tangent.h" #include "BKE_mesh_runtime.h" +#include "BKE_mesh_tangent.h" #include "BKE_modifier.h" #include "BKE_object_deform.h" @@ -66,8 +66,8 @@ #include "ED_mesh.h" #include "ED_uvedit.h" -#include "draw_cache_inline.h" #include "draw_cache_impl.h" +#include "draw_cache_inline.h" #include "draw_cache_extract.h" diff --git a/source/blender/draw/intern/draw_cache_impl_curve.c b/source/blender/draw/intern/draw_cache_impl_curve.c index 20eff0fb6b8..331f8073ed5 100644 --- a/source/blender/draw/intern/draw_cache_impl_curve.c +++ b/source/blender/draw/intern/draw_cache_impl_curve.c @@ -25,8 +25,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "DNA_curve_types.h" @@ -35,8 +35,8 @@ #include "BKE_font.h" #include "GPU_batch.h" -#include "GPU_texture.h" #include "GPU_material.h" +#include "GPU_texture.h" #include "UI_resources.h" diff --git a/source/blender/draw/intern/draw_cache_impl_displist.c b/source/blender/draw/intern/draw_cache_impl_displist.c index bc4eb37c3b4..04889463447 100644 --- a/source/blender/draw/intern/draw_cache_impl_displist.c +++ b/source/blender/draw/intern/draw_cache_impl_displist.c @@ -26,9 +26,9 @@ */ #include "BLI_alloca.h" -#include "BLI_utildefines.h" #include "BLI_edgehash.h" #include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "DNA_curve_types.h" diff --git a/source/blender/draw/intern/draw_cache_impl_gpencil.c b/source/blender/draw/intern/draw_cache_impl_gpencil.c index 1464cb9364d..afe47160e02 100644 --- a/source/blender/draw/intern/draw_cache_impl_gpencil.c +++ b/source/blender/draw/intern/draw_cache_impl_gpencil.c @@ -31,13 +31,13 @@ #include "DRW_engine.h" #include "DRW_render.h" -#include "GPU_batch.h" #include "ED_gpencil.h" +#include "GPU_batch.h" #include "DEG_depsgraph_query.h" -#include "BLI_polyfill_2d.h" #include "BLI_hash.h" +#include "BLI_polyfill_2d.h" #include "draw_cache.h" #include "draw_cache_impl.h" diff --git a/source/blender/draw/intern/draw_cache_impl_lattice.c b/source/blender/draw/intern/draw_cache_impl_lattice.c index 144bfac0b21..bb313b31deb 100644 --- a/source/blender/draw/intern/draw_cache_impl_lattice.c +++ b/source/blender/draw/intern/draw_cache_impl_lattice.c @@ -25,17 +25,17 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "DNA_curve_types.h" #include "DNA_lattice_types.h" #include "DNA_meshdata_types.h" #include "DNA_userdef_types.h" -#include "BKE_lattice.h" -#include "BKE_deform.h" #include "BKE_colorband.h" +#include "BKE_deform.h" +#include "BKE_lattice.h" #include "GPU_batch.h" diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c index c89b6baa921..aedc86c2eae 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.c +++ b/source/blender/draw/intern/draw_cache_impl_mesh.c @@ -25,14 +25,14 @@ #include "MEM_guardedalloc.h" +#include "BLI_alloca.h" #include "BLI_bitmap.h" #include "BLI_buffer.h" -#include "BLI_utildefines.h" -#include "BLI_math_vector.h" +#include "BLI_edgehash.h" #include "BLI_math_bits.h" +#include "BLI_math_vector.h" #include "BLI_string.h" -#include "BLI_alloca.h" -#include "BLI_edgehash.h" +#include "BLI_utildefines.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" @@ -45,8 +45,8 @@ #include "BKE_editmesh_cache.h" #include "BKE_editmesh_tangent.h" #include "BKE_mesh.h" -#include "BKE_mesh_tangent.h" #include "BKE_mesh_runtime.h" +#include "BKE_mesh_tangent.h" #include "BKE_modifier.h" #include "BKE_object_deform.h" @@ -62,8 +62,8 @@ #include "ED_mesh.h" #include "ED_uvedit.h" -#include "draw_cache_inline.h" #include "draw_cache_extract.h" +#include "draw_cache_inline.h" #include "draw_cache_impl.h" /* own include */ diff --git a/source/blender/draw/intern/draw_cache_impl_particles.c b/source/blender/draw/intern/draw_cache_impl_particles.c index c4433cea0df..42a1dce891d 100644 --- a/source/blender/draw/intern/draw_cache_impl_particles.c +++ b/source/blender/draw/intern/draw_cache_impl_particles.c @@ -27,16 +27,16 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" +#include "BLI_ghash.h" #include "BLI_math_vector.h" #include "BLI_string.h" -#include "BLI_ghash.h" +#include "BLI_utildefines.h" +#include "DNA_customdata_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_particle_types.h" -#include "DNA_customdata_types.h" #include "BKE_mesh.h" #include "BKE_particle.h" diff --git a/source/blender/draw/intern/draw_cache_inline.h b/source/blender/draw/intern/draw_cache_inline.h index f14d23dafcf..a067434f3bb 100644 --- a/source/blender/draw/intern/draw_cache_inline.h +++ b/source/blender/draw/intern/draw_cache_inline.h @@ -23,8 +23,8 @@ #ifndef __DRAW_CACHE_INLINE_H__ #define __DRAW_CACHE_INLINE_H__ -#include "MEM_guardedalloc.h" #include "GPU_batch.h" +#include "MEM_guardedalloc.h" /* Common */ // #define DRW_DEBUG_MESH_CACHE_REQUEST diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c index 87cd1cd8546..0a193f20739 100644 --- a/source/blender/draw/intern/draw_common.c +++ b/source/blender/draw/intern/draw_common.c @@ -27,9 +27,9 @@ #include "UI_resources.h" -#include "BKE_object.h" -#include "BKE_global.h" #include "BKE_colorband.h" +#include "BKE_global.h" +#include "BKE_object.h" #include "BIF_glutil.h" diff --git a/source/blender/draw/intern/draw_hair.c b/source/blender/draw/intern/draw_hair.c index c89f5f5bba6..3055e45a4a5 100644 --- a/source/blender/draw/intern/draw_hair.c +++ b/source/blender/draw/intern/draw_hair.c @@ -25,12 +25,12 @@ #include "DRW_render.h" -#include "BLI_utildefines.h" #include "BLI_string_utils.h" +#include "BLI_utildefines.h" +#include "DNA_customdata_types.h" #include "DNA_modifier_types.h" #include "DNA_particle_types.h" -#include "DNA_customdata_types.h" #include "BKE_anim.h" diff --git a/source/blender/draw/intern/draw_instance_data.c b/source/blender/draw/intern/draw_instance_data.c index 5712fd0ccde..45c201501b3 100644 --- a/source/blender/draw/intern/draw_instance_data.c +++ b/source/blender/draw/intern/draw_instance_data.c @@ -33,10 +33,10 @@ #include "DRW_engine.h" #include "DRW_render.h" /* For DRW_shgroup_get_instance_count() */ -#include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_mempool.h" #include "BLI_memblock.h" +#include "BLI_mempool.h" +#include "BLI_utildefines.h" +#include "MEM_guardedalloc.h" #include "intern/gpu_primitive_private.h" diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 0c049e030b1..adaa1dd6151 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -45,31 +45,31 @@ #include "BKE_mesh.h" #include "BKE_modifier.h" #include "BKE_object.h" -#include "BKE_particle.h" #include "BKE_paint.h" +#include "BKE_particle.h" #include "BKE_pbvh.h" #include "BKE_pointcache.h" #include "BKE_pointcloud.h" #include "BKE_volume.h" -#include "draw_manager.h" #include "DNA_camera_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_world_types.h" +#include "draw_manager.h" -#include "ED_space_api.h" -#include "ED_screen.h" #include "ED_gpencil.h" +#include "ED_screen.h" +#include "ED_space_api.h" #include "ED_view3d.h" #include "GPU_draw.h" #include "GPU_extensions.h" #include "GPU_framebuffer.h" #include "GPU_immediate.h" +#include "GPU_matrix.h" #include "GPU_uniformbuffer.h" #include "GPU_viewport.h" -#include "GPU_matrix.h" #include "IMB_colormanagement.h" @@ -81,20 +81,20 @@ #include "WM_api.h" #include "wm_window.h" -#include "draw_manager_text.h" -#include "draw_manager_profiling.h" #include "draw_color_management.h" +#include "draw_manager_profiling.h" +#include "draw_manager_text.h" /* only for callbacks */ #include "draw_cache_impl.h" -#include "engines/eevee/eevee_engine.h" #include "engines/basic/basic_engine.h" -#include "engines/workbench/workbench_engine.h" +#include "engines/eevee/eevee_engine.h" #include "engines/external/external_engine.h" #include "engines/gpencil/gpencil_engine.h" -#include "engines/select/select_engine.h" #include "engines/overlay/overlay_engine.h" +#include "engines/select/select_engine.h" +#include "engines/workbench/workbench_engine.h" #include "GPU_context.h" diff --git a/source/blender/draw/intern/draw_manager.h b/source/blender/draw/intern/draw_manager.h index cb825becd73..df7f0597017 100644 --- a/source/blender/draw/intern/draw_manager.h +++ b/source/blender/draw/intern/draw_manager.h @@ -30,8 +30,8 @@ #include "BLI_assert.h" #include "BLI_linklist.h" -#include "BLI_threads.h" #include "BLI_memblock.h" +#include "BLI_threads.h" #include "GPU_batch.h" #include "GPU_context.h" diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c index be0dd7751ed..5a92058001f 100644 --- a/source/blender/draw/intern/draw_manager_data.c +++ b/source/blender/draw/intern/draw_manager_data.c @@ -38,8 +38,8 @@ #include "BLI_alloca.h" #include "BLI_hash.h" #include "BLI_link_utils.h" -#include "BLI_mempool.h" #include "BLI_memblock.h" +#include "BLI_mempool.h" #ifdef DRW_DEBUG_CULLING # include "BLI_math_bits.h" diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c index 3d1b43537b7..8e712295b61 100644 --- a/source/blender/draw/intern/draw_manager_exec.c +++ b/source/blender/draw/intern/draw_manager_exec.c @@ -30,8 +30,8 @@ #include "GPU_extensions.h" #include "GPU_platform.h" -#include "intern/gpu_shader_private.h" #include "intern/gpu_primitive_private.h" +#include "intern/gpu_shader_private.h" #ifdef USE_GPU_SELECT # include "GPU_select.h" diff --git a/source/blender/draw/intern/draw_manager_shader.c b/source/blender/draw/intern/draw_manager_shader.c index 7f9a6f578b7..89884d58099 100644 --- a/source/blender/draw/intern/draw_manager_shader.c +++ b/source/blender/draw/intern/draw_manager_shader.c @@ -20,9 +20,9 @@ * \ingroup draw */ +#include "DNA_material_types.h" #include "DNA_object_types.h" #include "DNA_world_types.h" -#include "DNA_material_types.h" #include "BLI_dynstr.h" #include "BLI_listbase.h" @@ -34,8 +34,8 @@ #include "DEG_depsgraph_query.h" -#include "GPU_shader.h" #include "GPU_material.h" +#include "GPU_shader.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/draw/intern/draw_manager_text.c b/source/blender/draw/intern/draw_manager_text.c index b74aacb3283..2692f7b4795 100644 --- a/source/blender/draw/intern/draw_manager_text.c +++ b/source/blender/draw/intern/draw_manager_text.c @@ -22,8 +22,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_memiter.h" #include "BLI_math.h" +#include "BLI_memiter.h" #include "BLI_string.h" #include "BKE_editmesh.h" @@ -44,8 +44,8 @@ #include "UI_interface.h" #include "UI_resources.h" -#include "WM_api.h" #include "BLF_api.h" +#include "WM_api.h" #include "draw_manager_text.h" diff --git a/source/blender/draw/intern/draw_view.c b/source/blender/draw/intern/draw_view.c index 08f5d3ac463..06026d51faf 100644 --- a/source/blender/draw/intern/draw_view.c +++ b/source/blender/draw/intern/draw_view.c @@ -30,9 +30,9 @@ #include "ED_screen.h" #include "ED_view3d.h" -#include "GPU_shader.h" #include "GPU_immediate.h" #include "GPU_matrix.h" +#include "GPU_shader.h" #include "UI_resources.h" |