From 2d1cce8331f3ecdfb8cb0c651e111ffac5dc7153 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Thu, 19 Mar 2020 09:33:03 +0100 Subject: [PATCH] Cleanup: `make format` after SortedIncludes change --- intern/atomic/intern/atomic_ops_msvc.h | 2 +- intern/atomic/intern/atomic_ops_utils.h | 6 +- intern/audaspace/intern/AUD_PyInit.cpp | 2 +- intern/clog/clog.c | 8 +- intern/cycles/app/cycles_cubin_cc.cpp | 2 +- intern/cycles/app/cycles_server.cpp | 2 +- intern/cycles/app/cycles_standalone.cpp | 4 +- intern/cycles/app/cycles_xml.cpp | 4 +- intern/cycles/blender/blender_device.h | 2 +- intern/cycles/blender/blender_mesh.cpp | 6 +- intern/cycles/blender/blender_object.cpp | 6 +- intern/cycles/blender/blender_python.cpp | 4 +- intern/cycles/blender/blender_session.cpp | 2 +- intern/cycles/blender/blender_shader.cpp | 4 +- intern/cycles/blender/blender_sync.cpp | 6 +- intern/cycles/blender/blender_sync.h | 2 +- intern/cycles/blender/blender_texture.h | 2 +- intern/cycles/blender/blender_viewport.h | 2 +- intern/cycles/bvh/bvh_build.cpp | 8 +- intern/cycles/bvh/bvh_embree.cpp | 4 +- intern/cycles/bvh/bvh_optix.cpp | 2 +- .../cycles/device/cuda/device_cuda_impl.cpp | 2 +- intern/cycles/device/device.cpp | 4 +- intern/cycles/device/device.h | 2 +- intern/cycles/device/device_cuda.cpp | 2 +- intern/cycles/device/device_memory.cpp | 2 +- intern/cycles/device/device_multi.cpp | 2 +- intern/cycles/device/device_network.cpp | 2 +- intern/cycles/device/device_network.h | 6 +- intern/cycles/device/device_opencl.cpp | 2 +- intern/cycles/device/device_optix.cpp | 16 +-- intern/cycles/device/opencl/memory_manager.h | 2 +- intern/cycles/device/opencl/opencl_util.cpp | 4 +- intern/cycles/kernel/kernel.h | 2 +- intern/cycles/kernel/kernel_compat_cpu.h | 4 +- intern/cycles/kernel/kernel_globals.h | 2 +- intern/cycles/kernel/osl/osl_closures.h | 4 +- intern/cycles/kernel/osl/osl_globals.h | 2 +- intern/cycles/kernel/osl/osl_services.h | 2 +- .../shaders/node_environment_texture.osl | 2 +- intern/cycles/kernel/shaders/node_fresnel.osl | 2 +- .../cycles/kernel/shaders/node_glass_bsdf.osl | 2 +- .../kernel/shaders/node_glossy_bsdf.osl | 2 +- intern/cycles/kernel/shaders/node_hsv.osl | 2 +- .../kernel/shaders/node_image_texture.osl | 2 +- .../kernel/shaders/node_layer_weight.osl | 2 +- intern/cycles/kernel/shaders/node_math.osl | 2 +- intern/cycles/kernel/shaders/node_mix.osl | 2 +- .../kernel/shaders/node_musgrave_texture.osl | 2 +- .../kernel/shaders/node_noise_texture.osl | 2 +- .../kernel/shaders/node_principled_bsdf.osl | 2 +- .../cycles/kernel/shaders/node_rgb_curves.osl | 2 +- .../cycles/kernel/shaders/node_rgb_ramp.osl | 2 +- .../kernel/shaders/node_separate_hsv.osl | 2 +- .../kernel/shaders/node_sky_texture.osl | 2 +- .../kernel/shaders/node_vector_curves.osl | 2 +- .../kernel/shaders/node_vector_math.osl | 2 +- .../kernel/shaders/node_vector_rotate.osl | 2 +- .../kernel/shaders/node_velvet_bsdf.osl | 2 +- .../kernel/shaders/node_voronoi_texture.osl | 2 +- .../kernel/shaders/node_wave_texture.osl | 2 +- .../shaders/node_white_noise_texture.osl | 2 +- .../cycles/kernel/shaders/node_wireframe.osl | 2 +- intern/cycles/kernel/svm/svm.h | 38 +++--- intern/cycles/render/attribute.cpp | 6 +- intern/cycles/render/background.cpp | 2 +- intern/cycles/render/bake.cpp | 2 +- intern/cycles/render/buffers.cpp | 2 +- intern/cycles/render/colorspace.cpp | 2 +- intern/cycles/render/constant_fold.h | 2 +- intern/cycles/render/curves.cpp | 2 +- intern/cycles/render/denoising.h | 2 +- intern/cycles/render/film.cpp | 4 +- intern/cycles/render/geometry.cpp | 2 +- intern/cycles/render/geometry.h | 2 +- intern/cycles/render/graph.cpp | 4 +- intern/cycles/render/hair.cpp | 2 +- intern/cycles/render/image.cpp | 2 +- intern/cycles/render/integrator.cpp | 4 +- intern/cycles/render/light.cpp | 8 +- intern/cycles/render/merge.cpp | 2 +- intern/cycles/render/mesh.cpp | 2 +- intern/cycles/render/mesh_subdivision.cpp | 12 +- intern/cycles/render/mesh_volume.cpp | 2 +- intern/cycles/render/nodes.cpp | 6 +- intern/cycles/render/nodes.h | 2 +- intern/cycles/render/object.cpp | 8 +- intern/cycles/render/object.h | 2 +- intern/cycles/render/osl.cpp | 2 +- intern/cycles/render/particles.cpp | 2 +- intern/cycles/render/scene.cpp | 2 +- intern/cycles/render/session.cpp | 6 +- intern/cycles/render/session.h | 2 +- intern/cycles/render/shader.h | 2 +- intern/cycles/render/svm.cpp | 2 +- intern/cycles/render/tables.cpp | 2 +- .../test/render_graph_finalize_test.cpp | 4 +- intern/cycles/test/util_avxf_test.h | 2 +- intern/cycles/util/util_boundbox.h | 2 +- intern/cycles/util/util_disjoint_set.h | 2 +- intern/cycles/util/util_half.h | 2 +- intern/cycles/util/util_md5.cpp | 2 +- intern/cycles/util/util_path.cpp | 4 +- intern/cycles/util/util_profiling.cpp | 2 +- intern/cycles/util/util_progress.h | 2 +- intern/cycles/util/util_sky_model.cpp | 2 +- intern/cycles/util/util_string.h | 2 +- intern/cycles/util/util_system.cpp | 4 +- intern/cycles/util/util_task.cpp | 2 +- intern/cycles/util/util_thread.h | 4 +- intern/cycles/util/util_transform.cpp | 2 +- intern/cycles/util/util_types.h | 2 +- intern/dualcon/intern/Projections.cpp | 2 +- intern/dualcon/intern/dualcon_c_api.cpp | 4 +- intern/dualcon/intern/octree.h | 18 +-- intern/eigen/intern/svd.cc | 2 +- intern/ffmpeg/ffmpeg_compat.h | 4 +- intern/ghost/GHOST_IContext.h | 2 +- intern/ghost/GHOST_IEvent.h | 2 +- intern/ghost/GHOST_ISystem.h | 2 +- intern/ghost/GHOST_IWindow.h | 2 +- intern/ghost/intern/GHOST_C-api.cpp | 4 +- .../intern/GHOST_CallbackEventConsumer.cpp | 4 +- .../intern/GHOST_CallbackEventConsumer.h | 2 +- intern/ghost/intern/GHOST_ContextCGL.mm | 4 +- intern/ghost/intern/GHOST_ContextD3D.cpp | 2 +- intern/ghost/intern/GHOST_ContextWGL.cpp | 2 +- .../ghost/intern/GHOST_DisplayManagerCocoa.mm | 2 +- .../ghost/intern/GHOST_DisplayManagerSDL.cpp | 2 +- intern/ghost/intern/GHOST_DropTargetWin32.cpp | 2 +- intern/ghost/intern/GHOST_DropTargetWin32.h | 6 +- intern/ghost/intern/GHOST_DropTargetX11.h | 4 +- intern/ghost/intern/GHOST_EventManager.cpp | 2 +- intern/ghost/intern/GHOST_EventPrinter.cpp | 6 +- intern/ghost/intern/GHOST_ImeWin32.cpp | 2 +- intern/ghost/intern/GHOST_NDOFManager.cpp | 8 +- intern/ghost/intern/GHOST_NDOFManagerCocoa.mm | 2 +- intern/ghost/intern/GHOST_Path-api.cpp | 6 +- intern/ghost/intern/GHOST_System.cpp | 4 +- intern/ghost/intern/GHOST_System.h | 4 +- intern/ghost/intern/GHOST_SystemCocoa.mm | 10 +- intern/ghost/intern/GHOST_SystemNULL.h | 2 +- intern/ghost/intern/GHOST_SystemPathsUnix.cpp | 2 +- intern/ghost/intern/GHOST_SystemPathsUnix.h | 2 +- .../ghost/intern/GHOST_SystemPathsWin32.cpp | 2 +- intern/ghost/intern/GHOST_SystemSDL.cpp | 2 +- intern/ghost/intern/GHOST_SystemSDL.h | 4 +- intern/ghost/intern/GHOST_SystemWin32.cpp | 10 +- intern/ghost/intern/GHOST_SystemWin32.h | 2 +- intern/ghost/intern/GHOST_SystemX11.cpp | 26 ++-- intern/ghost/intern/GHOST_SystemX11.h | 4 +- intern/ghost/intern/GHOST_TaskbarWin32.h | 2 +- intern/ghost/intern/GHOST_TaskbarX11.cpp | 4 +- intern/ghost/intern/GHOST_WindowCocoa.mm | 4 +- intern/ghost/intern/GHOST_WindowManager.cpp | 2 +- intern/ghost/intern/GHOST_WindowManager.h | 2 +- intern/ghost/intern/GHOST_WindowSDL.h | 2 +- intern/ghost/intern/GHOST_WindowWin32.cpp | 14 +- intern/ghost/intern/GHOST_WindowWin32.h | 2 +- intern/ghost/intern/GHOST_WindowX11.cpp | 16 +-- intern/ghost/intern/GHOST_Xr.cpp | 2 +- intern/ghost/intern/GHOST_XrContext.cpp | 2 +- intern/ghost/intern/GHOST_XrEvent.cpp | 2 +- .../ghost/intern/GHOST_XrGraphicsBinding.cpp | 2 +- intern/ghost/intern/GHOST_XrSession.cpp | 2 +- intern/ghost/intern/GHOST_XrSwapchain.cpp | 2 +- intern/ghost/test/gears/GHOST_C-Test.c | 8 +- intern/ghost/test/gears/GHOST_Test.cpp | 6 +- intern/ghost/test/multitest/EventToBuf.c | 2 +- intern/ghost/test/multitest/GL.h | 2 +- intern/ghost/test/multitest/MultiTest.c | 12 +- intern/ghost/test/multitest/Util.c | 2 +- intern/guardedalloc/MEM_guardedalloc.h | 2 +- intern/guardedalloc/cpp/mallocn.cpp | 2 +- .../intern/mallocn_guarded_impl.c | 4 +- .../intern/mallocn_lockfree_impl.c | 2 +- intern/guardedalloc/intern/mmap_win.c | 4 +- intern/guardedalloc/test/simpletest/memtest.c | 6 +- intern/iksolver/intern/IK_QJacobianSolver.h | 2 +- intern/locale/boost_locale_wrapper.cpp | 2 +- intern/memutil/MEM_Allocator.h | 2 +- intern/memutil/MEM_CacheLimiter.h | 2 +- intern/mikktspace/mikktspace.c | 8 +- intern/opencolorio/fallback_impl.cc | 2 +- intern/opencolorio/ocio_impl.cc | 4 +- intern/opensubdiv/internal/opensubdiv.cc | 2 +- .../internal/opensubdiv_converter_internal.cc | 2 +- .../opensubdiv_device_context_cuda.cc | 2 +- .../internal/opensubdiv_evaluator.cc | 2 +- .../internal/opensubdiv_evaluator_internal.cc | 1 - .../opensubdiv/internal/opensubdiv_gl_mesh.cc | 6 +- .../internal/opensubdiv_gl_mesh_fvar.h | 2 +- intern/opensubdiv/internal/opensubdiv_util.h | 2 +- intern/openvdb/intern/openvdb_level_set.cc | 4 +- intern/openvdb/intern/openvdb_level_set.h | 8 +- intern/openvdb/openvdb_capi.cc | 2 +- intern/rigidbody/rb_bullet_api.cpp | 14 +- intern/string/STR_String.h | 4 +- intern/string/intern/STR_String.cpp | 10 +- intern/utfconv/utf_winfunc.c | 2 +- intern/utfconv/utfconv.h | 2 +- .../blender/blendthumb/src/BlenderThumb.cpp | 4 +- source/blender/blendthumb/src/Dll.cpp | 4 +- source/blender/blenfont/intern/blf.c | 8 +- source/blender/blenfont/intern/blf_dir.c | 4 +- source/blender/blenfont/intern/blf_font.c | 6 +- .../blenfont/intern/blf_font_win32_compat.c | 2 +- source/blender/blenfont/intern/blf_glyph.c | 10 +- .../blenfont/intern/blf_internal_types.h | 2 +- source/blender/blenfont/intern/blf_thumbs.c | 2 +- source/blender/blenkernel/BKE_DerivedMesh.h | 4 +- source/blender/blenkernel/BKE_cloth.h | 2 +- source/blender/blenkernel/BKE_collision.h | 2 +- source/blender/blenkernel/BKE_displist.h | 2 +- source/blender/blenkernel/BKE_modifier.h | 4 +- source/blender/blenkernel/BKE_particle.h | 4 +- source/blender/blenkernel/BKE_pointcache.h | 2 +- source/blender/blenkernel/BKE_report.h | 2 +- source/blender/blenkernel/BKE_shader_fx.h | 4 +- source/blender/blenkernel/BKE_subdiv_ccg.h | 2 +- source/blender/blenkernel/intern/CCGSubSurf.c | 6 +- .../blenkernel/intern/CCGSubSurf_legacy.c | 4 +- .../blenkernel/intern/CCGSubSurf_opensubdiv.c | 6 +- .../intern/CCGSubSurf_opensubdiv_converter.c | 4 +- .../blenkernel/intern/CCGSubSurf_util.c | 4 +- .../blender/blenkernel/intern/DerivedMesh.c | 18 +-- source/blender/blenkernel/intern/action.c | 10 +- source/blender/blenkernel/intern/addon.c | 4 +- source/blender/blenkernel/intern/anim.c | 8 +- source/blender/blenkernel/intern/anim_sys.c | 12 +- source/blender/blenkernel/intern/appdir.c | 10 +- source/blender/blenkernel/intern/armature.c | 26 ++-- .../blenkernel/intern/armature_update.c | 2 +- source/blender/blenkernel/intern/autoexec.c | 2 +- source/blender/blenkernel/intern/blender.c | 8 +- .../blenkernel/intern/blender_copybuffer.c | 2 +- .../blender/blenkernel/intern/blender_undo.c | 12 +- source/blender/blenkernel/intern/blendfile.c | 2 +- source/blender/blenkernel/intern/boids.c | 8 +- source/blender/blenkernel/intern/bpath.c | 16 +-- source/blender/blenkernel/intern/brush.c | 8 +- source/blender/blenkernel/intern/bvhutils.c | 6 +- source/blender/blenkernel/intern/cachefile.c | 2 +- source/blender/blenkernel/intern/callbacks.c | 4 +- source/blender/blenkernel/intern/camera.c | 10 +- .../blender/blenkernel/intern/cdderivedmesh.c | 10 +- source/blender/blenkernel/intern/cloth.c | 12 +- source/blender/blenkernel/intern/collection.c | 2 +- source/blender/blenkernel/intern/collision.c | 12 +- source/blender/blenkernel/intern/colorband.c | 8 +- source/blender/blenkernel/intern/colortools.c | 6 +- source/blender/blenkernel/intern/constraint.c | 20 +-- source/blender/blenkernel/intern/context.c | 10 +- source/blender/blenkernel/intern/crazyspace.c | 16 +-- source/blender/blenkernel/intern/curve.c | 12 +- .../blenkernel/intern/curve_decimate.c | 2 +- .../blender/blenkernel/intern/curveprofile.c | 10 +- source/blender/blenkernel/intern/customdata.c | 10 +- .../blenkernel/intern/customdata_file.c | 4 +- .../blender/blenkernel/intern/data_transfer.c | 6 +- source/blender/blenkernel/intern/deform.c | 8 +- source/blender/blenkernel/intern/displist.c | 14 +- .../blender/blenkernel/intern/dynamicpaint.c | 4 +- .../blender/blenkernel/intern/editlattice.c | 8 +- source/blender/blenkernel/intern/editmesh.c | 2 +- .../blender/blenkernel/intern/editmesh_bvh.c | 2 +- .../blenkernel/intern/editmesh_tangent.c | 6 +- source/blender/blenkernel/intern/effect.c | 12 +- source/blender/blenkernel/intern/fcurve.c | 28 ++-- source/blender/blenkernel/intern/fluid.c | 2 +- source/blender/blenkernel/intern/fmodifier.c | 10 +- source/blender/blenkernel/intern/font.c | 24 ++-- source/blender/blenkernel/intern/gpencil.c | 22 ++-- .../blenkernel/intern/gpencil_modifier.c | 18 +-- source/blender/blenkernel/intern/hair.c | 2 +- source/blender/blenkernel/intern/icons.c | 6 +- .../blenkernel/intern/icons_rasterize.c | 2 +- source/blender/blenkernel/intern/idcode.c | 2 +- source/blender/blenkernel/intern/idprop.c | 6 +- .../blender/blenkernel/intern/idprop_utils.c | 6 +- source/blender/blenkernel/intern/image.c | 26 ++-- source/blender/blenkernel/intern/ipo.c | 16 +-- source/blender/blenkernel/intern/key.c | 6 +- source/blender/blenkernel/intern/keyconfig.c | 4 +- source/blender/blenkernel/intern/lattice.c | 20 +-- source/blender/blenkernel/intern/layer.c | 4 +- .../blender/blenkernel/intern/layer_utils.c | 2 +- source/blender/blenkernel/intern/lib_id.c | 34 ++--- .../blender/blenkernel/intern/lib_id_delete.c | 26 ++-- .../blender/blenkernel/intern/lib_override.c | 2 +- source/blender/blenkernel/intern/lib_query.c | 12 +- source/blender/blenkernel/intern/lib_remap.c | 2 +- source/blender/blenkernel/intern/light.c | 4 +- source/blender/blenkernel/intern/lightprobe.c | 4 +- source/blender/blenkernel/intern/linestyle.c | 10 +- source/blender/blenkernel/intern/main_idmap.c | 4 +- source/blender/blenkernel/intern/mask.c | 12 +- .../blender/blenkernel/intern/mask_evaluate.c | 2 +- .../blenkernel/intern/mask_rasterize.c | 10 +- source/blender/blenkernel/intern/material.c | 26 ++-- source/blender/blenkernel/intern/mball.c | 24 ++-- .../blenkernel/intern/mball_tessellate.c | 12 +- source/blender/blenkernel/intern/mesh.c | 20 +-- .../blender/blenkernel/intern/mesh_convert.c | 22 ++-- .../blender/blenkernel/intern/mesh_evaluate.c | 14 +- .../blender/blenkernel/intern/mesh_mapping.c | 6 +- source/blender/blenkernel/intern/mesh_merge.c | 4 +- .../blender/blenkernel/intern/mesh_mirror.c | 2 +- source/blender/blenkernel/intern/mesh_remap.c | 2 +- .../blenkernel/intern/mesh_remesh_voxel.c | 18 +-- .../blender/blenkernel/intern/mesh_runtime.c | 2 +- .../blender/blenkernel/intern/mesh_tangent.c | 4 +- .../blender/blenkernel/intern/mesh_validate.c | 4 +- source/blender/blenkernel/intern/modifier.c | 16 +-- source/blender/blenkernel/intern/movieclip.c | 10 +- source/blender/blenkernel/intern/multires.c | 6 +- .../intern/multires_reshape_apply_base.c | 4 +- .../intern/multires_reshape_smooth.c | 2 +- .../blenkernel/intern/multires_reshape_util.c | 4 +- source/blender/blenkernel/intern/nla.c | 10 +- source/blender/blenkernel/intern/node.c | 12 +- source/blender/blenkernel/intern/object.c | 70 +++++----- .../blender/blenkernel/intern/object_deform.c | 12 +- .../blender/blenkernel/intern/object_dupli.c | 8 +- .../blenkernel/intern/object_facemap.c | 10 +- .../blender/blenkernel/intern/object_update.c | 12 +- .../blenkernel/intern/ocean_spectrum.c | 2 +- .../blenkernel/intern/outliner_treehash.c | 2 +- source/blender/blenkernel/intern/packedFile.c | 8 +- source/blender/blenkernel/intern/paint.c | 14 +- .../blenkernel/intern/paint_toolslots.c | 6 +- source/blender/blenkernel/intern/particle.c | 22 ++-- .../blenkernel/intern/particle_distribute.c | 2 +- .../blenkernel/intern/particle_system.c | 32 ++--- source/blender/blenkernel/intern/pbvh.c | 8 +- source/blender/blenkernel/intern/pbvh_bmesh.c | 4 +- source/blender/blenkernel/intern/pointcache.c | 10 +- source/blender/blenkernel/intern/pointcloud.c | 2 +- source/blender/blenkernel/intern/report.c | 4 +- source/blender/blenkernel/intern/rigidbody.c | 12 +- source/blender/blenkernel/intern/scene.c | 16 +-- source/blender/blenkernel/intern/screen.c | 8 +- source/blender/blenkernel/intern/seqcache.c | 18 +-- source/blender/blenkernel/intern/seqeffects.c | 14 +- .../blender/blenkernel/intern/seqmodifier.c | 6 +- .../blender/blenkernel/intern/seqprefetch.c | 12 +- source/blender/blenkernel/intern/sequencer.c | 26 ++-- source/blender/blenkernel/intern/shader_fx.c | 12 +- source/blender/blenkernel/intern/shrinkwrap.c | 22 ++-- source/blender/blenkernel/intern/softbody.c | 16 +-- source/blender/blenkernel/intern/sound.c | 20 +-- source/blender/blenkernel/intern/speaker.c | 2 +- .../blender/blenkernel/intern/studiolight.c | 2 +- .../blenkernel/intern/subdiv_converter_mesh.c | 2 +- .../blender/blenkernel/intern/subdiv_deform.c | 2 +- .../intern/subdiv_displacement_multires.c | 2 +- .../blender/blenkernel/intern/subdiv_eval.c | 2 +- .../blenkernel/intern/subdiv_foreach.c | 4 +- .../blender/blenkernel/intern/subdiv_mesh.c | 4 +- .../blender/blenkernel/intern/subsurf_ccg.c | 10 +- source/blender/blenkernel/intern/text.c | 16 +-- .../blenkernel/intern/text_suggestions.c | 4 +- source/blender/blenkernel/intern/texture.c | 36 +++--- source/blender/blenkernel/intern/tracking.c | 14 +- .../blender/blenkernel/intern/tracking_auto.c | 6 +- .../intern/tracking_plane_tracker.c | 2 +- .../intern/tracking_region_tracker.c | 6 +- .../blenkernel/intern/tracking_solver.c | 6 +- .../blenkernel/intern/tracking_stabilize.c | 16 +-- .../blender/blenkernel/intern/tracking_util.c | 8 +- .../blender/blenkernel/intern/undo_system.c | 4 +- source/blender/blenkernel/intern/unit.c | 10 +- source/blender/blenkernel/intern/volume.cc | 2 +- source/blender/blenkernel/intern/workspace.c | 6 +- source/blender/blenkernel/intern/world.c | 10 +- .../blender/blenkernel/intern/writeffmpeg.c | 4 +- source/blender/blenkernel/nla_private.h | 2 +- source/blender/blenlib/BLI_allocator.h | 4 +- source/blender/blenlib/BLI_array_cxx.h | 4 +- source/blender/blenlib/BLI_array_ref.h | 8 +- source/blender/blenlib/BLI_hash_cxx.h | 4 +- source/blender/blenlib/BLI_index_range.h | 2 +- source/blender/blenlib/BLI_map.h | 2 +- source/blender/blenlib/BLI_math.h | 6 +- source/blender/blenlib/BLI_math_base.h | 2 +- source/blender/blenlib/BLI_memiter.h | 2 +- source/blender/blenlib/BLI_memory_utils_cxx.h | 2 +- source/blender/blenlib/BLI_open_addressing.h | 6 +- source/blender/blenlib/BLI_optional.h | 2 +- source/blender/blenlib/BLI_rect.h | 4 +- source/blender/blenlib/BLI_string.h | 2 +- source/blender/blenlib/BLI_string_map.h | 2 +- source/blender/blenlib/BLI_string_ref.h | 4 +- source/blender/blenlib/BLI_sys_types.h | 4 +- source/blender/blenlib/BLI_utildefines.h | 2 +- source/blender/blenlib/BLI_vector.h | 8 +- source/blender/blenlib/PIL_time_utildefines.h | 2 +- source/blender/blenlib/intern/BLI_args.c | 6 +- source/blender/blenlib/intern/BLI_dynstr.c | 6 +- source/blender/blenlib/intern/BLI_filelist.c | 16 +-- source/blender/blenlib/intern/BLI_ghash.c | 8 +- .../blender/blenlib/intern/BLI_ghash_utils.c | 4 +- source/blender/blenlib/intern/BLI_heap.c | 2 +- .../blender/blenlib/intern/BLI_heap_simple.c | 2 +- .../blender/blenlib/intern/BLI_index_range.cc | 4 +- source/blender/blenlib/intern/BLI_kdopbvh.c | 6 +- source/blender/blenlib/intern/BLI_linklist.c | 2 +- source/blender/blenlib/intern/BLI_memarena.c | 2 +- source/blender/blenlib/intern/BLI_memblock.c | 2 +- source/blender/blenlib/intern/BLI_memiter.c | 2 +- source/blender/blenlib/intern/BLI_mempool.c | 2 +- source/blender/blenlib/intern/DLRB_tree.c | 2 +- source/blender/blenlib/intern/array_utils.c | 4 +- source/blender/blenlib/intern/astar.c | 2 +- source/blender/blenlib/intern/bitmap.c | 4 +- source/blender/blenlib/intern/boxpack_2d.c | 6 +- source/blender/blenlib/intern/dynlib.c | 2 +- source/blender/blenlib/intern/edgehash.c | 4 +- source/blender/blenlib/intern/endian_switch.c | 2 +- .../blender/blenlib/intern/expr_pylike_eval.c | 18 +-- source/blender/blenlib/intern/fileops.c | 26 ++-- source/blender/blenlib/intern/freetypefont.c | 12 +- source/blender/blenlib/intern/gsqueue.c | 2 +- source/blender/blenlib/intern/hash_md5.c | 2 +- source/blender/blenlib/intern/hash_mm3.c | 2 +- source/blender/blenlib/intern/jitter_2d.c | 4 +- source/blender/blenlib/intern/kdtree_impl.h | 4 +- source/blender/blenlib/intern/listbase.c | 2 +- .../blender/blenlib/intern/math_base_inline.c | 2 +- source/blender/blenlib/intern/math_matrix.c | 2 +- source/blender/blenlib/intern/math_rotation.c | 2 +- source/blender/blenlib/intern/path_util.c | 16 +-- source/blender/blenlib/intern/polyfill_2d.c | 4 +- .../blenlib/intern/polyfill_2d_beautify.c | 4 +- source/blender/blenlib/intern/rand.c | 8 +- source/blender/blenlib/intern/rct.c | 6 +- source/blender/blenlib/intern/scanfill.c | 4 +- .../blender/blenlib/intern/scanfill_utils.c | 6 +- source/blender/blenlib/intern/smallhash.c | 2 +- source/blender/blenlib/intern/stack.c | 2 +- source/blender/blenlib/intern/storage.c | 20 +-- source/blender/blenlib/intern/string.c | 8 +- .../blenlib/intern/string_cursor_utf8.c | 2 +- source/blender/blenlib/intern/string_utf8.c | 4 +- source/blender/blenlib/intern/string_utils.c | 2 +- source/blender/blenlib/intern/system.c | 4 +- source/blender/blenlib/intern/threads.c | 10 +- source/blender/blenlib/intern/time.c | 2 +- source/blender/blenlib/intern/timecode.c | 4 +- source/blender/blenlib/intern/voronoi_2d.c | 2 +- source/blender/blenlib/intern/winstuff.c | 8 +- source/blender/blenlib/intern/winstuff_dir.c | 2 +- .../blenloader/intern/blend_validate.c | 2 +- .../blender/blenloader/intern/readblenentry.c | 10 +- source/blender/blenloader/intern/readfile.c | 46 +++---- source/blender/blenloader/intern/readfile.h | 2 +- source/blender/blenloader/intern/undofile.c | 10 +- .../blenloader/intern/versioning_250.c | 14 +- .../blenloader/intern/versioning_260.c | 8 +- .../blenloader/intern/versioning_270.c | 28 ++-- .../blenloader/intern/versioning_280.c | 28 ++-- .../blenloader/intern/versioning_cycles.c | 8 +- .../blenloader/intern/versioning_defaults.c | 11 +- .../blenloader/intern/versioning_legacy.c | 10 +- .../blenloader/intern/versioning_userdef.c | 8 +- source/blender/blenloader/intern/writefile.c | 48 +++---- .../blender/blentranslation/intern/blt_lang.c | 2 +- .../blender/blentranslation/msgfmt/msgfmt.c | 4 +- source/blender/bmesh/bmesh.h | 10 +- source/blender/bmesh/intern/bmesh_core.c | 4 +- source/blender/bmesh/intern/bmesh_edgeloop.c | 4 +- source/blender/bmesh/intern/bmesh_iterators.c | 2 +- source/blender/bmesh/intern/bmesh_log.c | 2 +- source/blender/bmesh/intern/bmesh_marking.c | 2 +- source/blender/bmesh/intern/bmesh_mesh_conv.c | 10 +- .../bmesh/intern/bmesh_mesh_validate.c | 2 +- source/blender/bmesh/intern/bmesh_mods.c | 2 +- source/blender/bmesh/intern/bmesh_operators.c | 6 +- source/blender/bmesh/intern/bmesh_polygon.c | 6 +- .../bmesh/intern/bmesh_polygon_edgenet.c | 10 +- source/blender/bmesh/intern/bmesh_query.c | 2 +- source/blender/bmesh/intern/bmesh_walkers.c | 2 +- source/blender/bmesh/operators/bmo_bevel.c | 4 +- .../bmesh/operators/bmo_bisect_plane.c | 2 +- source/blender/bmesh/operators/bmo_bridge.c | 2 +- source/blender/bmesh/operators/bmo_connect.c | 4 +- .../bmesh/operators/bmo_connect_concave.c | 8 +- .../bmesh/operators/bmo_connect_nonplanar.c | 4 +- .../bmesh/operators/bmo_connect_pair.c | 2 +- source/blender/bmesh/operators/bmo_dissolve.c | 2 +- source/blender/bmesh/operators/bmo_dupe.c | 2 +- source/blender/bmesh/operators/bmo_edgenet.c | 2 +- source/blender/bmesh/operators/bmo_extrude.c | 2 +- .../bmesh/operators/bmo_fill_attribute.c | 2 +- source/blender/bmesh/operators/bmo_inset.c | 2 +- .../blender/bmesh/operators/bmo_mesh_conv.c | 2 +- source/blender/bmesh/operators/bmo_normals.c | 2 +- .../bmesh/operators/bmo_offset_edgeloops.c | 2 +- .../bmesh/operators/bmo_planar_faces.c | 2 +- .../bmesh/operators/bmo_removedoubles.c | 4 +- .../bmesh/operators/bmo_rotate_edges.c | 2 +- .../blender/bmesh/operators/bmo_subdivide.c | 6 +- .../bmesh/operators/bmo_subdivide_edgering.c | 6 +- .../blender/bmesh/operators/bmo_symmetrize.c | 2 +- .../blender/bmesh/operators/bmo_triangulate.c | 2 +- source/blender/bmesh/operators/bmo_utils.c | 2 +- source/blender/bmesh/tools/bmesh_beautify.c | 2 +- source/blender/bmesh/tools/bmesh_bevel.c | 2 +- .../blender/bmesh/tools/bmesh_bisect_plane.c | 4 +- .../bmesh/tools/bmesh_decimate_collapse.c | 6 +- .../bmesh/tools/bmesh_decimate_dissolve.c | 2 +- source/blender/bmesh/tools/bmesh_edgenet.c | 4 +- source/blender/bmesh/tools/bmesh_intersect.c | 8 +- source/blender/bmesh/tools/bmesh_path.c | 4 +- .../blender/bmesh/tools/bmesh_path_region.c | 6 +- .../blender/bmesh/tools/bmesh_region_match.c | 8 +- source/blender/bmesh/tools/bmesh_separate.c | 4 +- .../blender/bmesh/tools/bmesh_triangulate.c | 4 +- source/blender/bmesh/tools/bmesh_wireframe.c | 2 +- .../compositor/intern/COM_CompositorContext.h | 10 +- .../compositor/intern/COM_Converter.cpp | 10 +- .../blender/compositor/intern/COM_Debug.cpp | 10 +- .../compositor/intern/COM_ExecutionGroup.cpp | 16 +-- .../compositor/intern/COM_ExecutionGroup.h | 8 +- .../compositor/intern/COM_ExecutionSystem.cpp | 12 +- .../compositor/intern/COM_ExecutionSystem.h | 6 +- source/blender/compositor/intern/COM_Node.h | 4 +- .../compositor/intern/COM_NodeConverter.cpp | 4 +- .../compositor/intern/COM_NodeOperation.cpp | 4 +- .../compositor/intern/COM_NodeOperation.h | 4 +- .../intern/COM_NodeOperationBuilder.cpp | 8 +- .../compositor/intern/COM_OpenCLDevice.h | 4 +- .../compositor/intern/COM_WorkScheduler.cpp | 8 +- .../compositor/intern/COM_WorkScheduler.h | 2 +- .../compositor/intern/COM_compositor.cpp | 6 +- .../compositor/nodes/COM_AlphaOverNode.cpp | 2 +- .../nodes/COM_BilateralBlurNode.cpp | 4 +- .../blender/compositor/nodes/COM_BlurNode.cpp | 12 +- .../compositor/nodes/COM_BokehBlurNode.cpp | 10 +- .../compositor/nodes/COM_BoxMaskNode.cpp | 2 +- .../compositor/nodes/COM_ColorBalanceNode.cpp | 6 +- .../compositor/nodes/COM_ColorNode.cpp | 2 +- .../compositor/nodes/COM_ColorRampNode.cpp | 2 +- .../compositor/nodes/COM_CryptomatteNode.cpp | 8 +- .../compositor/nodes/COM_DefocusNode.cpp | 18 +-- .../compositor/nodes/COM_DenoiseNode.cpp | 6 +- .../compositor/nodes/COM_DespeckleNode.cpp | 6 +- .../compositor/nodes/COM_DilateErodeNode.cpp | 6 +- .../nodes/COM_DirectionalBlurNode.cpp | 4 +- .../nodes/COM_DistanceMatteNode.cpp | 2 +- .../compositor/nodes/COM_EllipseMaskNode.cpp | 2 +- .../compositor/nodes/COM_FilterNode.cpp | 6 +- .../blender/compositor/nodes/COM_FlipNode.cpp | 2 +- .../compositor/nodes/COM_GammaNode.cpp | 2 +- .../compositor/nodes/COM_GlareNode.cpp | 12 +- .../COM_HueSaturationValueCorrectNode.cpp | 2 +- .../nodes/COM_HueSaturationValueNode.cpp | 2 +- .../compositor/nodes/COM_IDMaskNode.cpp | 4 +- .../compositor/nodes/COM_ImageNode.cpp | 10 +- .../blender/compositor/nodes/COM_ImageNode.h | 4 +- .../compositor/nodes/COM_InpaintNode.cpp | 4 +- .../compositor/nodes/COM_InvertNode.cpp | 4 +- .../compositor/nodes/COM_KeyingNode.cpp | 4 +- .../nodes/COM_LuminanceMatteNode.cpp | 2 +- .../compositor/nodes/COM_MapRangeNode.cpp | 2 +- .../compositor/nodes/COM_MapUVNode.cpp | 2 +- .../compositor/nodes/COM_MapValueNode.cpp | 2 +- .../blender/compositor/nodes/COM_MathNode.cpp | 2 +- .../compositor/nodes/COM_MovieClipNode.cpp | 4 +- .../nodes/COM_MovieDistortionNode.cpp | 2 +- .../compositor/nodes/COM_NormalNode.cpp | 2 +- .../compositor/nodes/COM_NormalizeNode.cpp | 2 +- .../compositor/nodes/COM_OutputFileNode.cpp | 4 +- .../compositor/nodes/COM_PixelateNode.cpp | 2 +- .../nodes/COM_PlaneTrackDeformNode.cpp | 2 +- .../compositor/nodes/COM_RenderLayersNode.cpp | 2 +- .../compositor/nodes/COM_RenderLayersNode.h | 2 +- .../compositor/nodes/COM_RotateNode.cpp | 2 +- .../compositor/nodes/COM_ScaleNode.cpp | 6 +- .../compositor/nodes/COM_SetAlphaNode.cpp | 2 +- .../compositor/nodes/COM_SocketProxyNode.cpp | 6 +- .../compositor/nodes/COM_SplitViewerNode.cpp | 2 +- .../compositor/nodes/COM_Stabilize2dNode.cpp | 6 +- .../blender/compositor/nodes/COM_TimeNode.cpp | 2 +- .../compositor/nodes/COM_TonemapNode.cpp | 2 +- .../compositor/nodes/COM_TransformNode.cpp | 4 +- .../compositor/nodes/COM_TranslateNode.cpp | 2 +- .../compositor/nodes/COM_ValueNode.cpp | 2 +- .../compositor/nodes/COM_VectorBlurNode.cpp | 2 +- .../compositor/nodes/COM_VectorCurveNode.cpp | 2 +- .../compositor/nodes/COM_ViewLevelsNode.cpp | 2 +- .../compositor/nodes/COM_ViewerNode.cpp | 4 +- .../compositor/nodes/COM_ZCombineNode.cpp | 6 +- .../COM_CalculateStandardDeviationOperation.h | 2 +- .../operations/COM_ColorCurveOperation.h | 2 +- .../operations/COM_CompositorOperation.cpp | 6 +- .../operations/COM_CompositorOperation.h | 2 +- .../COM_ConvertDepthToRadiusOperation.cpp | 2 +- .../COM_ConvertDepthToRadiusOperation.h | 2 +- .../COM_DistanceYCCMatteOperation.h | 2 +- .../COM_DoubleEdgeMaskOperation.cpp | 2 +- .../COM_FastGaussianBlurOperation.cpp | 2 +- .../COM_GaussianAlphaXBlurOperation.h | 2 +- .../COM_GaussianAlphaYBlurOperation.h | 2 +- .../COM_GaussianBokehBlurOperation.h | 2 +- .../operations/COM_GaussianXBlurOperation.cpp | 2 +- .../operations/COM_GaussianXBlurOperation.h | 2 +- .../operations/COM_GaussianYBlurOperation.cpp | 2 +- .../operations/COM_GaussianYBlurOperation.h | 2 +- .../operations/COM_GlareFogGlowOperation.h | 2 +- .../operations/COM_GlareGhostOperation.h | 2 +- .../operations/COM_GlareSimpleStarOperation.h | 2 +- .../operations/COM_GlareStreaksOperation.h | 2 +- .../COM_HueSaturationValueCorrectOperation.h | 2 +- .../operations/COM_ImageOperation.cpp | 12 +- .../operations/COM_ImageOperation.h | 8 +- .../compositor/operations/COM_MaskOperation.h | 2 +- .../COM_MovieClipAttributeOperation.cpp | 2 +- .../operations/COM_MovieClipOperation.h | 2 +- .../COM_MovieDistortionOperation.cpp | 2 +- .../COM_OutputFileMultiViewOperation.cpp | 4 +- .../COM_OutputFileMultiViewOperation.h | 2 +- .../operations/COM_OutputFileOperation.cpp | 2 +- .../operations/COM_OutputFileOperation.h | 2 +- .../COM_PlaneDistortCommonOperation.cpp | 2 +- .../operations/COM_PreviewOperation.cpp | 18 +-- .../operations/COM_PreviewOperation.h | 8 +- .../operations/COM_ReadBufferOperation.h | 4 +- .../operations/COM_RenderLayersProg.cpp | 4 +- .../operations/COM_RenderLayersProg.h | 6 +- .../COM_ScreenLensDistortionOperation.cpp | 2 +- .../operations/COM_SplitOperation.cpp | 4 +- .../operations/COM_TextureOperation.cpp | 2 +- .../operations/COM_TextureOperation.h | 4 +- .../operations/COM_VectorBlurOperation.cpp | 4 +- .../operations/COM_VectorBlurOperation.h | 2 +- .../operations/COM_VectorCurveOperation.h | 2 +- .../operations/COM_ViewerOperation.cpp | 12 +- .../operations/COM_ViewerOperation.h | 4 +- .../operations/COM_WriteBufferOperation.cpp | 2 +- .../operations/COM_WriteBufferOperation.h | 2 +- source/blender/datatoc/datatoc.c | 2 +- source/blender/datatoc/datatoc_icon.c | 6 +- .../depsgraph/intern/builder/deg_builder.cc | 10 +- .../intern/builder/deg_builder_cycle.cc | 2 +- .../intern/builder/deg_builder_nodes.cc | 12 +- .../intern/builder/deg_builder_nodes_rig.cc | 4 +- .../builder/deg_builder_nodes_view_layer.cc | 4 +- .../intern/builder/deg_builder_pchanmap.cc | 2 +- .../intern/builder/deg_builder_relations.cc | 22 ++-- .../intern/builder/deg_builder_relations.h | 4 +- .../builder/deg_builder_relations_rig.cc | 6 +- .../deg_builder_relations_view_layer.cc | 4 +- .../intern/builder/deg_builder_remove_noop.cc | 6 +- .../intern/builder/deg_builder_rna.cc | 4 +- .../intern/builder/deg_builder_transitive.cc | 2 +- .../depsgraph/intern/debug/deg_debug.cc | 2 +- .../depsgraph/intern/debug/deg_debug.h | 2 +- .../debug/deg_debug_relations_graphviz.cc | 2 +- source/blender/depsgraph/intern/depsgraph.cc | 10 +- .../depsgraph/intern/depsgraph_build.cc | 6 +- .../depsgraph/intern/depsgraph_debug.cc | 6 +- .../depsgraph/intern/depsgraph_eval.cc | 2 +- .../depsgraph/intern/depsgraph_physics.cc | 2 +- .../depsgraph/intern/depsgraph_query.cc | 4 +- .../intern/depsgraph_query_foreach.cc | 2 +- .../depsgraph/intern/depsgraph_query_iter.cc | 4 +- .../blender/depsgraph/intern/depsgraph_tag.cc | 6 +- .../depsgraph/intern/depsgraph_type.cc | 2 +- .../blender/depsgraph/intern/depsgraph_type.h | 6 +- .../blender/depsgraph/intern/eval/deg_eval.cc | 10 +- .../intern/eval/deg_eval_copy_on_write.cc | 16 +-- .../depsgraph/intern/eval/deg_eval_flush.cc | 4 +- .../eval/deg_eval_runtime_backup_scene.cc | 2 +- .../eval/deg_eval_runtime_backup_sequencer.h | 2 +- .../depsgraph/intern/eval/deg_eval_stats.cc | 2 +- .../intern/node/deg_node_component.cc | 6 +- .../intern/node/deg_node_component.h | 2 +- .../depsgraph/intern/node/deg_node_factory.h | 2 +- .../depsgraph/intern/node/deg_node_id.cc | 6 +- .../depsgraph/intern/node/deg_node_id.h | 2 +- .../intern/node/deg_node_operation.cc | 4 +- .../blender/draw/engines/eevee/eevee_data.c | 2 +- .../draw/engines/eevee/eevee_depth_of_field.c | 2 +- .../draw/engines/eevee/eevee_effects.c | 4 +- .../draw/engines/eevee/eevee_lightprobes.c | 8 +- .../draw/engines/eevee/eevee_lookdev.c | 4 +- .../draw/engines/eevee/eevee_materials.c | 2 +- .../draw/engines/eevee/eevee_motion_blur.c | 4 +- .../blender/draw/engines/eevee/eevee_render.c | 2 +- .../engines/eevee/eevee_screen_raytrace.c | 2 +- .../draw/engines/eevee/eevee_shadows.c | 2 +- .../draw/engines/eevee/eevee_subsurface.c | 4 +- .../engines/eevee/eevee_temporal_sampling.c | 2 +- .../draw/engines/eevee/eevee_volumes.c | 6 +- .../engines/gpencil/gpencil_cache_utils.c | 4 +- .../draw/engines/gpencil/gpencil_engine.c | 2 +- .../draw/engines/gpencil/gpencil_shader_fx.c | 2 +- .../draw/engines/overlay/overlay_armature.c | 4 +- .../draw/engines/overlay/overlay_background.c | 2 +- .../draw/engines/overlay/overlay_extra.c | 4 +- .../draw/engines/overlay/overlay_facing.c | 2 +- .../draw/engines/overlay/overlay_sculpt.c | 2 +- .../draw/engines/overlay/overlay_wireframe.c | 2 +- .../draw/engines/select/select_engine.c | 2 +- .../draw/engines/workbench/workbench_data.c | 2 +- .../engines/workbench/workbench_materials.c | 2 +- .../engines/workbench/workbench_private.h | 2 +- .../draw/engines/workbench/workbench_volume.c | 2 +- source/blender/draw/intern/DRW_render.h | 8 +- source/blender/draw/intern/draw_cache.c | 8 +- .../draw/intern/draw_cache_extract_mesh.c | 18 +-- .../draw/intern/draw_cache_impl_curve.c | 4 +- .../draw/intern/draw_cache_impl_displist.c | 2 +- .../draw/intern/draw_cache_impl_gpencil.c | 4 +- .../draw/intern/draw_cache_impl_lattice.c | 6 +- .../draw/intern/draw_cache_impl_mesh.c | 14 +- .../draw/intern/draw_cache_impl_particles.c | 6 +- .../blender/draw/intern/draw_cache_inline.h | 2 +- source/blender/draw/intern/draw_common.c | 4 +- source/blender/draw/intern/draw_hair.c | 4 +- .../blender/draw/intern/draw_instance_data.c | 6 +- source/blender/draw/intern/draw_manager.c | 20 +-- source/blender/draw/intern/draw_manager.h | 2 +- .../blender/draw/intern/draw_manager_data.c | 2 +- .../blender/draw/intern/draw_manager_exec.c | 2 +- .../blender/draw/intern/draw_manager_shader.c | 4 +- .../blender/draw/intern/draw_manager_text.c | 4 +- source/blender/draw/intern/draw_view.c | 2 +- .../editors/animation/anim_channels_defines.c | 22 ++-- .../editors/animation/anim_channels_edit.c | 18 +-- source/blender/editors/animation/anim_deps.c | 6 +- source/blender/editors/animation/anim_draw.c | 18 +-- .../blender/editors/animation/anim_filter.c | 28 ++-- .../blender/editors/animation/anim_markers.c | 10 +- .../editors/animation/anim_motion_paths.c | 4 +- source/blender/editors/animation/anim_ops.c | 6 +- source/blender/editors/animation/drivers.c | 6 +- .../editors/animation/keyframes_draw.c | 10 +- .../editors/animation/keyframes_edit.c | 6 +- .../editors/animation/keyframes_general.c | 16 +-- source/blender/editors/animation/keyframing.c | 14 +- source/blender/editors/animation/keyingsets.c | 12 +- .../blender/editors/animation/time_scrub_ui.c | 4 +- .../blender/editors/armature/armature_add.c | 4 +- .../blender/editors/armature/armature_edit.c | 6 +- .../editors/armature/armature_naming.c | 8 +- .../editors/armature/armature_select.c | 4 +- .../editors/armature/armature_skinning.c | 2 +- .../editors/armature/editarmature_undo.c | 2 +- .../blender/editors/armature/meshlaplacian.c | 8 +- source/blender/editors/armature/pose_edit.c | 8 +- source/blender/editors/armature/pose_group.c | 2 +- source/blender/editors/armature/pose_lib.c | 6 +- source/blender/editors/armature/pose_select.c | 4 +- source/blender/editors/armature/pose_slide.c | 2 +- source/blender/editors/armature/pose_utils.c | 2 +- source/blender/editors/curve/curve_ops.c | 2 +- source/blender/editors/curve/editcurve.c | 6 +- source/blender/editors/curve/editcurve_add.c | 4 +- .../blender/editors/curve/editcurve_paint.c | 6 +- .../blender/editors/curve/editcurve_select.c | 6 +- source/blender/editors/curve/editcurve_undo.c | 8 +- source/blender/editors/curve/editfont.c | 6 +- source/blender/editors/curve/editfont_undo.c | 6 +- .../gizmo_library/gizmo_library_presets.c | 6 +- .../gizmo_library/gizmo_library_utils.c | 2 +- .../gizmo_library/gizmo_types/arrow3d_gizmo.c | 6 +- .../gizmo_library/gizmo_types/blank3d_gizmo.c | 4 +- .../gizmo_types/button2d_gizmo.c | 6 +- .../gizmo_library/gizmo_types/cage2d_gizmo.c | 8 +- .../gizmo_library/gizmo_types/cage3d_gizmo.c | 6 +- .../gizmo_library/gizmo_types/dial3d_gizmo.c | 6 +- .../gizmo_library/gizmo_types/move3d_gizmo.c | 4 +- .../blender/editors/gpencil/annotate_draw.c | 18 +-- .../blender/editors/gpencil/annotate_paint.c | 10 +- source/blender/editors/gpencil/drawgpencil.c | 24 ++-- .../editors/gpencil/editaction_gpencil.c | 8 +- .../editors/gpencil/gpencil_armature.c | 14 +- .../blender/editors/gpencil/gpencil_convert.c | 18 +-- source/blender/editors/gpencil/gpencil_data.c | 12 +- source/blender/editors/gpencil/gpencil_edit.c | 18 +-- source/blender/editors/gpencil/gpencil_fill.c | 16 +-- .../editors/gpencil/gpencil_interpolate.c | 12 +- source/blender/editors/gpencil/gpencil_ops.c | 8 +- .../editors/gpencil/gpencil_ops_versioning.c | 6 +- .../blender/editors/gpencil/gpencil_paint.c | 30 ++--- .../editors/gpencil/gpencil_primitive.c | 12 +- .../editors/gpencil/gpencil_sculpt_paint.c | 12 +- .../blender/editors/gpencil/gpencil_select.c | 16 +-- source/blender/editors/gpencil/gpencil_undo.c | 2 +- .../blender/editors/gpencil/gpencil_utils.c | 32 ++--- source/blender/editors/gpencil/gpencil_uv.c | 4 +- .../editors/gpencil/gpencil_weight_paint.c | 2 +- source/blender/editors/include/ED_object.h | 2 +- .../editors/include/ED_view3d_offscreen.h | 2 +- source/blender/editors/interface/interface.c | 12 +- .../interface/interface_context_menu.c | 2 +- .../editors/interface/interface_draw.c | 10 +- .../editors/interface/interface_eyedropper.c | 2 +- .../interface/interface_eyedropper_color.c | 4 +- .../interface_eyedropper_colorband.c | 2 +- .../interface_eyedropper_datablock.c | 16 +-- .../interface/interface_eyedropper_depth.c | 10 +- .../interface/interface_eyedropper_driver.c | 6 +- .../interface_eyedropper_gpencil_color.c | 2 +- .../editors/interface/interface_handlers.c | 26 ++-- .../editors/interface/interface_icons.c | 10 +- .../editors/interface/interface_icons_event.c | 4 +- .../editors/interface/interface_layout.c | 12 +- .../blender/editors/interface/interface_ops.c | 4 +- .../editors/interface/interface_panel.c | 4 +- .../editors/interface/interface_query.c | 2 +- .../interface/interface_region_color_picker.c | 6 +- .../editors/interface/interface_region_hud.c | 6 +- .../interface/interface_region_menu_pie.c | 2 +- .../interface/interface_region_menu_popup.c | 12 +- .../interface/interface_region_popover.c | 4 +- .../interface/interface_region_popup.c | 4 +- .../interface/interface_region_search.c | 6 +- .../interface/interface_region_tooltip.c | 6 +- .../editors/interface/interface_regions.c | 2 +- .../editors/interface/interface_templates.c | 34 ++--- .../editors/interface/interface_utils.c | 6 +- .../editors/interface/interface_widgets.c | 2 +- source/blender/editors/interface/resources.c | 4 +- source/blender/editors/interface/view2d.c | 8 +- .../blender/editors/interface/view2d_draw.c | 6 +- .../editors/interface/view2d_gizmo_navigate.c | 2 +- source/blender/editors/interface/view2d_ops.c | 4 +- source/blender/editors/io/io_alembic.c | 2 +- source/blender/editors/io/io_collada.c | 2 +- .../editors/lattice/editlattice_select.c | 8 +- .../editors/lattice/editlattice_undo.c | 8 +- source/blender/editors/lattice/lattice_ops.c | 4 +- source/blender/editors/mask/mask_add.c | 4 +- source/blender/editors/mask/mask_draw.c | 8 +- source/blender/editors/mask/mask_edit.c | 8 +- source/blender/editors/mask/mask_editaction.c | 10 +- source/blender/editors/mask/mask_ops.c | 2 +- .../blender/editors/mask/mask_relationships.c | 2 +- source/blender/editors/mask/mask_select.c | 6 +- source/blender/editors/mask/mask_shapekey.c | 4 +- source/blender/editors/mesh/editface.c | 6 +- source/blender/editors/mesh/editmesh_add.c | 4 +- source/blender/editors/mesh/editmesh_bevel.c | 12 +- source/blender/editors/mesh/editmesh_bisect.c | 6 +- .../blender/editors/mesh/editmesh_extrude.c | 10 +- .../editors/mesh/editmesh_extrude_screw.c | 2 +- .../editors/mesh/editmesh_extrude_spin.c | 4 +- .../mesh/editmesh_extrude_spin_gizmo.c | 4 +- source/blender/editors/mesh/editmesh_inset.c | 8 +- .../blender/editors/mesh/editmesh_intersect.c | 10 +- source/blender/editors/mesh/editmesh_knife.c | 10 +- .../editors/mesh/editmesh_knife_project.c | 6 +- .../blender/editors/mesh/editmesh_loopcut.c | 10 +- .../editors/mesh/editmesh_mask_extract.c | 6 +- source/blender/editors/mesh/editmesh_path.c | 10 +- .../blender/editors/mesh/editmesh_polybuild.c | 6 +- .../mesh/editmesh_preselect_edgering.c | 2 +- source/blender/editors/mesh/editmesh_rip.c | 6 +- .../blender/editors/mesh/editmesh_rip_edge.c | 2 +- source/blender/editors/mesh/editmesh_select.c | 12 +- source/blender/editors/mesh/editmesh_tools.c | 6 +- source/blender/editors/mesh/editmesh_undo.c | 14 +- source/blender/editors/mesh/editmesh_utils.c | 10 +- source/blender/editors/mesh/mesh_data.c | 2 +- source/blender/editors/mesh/mesh_mirror.c | 2 +- source/blender/editors/mesh/mesh_ops.c | 4 +- source/blender/editors/mesh/meshtools.c | 2 +- .../blender/editors/metaball/editmball_undo.c | 8 +- source/blender/editors/metaball/mball_edit.c | 6 +- source/blender/editors/metaball/mball_ops.c | 2 +- source/blender/editors/object/object_add.c | 14 +- source/blender/editors/object/object_bake.c | 18 +-- .../blender/editors/object/object_bake_api.c | 10 +- .../editors/object/object_collection.c | 2 +- .../editors/object/object_constraint.c | 8 +- .../editors/object/object_data_transfer.c | 2 +- .../editors/object/object_data_transform.c | 14 +- source/blender/editors/object/object_edit.c | 40 +++--- .../editors/object/object_facemap_ops.c | 10 +- .../editors/object/object_gpencil_modifier.c | 10 +- source/blender/editors/object/object_hook.c | 10 +- .../blender/editors/object/object_modifier.c | 12 +- source/blender/editors/object/object_ops.c | 4 +- .../blender/editors/object/object_relations.c | 20 +-- source/blender/editors/object/object_remesh.c | 20 +-- source/blender/editors/object/object_select.c | 12 +- .../blender/editors/object/object_shader_fx.c | 6 +- .../blender/editors/object/object_shapekey.c | 2 +- .../blender/editors/object/object_transform.c | 38 +++--- source/blender/editors/object/object_utils.c | 2 +- source/blender/editors/object/object_vgroup.c | 22 ++-- source/blender/editors/object/object_volume.c | 2 +- source/blender/editors/object/object_warp.c | 2 +- .../editors/physics/dynamicpaint_ops.c | 6 +- .../blender/editors/physics/particle_boids.c | 2 +- .../blender/editors/physics/particle_edit.c | 22 ++-- .../editors/physics/particle_edit_undo.c | 8 +- .../blender/editors/physics/particle_object.c | 6 +- .../blender/editors/physics/physics_fluid.c | 12 +- source/blender/editors/physics/physics_ops.c | 4 +- .../blender/editors/render/render_internal.c | 16 +-- source/blender/editors/render/render_opengl.c | 24 ++-- .../blender/editors/render/render_preview.c | 24 ++-- .../blender/editors/render/render_shading.c | 4 +- source/blender/editors/render/render_update.c | 2 +- source/blender/editors/render/render_view.c | 6 +- source/blender/editors/screen/area.c | 8 +- source/blender/editors/screen/area_query.c | 2 +- source/blender/editors/screen/glutil.c | 2 +- .../blender/editors/screen/screen_context.c | 12 +- source/blender/editors/screen/screen_draw.c | 2 +- source/blender/editors/screen/screen_edit.c | 10 +- source/blender/editors/screen/screen_ops.c | 16 +-- .../blender/editors/screen/screen_user_menu.c | 10 +- source/blender/editors/screen/screendump.c | 6 +- .../blender/editors/screen/workspace_edit.c | 2 +- .../editors/screen/workspace_layout_edit.c | 2 +- .../editors/sculpt_paint/paint_cursor.c | 6 +- .../editors/sculpt_paint/paint_curve.c | 4 +- .../blender/editors/sculpt_paint/paint_hide.c | 2 +- .../editors/sculpt_paint/paint_image.c | 10 +- .../editors/sculpt_paint/paint_image_2d.c | 8 +- .../editors/sculpt_paint/paint_image_proj.c | 8 +- .../blender/editors/sculpt_paint/paint_mask.c | 8 +- .../blender/editors/sculpt_paint/paint_ops.c | 12 +- .../editors/sculpt_paint/paint_stroke.c | 16 +-- .../editors/sculpt_paint/paint_utils.c | 12 +- .../editors/sculpt_paint/paint_vertex.c | 20 +-- .../sculpt_paint/paint_vertex_color_ops.c | 2 +- .../editors/sculpt_paint/paint_vertex_proj.c | 2 +- .../sculpt_paint/paint_vertex_weight_ops.c | 6 +- .../sculpt_paint/paint_vertex_weight_utils.c | 2 +- source/blender/editors/sculpt_paint/sculpt.c | 10 +- .../editors/sculpt_paint/sculpt_cloth.c | 10 +- .../editors/sculpt_paint/sculpt_intern.h | 4 +- .../sculpt_paint/sculpt_multiplane_scrape.c | 4 +- .../editors/sculpt_paint/sculpt_pose.c | 4 +- .../editors/sculpt_paint/sculpt_undo.c | 20 +-- .../blender/editors/sculpt_paint/sculpt_uv.c | 10 +- source/blender/editors/sound/sound_ops.c | 8 +- .../editors/space_action/action_buttons.c | 6 +- .../editors/space_action/action_data.c | 12 +- .../editors/space_action/action_draw.c | 4 +- .../editors/space_action/action_edit.c | 10 +- .../blender/editors/space_action/action_ops.c | 4 +- .../editors/space_action/action_select.c | 12 +- .../editors/space_action/space_action.c | 10 +- source/blender/editors/space_api/spacetypes.c | 20 +-- .../editors/space_buttons/buttons_context.c | 14 +- .../editors/space_buttons/buttons_ops.c | 2 +- .../editors/space_buttons/buttons_texture.c | 8 +- .../editors/space_buttons/space_buttons.c | 6 +- .../blender/editors/space_clip/clip_buttons.c | 8 +- .../editors/space_clip/clip_dopesheet_draw.c | 4 +- .../editors/space_clip/clip_dopesheet_ops.c | 4 +- source/blender/editors/space_clip/clip_draw.c | 10 +- .../blender/editors/space_clip/clip_editor.c | 10 +- .../editors/space_clip/clip_graph_draw.c | 4 +- .../editors/space_clip/clip_graph_ops.c | 4 +- source/blender/editors/space_clip/clip_ops.c | 14 +- .../blender/editors/space_clip/clip_toolbar.c | 2 +- .../blender/editors/space_clip/clip_utils.c | 4 +- .../blender/editors/space_clip/space_clip.c | 20 +-- .../blender/editors/space_clip/tracking_ops.c | 8 +- .../editors/space_clip/tracking_ops_detect.c | 4 +- .../editors/space_clip/tracking_ops_orient.c | 6 +- .../editors/space_clip/tracking_ops_plane.c | 4 +- .../editors/space_clip/tracking_ops_solve.c | 2 +- .../editors/space_clip/tracking_ops_track.c | 10 +- .../editors/space_clip/tracking_select.c | 6 +- .../editors/space_console/console_draw.c | 2 +- .../editors/space_console/console_ops.c | 12 +- .../editors/space_console/space_console.c | 8 +- source/blender/editors/space_file/file_draw.c | 4 +- source/blender/editors/space_file/file_ops.c | 8 +- .../blender/editors/space_file/file_utils.c | 4 +- source/blender/editors/space_file/filelist.c | 6 +- source/blender/editors/space_file/filesel.c | 16 +-- source/blender/editors/space_file/fsmenu.c | 14 +- .../blender/editors/space_file/space_file.c | 16 +-- .../editors/space_graph/graph_buttons.c | 10 +- .../blender/editors/space_graph/graph_draw.c | 8 +- .../blender/editors/space_graph/graph_edit.c | 8 +- .../blender/editors/space_graph/graph_ops.c | 6 +- .../editors/space_graph/graph_select.c | 8 +- .../blender/editors/space_graph/graph_utils.c | 8 +- .../blender/editors/space_graph/space_graph.c | 12 +- .../editors/space_image/image_buttons.c | 6 +- .../blender/editors/space_image/image_draw.c | 12 +- .../blender/editors/space_image/image_edit.c | 2 +- .../blender/editors/space_image/image_ops.c | 18 +-- .../blender/editors/space_image/image_undo.c | 8 +- .../blender/editors/space_image/space_image.c | 16 +-- source/blender/editors/space_info/info_draw.c | 8 +- source/blender/editors/space_info/info_ops.c | 2 +- .../blender/editors/space_info/info_report.c | 2 +- .../blender/editors/space_info/info_stats.c | 8 +- .../blender/editors/space_info/space_info.c | 10 +- source/blender/editors/space_info/textview.c | 2 +- .../blender/editors/space_nla/nla_buttons.c | 8 +- .../blender/editors/space_nla/nla_channels.c | 8 +- source/blender/editors/space_nla/nla_draw.c | 10 +- source/blender/editors/space_nla/nla_edit.c | 4 +- source/blender/editors/space_nla/nla_ops.c | 2 +- source/blender/editors/space_nla/nla_select.c | 6 +- source/blender/editors/space_nla/space_nla.c | 8 +- source/blender/editors/space_node/drawnode.c | 8 +- source/blender/editors/space_node/node_add.c | 2 +- .../blender/editors/space_node/node_buttons.c | 2 +- source/blender/editors/space_node/node_draw.c | 10 +- source/blender/editors/space_node/node_edit.c | 8 +- .../blender/editors/space_node/node_gizmo.c | 4 +- .../blender/editors/space_node/node_group.c | 8 +- .../blender/editors/space_node/node_intern.h | 2 +- .../editors/space_node/node_relationships.c | 6 +- .../blender/editors/space_node/node_select.c | 4 +- .../editors/space_node/node_templates.c | 2 +- source/blender/editors/space_node/node_view.c | 6 +- .../blender/editors/space_node/space_node.c | 4 +- .../space_outliner/outliner_collections.c | 6 +- .../editors/space_outliner/outliner_draw.c | 10 +- .../editors/space_outliner/outliner_edit.c | 12 +- .../editors/space_outliner/outliner_select.c | 4 +- .../editors/space_outliner/outliner_tools.c | 14 +- .../editors/space_outliner/outliner_tree.c | 20 +-- .../editors/space_outliner/outliner_utils.c | 2 +- .../editors/space_outliner/space_outliner.c | 14 +- .../editors/space_script/script_edit.c | 4 +- .../blender/editors/space_script/script_ops.c | 2 +- .../editors/space_script/space_script.c | 6 +- .../editors/space_sequencer/sequencer_add.c | 8 +- .../space_sequencer/sequencer_buttons.c | 8 +- .../editors/space_sequencer/sequencer_draw.c | 20 +-- .../editors/space_sequencer/sequencer_edit.c | 8 +- .../space_sequencer/sequencer_intern.h | 2 +- .../editors/space_sequencer/sequencer_ops.c | 6 +- .../space_sequencer/sequencer_preview.c | 2 +- .../space_sequencer/sequencer_scopes.c | 4 +- .../space_sequencer/sequencer_select.c | 6 +- .../editors/space_sequencer/sequencer_view.c | 4 +- .../editors/space_sequencer/space_sequencer.c | 8 +- .../editors/space_statusbar/space_statusbar.c | 4 +- .../blender/editors/space_text/space_text.c | 6 +- .../editors/space_text/text_autocomplete.c | 4 +- source/blender/editors/space_text/text_draw.c | 8 +- .../blender/editors/space_text/text_format.c | 2 +- .../editors/space_text/text_format_lua.c | 2 +- .../editors/space_text/text_format_osl.c | 2 +- .../editors/space_text/text_format_pov.c | 2 +- .../editors/space_text/text_format_pov_ini.c | 2 +- .../editors/space_text/text_format_py.c | 2 +- source/blender/editors/space_text/text_ops.c | 6 +- source/blender/editors/space_text/text_undo.c | 8 +- .../editors/space_topbar/space_topbar.c | 4 +- .../editors/space_userpref/space_userpref.c | 2 +- .../blender/editors/space_view3d/drawobject.c | 6 +- .../editors/space_view3d/space_view3d.c | 10 +- .../editors/space_view3d/view3d_buttons.c | 16 +-- .../space_view3d/view3d_camera_control.c | 4 +- .../editors/space_view3d/view3d_draw.c | 14 +- .../editors/space_view3d/view3d_edit.c | 14 +- .../blender/editors/space_view3d/view3d_fly.c | 2 +- .../space_view3d/view3d_gizmo_armature.c | 6 +- .../space_view3d/view3d_gizmo_camera.c | 6 +- .../editors/space_view3d/view3d_gizmo_empty.c | 6 +- .../space_view3d/view3d_gizmo_forcefield.c | 4 +- .../editors/space_view3d/view3d_gizmo_light.c | 4 +- .../space_view3d/view3d_gizmo_navigate.c | 2 +- .../space_view3d/view3d_gizmo_navigate_type.c | 4 +- .../space_view3d/view3d_gizmo_preselect.c | 2 +- .../view3d_gizmo_preselect_type.c | 8 +- .../editors/space_view3d/view3d_gizmo_ruler.c | 12 +- .../space_view3d/view3d_gizmo_tool_generic.c | 8 +- .../editors/space_view3d/view3d_header.c | 8 +- .../editors/space_view3d/view3d_iterators.c | 14 +- .../blender/editors/space_view3d/view3d_ops.c | 2 +- .../editors/space_view3d/view3d_project.c | 2 +- .../editors/space_view3d/view3d_select.c | 30 ++--- .../editors/space_view3d/view3d_snap.c | 6 +- .../editors/space_view3d/view3d_utils.c | 8 +- .../editors/space_view3d/view3d_view.c | 10 +- .../editors/space_view3d/view3d_walk.c | 4 +- source/blender/editors/transform/transform.c | 4 +- source/blender/editors/transform/transform.h | 2 +- .../editors/transform/transform_constraints.c | 10 +- .../editors/transform/transform_convert.c | 24 ++-- .../transform/transform_convert_action.c | 2 +- .../transform/transform_convert_mesh.c | 2 +- .../editors/transform/transform_convert_nla.c | 4 +- .../transform/transform_convert_particle.c | 2 +- .../transform/transform_convert_sculpt.c | 2 +- .../transform/transform_convert_sequencer.c | 2 +- .../editors/transform/transform_generics.c | 30 ++--- .../editors/transform/transform_gizmo_2d.c | 4 +- .../editors/transform/transform_gizmo_3d.c | 34 ++--- .../transform/transform_gizmo_extrude_3d.c | 10 +- .../editors/transform/transform_input.c | 4 +- .../transform/transform_mode_baketime.c | 2 +- .../transform/transform_mode_bbone_resize.c | 2 +- .../editors/transform/transform_mode_bend.c | 2 +- .../transform/transform_mode_boneenvelope.c | 2 +- .../transform/transform_mode_boneroll.c | 2 +- .../transform_mode_curveshrinkfatten.c | 2 +- .../transform_mode_edge_bevelweight.c | 2 +- .../transform/transform_mode_edge_crease.c | 2 +- .../transform_mode_edge_rotate_normal.c | 4 +- .../transform/transform_mode_edge_seq_slide.c | 2 +- .../transform/transform_mode_edge_slide.c | 2 +- .../transform/transform_mode_gpopacity.c | 2 +- .../transform/transform_mode_gpshrinkfatten.c | 2 +- .../transform_mode_maskshrinkfatten.c | 2 +- .../transform/transform_mode_push_pull.c | 2 +- .../editors/transform/transform_mode_resize.c | 2 +- .../editors/transform/transform_mode_rotate.c | 2 +- .../editors/transform/transform_mode_shear.c | 2 +- .../transform/transform_mode_shrink_fatten.c | 2 +- .../transform/transform_mode_skin_resize.c | 2 +- .../editors/transform/transform_mode_tilt.c | 2 +- .../transform/transform_mode_timetranslate.c | 2 +- .../transform/transform_mode_tosphere.c | 2 +- .../transform/transform_mode_trackball.c | 2 +- .../transform/transform_mode_translate.c | 2 +- .../transform/transform_mode_vert_slide.c | 2 +- .../blender/editors/transform/transform_ops.c | 6 +- .../transform/transform_orientations.c | 8 +- .../editors/transform/transform_snap.c | 20 +-- .../editors/transform/transform_snap_object.c | 18 +-- source/blender/editors/undo/ed_undo.c | 12 +- source/blender/editors/undo/memfile_undo.c | 2 +- source/blender/editors/util/ed_transverts.c | 10 +- source/blender/editors/util/ed_util.c | 16 +-- source/blender/editors/util/gizmo_utils.c | 2 +- source/blender/editors/util/numinput.c | 4 +- source/blender/editors/util/select_utils.c | 2 +- .../blender/editors/uvedit/uvedit_buttons.c | 2 +- source/blender/editors/uvedit/uvedit_draw.c | 4 +- source/blender/editors/uvedit/uvedit_ops.c | 23 ++-- .../editors/uvedit/uvedit_parametrizer.c | 12 +- .../editors/uvedit/uvedit_smart_stitch.c | 12 +- .../editors/uvedit/uvedit_unwrap_ops.c | 22 ++-- .../freestyle/intern/python/BPy_Convert.cpp | 14 +- .../freestyle/intern/python/BPy_Convert.h | 2 +- .../freestyle/intern/python/BPy_Freestyle.cpp | 6 +- .../intern/python/BPy_IntegrationType.cpp | 2 +- .../intern/python/BPy_Interface0D.cpp | 4 +- .../intern/python/BPy_Interface1D.cpp | 8 +- .../freestyle/intern/python/BPy_Iterator.cpp | 14 +- .../freestyle/intern/python/BPy_Operators.cpp | 8 +- .../freestyle/intern/python/BPy_SShape.cpp | 2 +- .../freestyle/intern/python/BPy_ViewMap.cpp | 2 +- .../freestyle/intern/python/BPy_ViewShape.cpp | 2 +- .../freestyle/intern/python/Director.cpp | 8 +- .../python/Interface0D/BPy_ViewVertex.cpp | 2 +- .../CurvePoint/BPy_StrokeVertex.cpp | 2 +- .../Interface0D/ViewVertex/BPy_TVertex.cpp | 2 +- .../intern/python/Interface1D/BPy_FEdge.cpp | 2 +- .../intern/python/Interface1D/BPy_Stroke.cpp | 2 +- .../python/Interface1D/BPy_ViewEdge.cpp | 4 +- .../Iterator/BPy_ChainPredicateIterator.cpp | 4 +- .../BPy_UnaryFunction0DVectorViewShape.h | 2 +- .../BPy_UnaryFunction1DDouble.cpp | 2 +- .../BPy_UnaryFunction1DEdgeNature.cpp | 2 +- .../BPy_UnaryFunction1DFloat.cpp | 2 +- .../BPy_UnaryFunction1DUnsigned.cpp | 2 +- .../BPy_UnaryFunction1DVec2f.cpp | 2 +- .../BPy_UnaryFunction1DVec3f.cpp | 2 +- .../BPy_UnaryFunction1DVectorViewShape.cpp | 2 +- .../BPy_UnaryFunction1DVectorViewShape.h | 2 +- .../BPy_UnaryFunction1DVoid.cpp | 2 +- .../freestyle/intern/scene_graph/SceneHash.h | 2 +- .../intern/MOD_gpencil_util.c | 18 +-- .../intern/MOD_gpencilarmature.c | 16 +-- .../intern/MOD_gpencilarray.c | 22 ++-- .../intern/MOD_gpencilbuild.c | 10 +- .../intern/MOD_gpencilcolor.c | 8 +- .../intern/MOD_gpencilhook.c | 18 +-- .../intern/MOD_gpencillattice.c | 18 +-- .../intern/MOD_gpencilmirror.c | 18 +-- .../intern/MOD_gpencilmultiply.c | 32 ++--- .../intern/MOD_gpencilnoise.c | 12 +- .../intern/MOD_gpenciloffset.c | 10 +- .../intern/MOD_gpencilopacity.c | 12 +- .../intern/MOD_gpencilsimplify.c | 8 +- .../intern/MOD_gpencilsmooth.c | 6 +- .../intern/MOD_gpencilsubdiv.c | 10 +- .../intern/MOD_gpencilthick.c | 10 +- .../intern/MOD_gpenciltime.c | 10 +- .../intern/MOD_gpenciltint.c | 12 +- source/blender/gpu/GPU_batch.h | 4 +- source/blender/gpu/GPU_common.h | 2 +- source/blender/gpu/GPU_context.h | 2 +- source/blender/gpu/GPU_immediate.h | 6 +- source/blender/gpu/GPU_vertex_format.h | 4 +- source/blender/gpu/GPU_viewport.h | 2 +- .../gpu/intern/gpu_attr_binding_private.h | 2 +- source/blender/gpu/intern/gpu_batch.c | 4 +- source/blender/gpu/intern/gpu_batch_presets.c | 6 +- source/blender/gpu/intern/gpu_batch_utils.c | 4 +- source/blender/gpu/intern/gpu_buffers.c | 12 +- source/blender/gpu/intern/gpu_codegen.c | 8 +- source/blender/gpu/intern/gpu_context.cpp | 6 +- source/blender/gpu/intern/gpu_debug.c | 4 +- source/blender/gpu/intern/gpu_draw_smoke.c | 2 +- source/blender/gpu/intern/gpu_extensions.c | 6 +- source/blender/gpu/intern/gpu_framebuffer.c | 4 +- source/blender/gpu/intern/gpu_immediate.c | 2 +- .../blender/gpu/intern/gpu_immediate_util.c | 2 +- source/blender/gpu/intern/gpu_init_exit.c | 8 +- source/blender/gpu/intern/gpu_material.c | 6 +- .../blender/gpu/intern/gpu_material_library.c | 2 +- source/blender/gpu/intern/gpu_node_graph.c | 2 +- source/blender/gpu/intern/gpu_node_graph.h | 2 +- source/blender/gpu/intern/gpu_select.c | 4 +- source/blender/gpu/intern/gpu_select_pick.c | 10 +- .../gpu/intern/gpu_select_sample_query.c | 2 +- source/blender/gpu/intern/gpu_shader.c | 4 +- .../blender/gpu/intern/gpu_shader_interface.c | 4 +- source/blender/gpu/intern/gpu_state.c | 2 +- source/blender/gpu/intern/gpu_texture.c | 4 +- source/blender/gpu/intern/gpu_uniformbuffer.c | 2 +- source/blender/gpu/intern/gpu_vertex_format.c | 4 +- source/blender/gpu/intern/gpu_viewport.c | 6 +- source/blender/ikplugin/intern/ikplugin_api.c | 2 +- .../blender/ikplugin/intern/iksolver_plugin.c | 4 +- .../blender/ikplugin/intern/itasc_plugin.cpp | 18 +-- source/blender/imbuf/IMB_colormanagement.h | 2 +- source/blender/imbuf/IMB_moviecache.h | 2 +- source/blender/imbuf/intern/IMB_anim.h | 16 +-- .../imbuf/intern/IMB_colormanagement_intern.h | 2 +- source/blender/imbuf/intern/IMB_indexer.h | 4 +- source/blender/imbuf/intern/allocimbuf.c | 4 +- source/blender/imbuf/intern/anim_movie.c | 16 +-- source/blender/imbuf/intern/bmp.c | 6 +- source/blender/imbuf/intern/cache.c | 4 +- .../blender/imbuf/intern/cineon/cineon_dpx.c | 8 +- .../blender/imbuf/intern/cineon/cineonlib.c | 6 +- source/blender/imbuf/intern/cineon/dpxlib.c | 6 +- .../imbuf/intern/cineon/logImageCore.c | 6 +- source/blender/imbuf/intern/colormanagement.c | 10 +- .../imbuf/intern/colormanagement_inline.c | 2 +- source/blender/imbuf/intern/dds/BlockDXT.cpp | 4 +- source/blender/imbuf/intern/dds/BlockDXT.h | 2 +- .../blender/imbuf/intern/dds/ColorBlock.cpp | 2 +- .../imbuf/intern/dds/DirectDrawSurface.cpp | 4 +- .../imbuf/intern/dds/DirectDrawSurface.h | 4 +- source/blender/imbuf/intern/dds/FlipDXT.cpp | 6 +- source/blender/imbuf/intern/dds/Image.h | 2 +- source/blender/imbuf/intern/dds/dds_api.cpp | 14 +- source/blender/imbuf/intern/divers.c | 6 +- source/blender/imbuf/intern/filetype.c | 2 +- source/blender/imbuf/intern/filter.c | 6 +- source/blender/imbuf/intern/imageprocess.c | 8 +- source/blender/imbuf/intern/imbuf.h | 6 +- source/blender/imbuf/intern/indexer.c | 8 +- source/blender/imbuf/intern/iris.c | 8 +- source/blender/imbuf/intern/jp2.c | 6 +- source/blender/imbuf/intern/jpeg.c | 16 +-- source/blender/imbuf/intern/metadata.c | 4 +- source/blender/imbuf/intern/module.c | 4 +- source/blender/imbuf/intern/moviecache.c | 10 +- .../imbuf/intern/oiio/openimageio_api.cpp | 6 +- .../imbuf/intern/openexr/openexr_api.cpp | 42 +++--- source/blender/imbuf/intern/png.c | 6 +- source/blender/imbuf/intern/radiance_hdr.c | 2 +- source/blender/imbuf/intern/readimage.c | 16 +-- source/blender/imbuf/intern/rectop.c | 6 +- source/blender/imbuf/intern/rotate.c | 4 +- source/blender/imbuf/intern/scaling.c | 6 +- source/blender/imbuf/intern/stereoimbuf.c | 4 +- source/blender/imbuf/intern/targa.c | 4 +- source/blender/imbuf/intern/thumbs.c | 22 ++-- source/blender/imbuf/intern/thumbs_blend.c | 6 +- source/blender/imbuf/intern/thumbs_font.c | 6 +- source/blender/imbuf/intern/tiff.c | 2 +- source/blender/imbuf/intern/util.c | 12 +- source/blender/imbuf/intern/writeimage.c | 8 +- .../blender/io/alembic/intern/abc_exporter.cc | 6 +- .../io/alembic/intern/abc_reader_curves.h | 2 +- .../io/alembic/intern/abc_reader_object.cc | 2 +- .../io/alembic/intern/abc_reader_points.h | 2 +- .../io/alembic/intern/abc_writer_curves.h | 2 +- .../io/alembic/intern/abc_writer_hair.cc | 2 +- .../io/alembic/intern/abc_writer_mball.cc | 2 +- .../io/alembic/intern/abc_writer_mball.h | 2 +- .../io/alembic/intern/abc_writer_mesh.cc | 2 +- .../io/alembic/intern/abc_writer_nurbs.cc | 2 +- .../io/alembic/intern/abc_writer_points.cc | 2 +- .../io/alembic/intern/abc_writer_points.h | 2 +- source/blender/io/avi/intern/avi.c | 8 +- source/blender/io/avi/intern/avi_codecs.c | 2 +- source/blender/io/avi/intern/avi_endian.c | 2 +- source/blender/io/avi/intern/avi_mjpeg.c | 2 +- source/blender/io/avi/intern/avi_options.c | 4 +- .../io/collada/AnimationClipExporter.cpp | 2 +- .../io/collada/AnimationClipExporter.h | 4 +- .../blender/io/collada/AnimationExporter.cpp | 2 +- source/blender/io/collada/AnimationExporter.h | 57 ++++---- .../blender/io/collada/AnimationImporter.cpp | 2 +- source/blender/io/collada/AnimationImporter.h | 12 +- .../blender/io/collada/ArmatureExporter.cpp | 2 +- source/blender/io/collada/ArmatureExporter.h | 8 +- .../blender/io/collada/ArmatureImporter.cpp | 6 +- source/blender/io/collada/ArmatureImporter.h | 8 +- source/blender/io/collada/BCAnimationCurve.h | 6 +- .../blender/io/collada/BCAnimationSampler.cpp | 14 +- source/blender/io/collada/BCSampleData.h | 14 +- source/blender/io/collada/BlenderContext.h | 6 +- source/blender/io/collada/CameraExporter.h | 4 +- .../blender/io/collada/ControllerExporter.cpp | 2 +- .../blender/io/collada/ControllerExporter.h | 16 +-- .../blender/io/collada/DocumentExporter.cpp | 84 ++++++------ source/blender/io/collada/DocumentExporter.h | 2 +- .../blender/io/collada/DocumentImporter.cpp | 28 ++-- source/blender/io/collada/DocumentImporter.h | 16 +-- source/blender/io/collada/EffectExporter.cpp | 6 +- source/blender/io/collada/EffectExporter.h | 4 +- source/blender/io/collada/ErrorHandler.cpp | 2 +- source/blender/io/collada/ErrorHandler.h | 6 +- source/blender/io/collada/ExportSettings.h | 2 +- source/blender/io/collada/ExtraHandler.cpp | 2 +- source/blender/io/collada/ExtraHandler.h | 12 +- source/blender/io/collada/ExtraTags.cpp | 2 +- source/blender/io/collada/ExtraTags.h | 2 +- .../blender/io/collada/GeometryExporter.cpp | 2 +- source/blender/io/collada/GeometryExporter.h | 12 +- source/blender/io/collada/ImageExporter.cpp | 2 +- source/blender/io/collada/ImageExporter.h | 6 +- source/blender/io/collada/InstanceWriter.cpp | 2 +- source/blender/io/collada/LightExporter.h | 2 +- source/blender/io/collada/MaterialExporter.h | 4 +- source/blender/io/collada/Materials.h | 2 +- source/blender/io/collada/MeshImporter.cpp | 2 +- source/blender/io/collada/MeshImporter.h | 2 +- source/blender/io/collada/SceneExporter.cpp | 6 +- source/blender/io/collada/SceneExporter.h | 72 +++++------ source/blender/io/collada/SkinInfo.cpp | 2 +- source/blender/io/collada/SkinInfo.h | 6 +- source/blender/io/collada/TransformReader.h | 8 +- source/blender/io/collada/TransformWriter.h | 2 +- source/blender/io/collada/collada.cpp | 2 +- source/blender/io/collada/collada.h | 2 +- source/blender/io/collada/collada_internal.h | 6 +- source/blender/io/collada/collada_utils.cpp | 25 ++-- source/blender/io/collada/collada_utils.h | 34 ++--- .../usd/intern/abstract_hierarchy_iterator.h | 2 +- .../io/usd/intern/usd_hierarchy_iterator.h | 2 +- .../io/usd/intern/usd_writer_abstract.h | 2 +- source/blender/makesdna/DNA_action_types.h | 6 +- source/blender/makesdna/DNA_anim_types.h | 2 +- source/blender/makesdna/DNA_armature_types.h | 2 +- source/blender/makesdna/DNA_brush_types.h | 2 +- source/blender/makesdna/DNA_camera_types.h | 4 +- .../blender/makesdna/DNA_collection_types.h | 2 +- .../blender/makesdna/DNA_constraint_types.h | 2 +- source/blender/makesdna/DNA_curve_types.h | 2 +- source/blender/makesdna/DNA_gpencil_types.h | 2 +- source/blender/makesdna/DNA_image_types.h | 2 +- source/blender/makesdna/DNA_ipo_types.h | 2 +- source/blender/makesdna/DNA_key_types.h | 2 +- source/blender/makesdna/DNA_lattice_types.h | 2 +- source/blender/makesdna/DNA_light_types.h | 2 +- .../blender/makesdna/DNA_lightprobe_types.h | 2 +- source/blender/makesdna/DNA_linestyle_types.h | 2 +- source/blender/makesdna/DNA_mask_types.h | 4 +- source/blender/makesdna/DNA_material_types.h | 2 +- source/blender/makesdna/DNA_mesh_types.h | 2 +- source/blender/makesdna/DNA_meta_types.h | 2 +- source/blender/makesdna/DNA_movieclip_types.h | 2 +- source/blender/makesdna/DNA_node_types.h | 4 +- .../blender/makesdna/DNA_object_force_types.h | 2 +- source/blender/makesdna/DNA_object_types.h | 6 +- source/blender/makesdna/DNA_particle_types.h | 2 +- source/blender/makesdna/DNA_scene_types.h | 8 +- source/blender/makesdna/DNA_screen_types.h | 2 +- source/blender/makesdna/DNA_sequence_types.h | 2 +- source/blender/makesdna/DNA_sound_types.h | 2 +- source/blender/makesdna/DNA_space_types.h | 12 +- source/blender/makesdna/DNA_text_types.h | 2 +- source/blender/makesdna/DNA_texture_types.h | 2 +- source/blender/makesdna/DNA_view3d_types.h | 4 +- .../makesdna/DNA_windowmanager_types.h | 2 +- source/blender/makesdna/DNA_world_types.h | 2 +- source/blender/makesdna/intern/dna_defaults.c | 10 +- source/blender/makesdna/intern/dna_genfile.c | 4 +- source/blender/makesdna/intern/dna_utils.c | 4 +- source/blender/makesdna/intern/makesdna.c | 122 +++++++++--------- source/blender/makesrna/RNA_define.h | 2 +- source/blender/makesrna/intern/makesrna.c | 6 +- source/blender/makesrna/intern/rna_ID.c | 10 +- source/blender/makesrna/intern/rna_access.c | 16 +-- .../intern/rna_access_compare_override.c | 4 +- source/blender/makesrna/intern/rna_action.c | 2 +- .../blender/makesrna/intern/rna_action_api.c | 2 +- .../blender/makesrna/intern/rna_animation.c | 2 +- .../makesrna/intern/rna_animation_api.c | 4 +- source/blender/makesrna/intern/rna_animviz.c | 2 +- source/blender/makesrna/intern/rna_armature.c | 2 +- .../makesrna/intern/rna_armature_api.c | 4 +- source/blender/makesrna/intern/rna_boid.c | 2 +- source/blender/makesrna/intern/rna_brush.c | 10 +- .../blender/makesrna/intern/rna_camera_api.c | 2 +- source/blender/makesrna/intern/rna_cloth.c | 2 +- .../blender/makesrna/intern/rna_collection.c | 2 +- source/blender/makesrna/intern/rna_color.c | 4 +- .../blender/makesrna/intern/rna_constraint.c | 2 +- source/blender/makesrna/intern/rna_context.c | 2 +- source/blender/makesrna/intern/rna_curve.c | 2 +- .../blender/makesrna/intern/rna_curve_api.c | 2 +- .../makesrna/intern/rna_curveprofile.c | 6 +- source/blender/makesrna/intern/rna_define.c | 8 +- .../blender/makesrna/intern/rna_depsgraph.c | 2 +- .../makesrna/intern/rna_dynamicpaint.c | 4 +- source/blender/makesrna/intern/rna_fcurve.c | 4 +- .../blender/makesrna/intern/rna_fcurve_api.c | 2 +- source/blender/makesrna/intern/rna_fluid.c | 12 +- source/blender/makesrna/intern/rna_gpencil.c | 6 +- .../makesrna/intern/rna_gpencil_modifier.c | 10 +- source/blender/makesrna/intern/rna_image.c | 2 +- .../blender/makesrna/intern/rna_image_api.c | 8 +- source/blender/makesrna/intern/rna_key.c | 4 +- source/blender/makesrna/intern/rna_lattice.c | 6 +- .../blender/makesrna/intern/rna_lattice_api.c | 2 +- source/blender/makesrna/intern/rna_layer.c | 4 +- source/blender/makesrna/intern/rna_light.c | 2 +- .../blender/makesrna/intern/rna_linestyle.c | 2 +- source/blender/makesrna/intern/rna_main.c | 6 +- source/blender/makesrna/intern/rna_main_api.c | 36 +++--- source/blender/makesrna/intern/rna_mask.c | 4 +- source/blender/makesrna/intern/rna_material.c | 10 +- .../makesrna/intern/rna_material_api.c | 2 +- source/blender/makesrna/intern/rna_mesh.c | 2 +- source/blender/makesrna/intern/rna_mesh_api.c | 4 +- source/blender/makesrna/intern/rna_meta.c | 6 +- source/blender/makesrna/intern/rna_meta_api.c | 2 +- source/blender/makesrna/intern/rna_modifier.c | 6 +- .../blender/makesrna/intern/rna_movieclip.c | 4 +- source/blender/makesrna/intern/rna_nla.c | 6 +- source/blender/makesrna/intern/rna_nodetree.c | 8 +- source/blender/makesrna/intern/rna_object.c | 20 +-- .../blender/makesrna/intern/rna_object_api.c | 8 +- .../makesrna/intern/rna_object_force.c | 4 +- source/blender/makesrna/intern/rna_palette.c | 2 +- source/blender/makesrna/intern/rna_particle.c | 12 +- source/blender/makesrna/intern/rna_pose.c | 4 +- source/blender/makesrna/intern/rna_pose_api.c | 4 +- source/blender/makesrna/intern/rna_render.c | 8 +- .../blender/makesrna/intern/rna_rigidbody.c | 2 +- source/blender/makesrna/intern/rna_rna.c | 2 +- source/blender/makesrna/intern/rna_scene.c | 36 +++--- .../blender/makesrna/intern/rna_scene_api.c | 4 +- source/blender/makesrna/intern/rna_screen.c | 6 +- .../makesrna/intern/rna_sculpt_paint.c | 8 +- .../blender/makesrna/intern/rna_sequencer.c | 6 +- .../makesrna/intern/rna_sequencer_api.c | 2 +- source/blender/makesrna/intern/rna_sound.c | 2 +- source/blender/makesrna/intern/rna_space.c | 16 +-- source/blender/makesrna/intern/rna_speaker.c | 2 +- source/blender/makesrna/intern/rna_text.c | 2 +- source/blender/makesrna/intern/rna_text_api.c | 2 +- source/blender/makesrna/intern/rna_texture.c | 8 +- .../blender/makesrna/intern/rna_texture_api.c | 8 +- source/blender/makesrna/intern/rna_tracking.c | 2 +- source/blender/makesrna/intern/rna_ui.c | 4 +- source/blender/makesrna/intern/rna_ui_api.c | 4 +- source/blender/makesrna/intern/rna_userdef.c | 12 +- source/blender/makesrna/intern/rna_volume.c | 2 +- source/blender/makesrna/intern/rna_wm.c | 2 +- source/blender/makesrna/intern/rna_wm_api.c | 4 +- .../makesrna/intern/rna_wm_gizmo_api.c | 4 +- .../makesrna/intern/rna_workspace_api.c | 2 +- .../blender/modifiers/intern/MOD_armature.c | 4 +- source/blender/modifiers/intern/MOD_array.c | 4 +- source/blender/modifiers/intern/MOD_bevel.c | 4 +- source/blender/modifiers/intern/MOD_build.c | 2 +- source/blender/modifiers/intern/MOD_cloth.c | 2 +- .../blender/modifiers/intern/MOD_collision.c | 2 +- .../modifiers/intern/MOD_correctivesmooth.c | 6 +- source/blender/modifiers/intern/MOD_curve.c | 2 +- .../blender/modifiers/intern/MOD_decimate.c | 2 +- .../blender/modifiers/intern/MOD_displace.c | 6 +- .../modifiers/intern/MOD_dynamicpaint.c | 6 +- source/blender/modifiers/intern/MOD_explode.c | 6 +- source/blender/modifiers/intern/MOD_fluid.c | 8 +- source/blender/modifiers/intern/MOD_hook.c | 4 +- source/blender/modifiers/intern/MOD_mask.cc | 6 +- .../blender/modifiers/intern/MOD_meshcache.c | 4 +- .../modifiers/intern/MOD_meshcache_mdd.c | 2 +- .../modifiers/intern/MOD_meshcache_pc2.c | 2 +- .../blender/modifiers/intern/MOD_meshdeform.c | 4 +- .../modifiers/intern/MOD_meshsequencecache.c | 2 +- source/blender/modifiers/intern/MOD_mirror.c | 2 +- .../blender/modifiers/intern/MOD_multires.c | 2 +- .../modifiers/intern/MOD_normal_edit.c | 6 +- source/blender/modifiers/intern/MOD_ocean.c | 2 +- .../modifiers/intern/MOD_particleinstance.c | 2 +- .../modifiers/intern/MOD_particlesystem.c | 2 +- source/blender/modifiers/intern/MOD_remesh.c | 2 +- source/blender/modifiers/intern/MOD_screw.c | 4 +- .../blender/modifiers/intern/MOD_shapekey.c | 2 +- .../modifiers/intern/MOD_simpledeform.c | 4 +- source/blender/modifiers/intern/MOD_skin.c | 2 +- source/blender/modifiers/intern/MOD_smooth.c | 2 +- .../blender/modifiers/intern/MOD_softbody.c | 2 +- .../modifiers/intern/MOD_solidify_extrude.c | 4 +- .../intern/MOD_solidify_nonmanifold.c | 4 +- source/blender/modifiers/intern/MOD_subsurf.c | 2 +- source/blender/modifiers/intern/MOD_surface.c | 4 +- .../modifiers/intern/MOD_surfacedeform.c | 2 +- .../modifiers/intern/MOD_triangulate.c | 2 +- source/blender/modifiers/intern/MOD_util.c | 6 +- .../blender/modifiers/intern/MOD_uvproject.c | 2 +- source/blender/modifiers/intern/MOD_warp.c | 4 +- .../modifiers/intern/MOD_weightvgedit.c | 2 +- .../modifiers/intern/MOD_weightvgmix.c | 2 +- .../modifiers/intern/MOD_weightvgproximity.c | 2 +- source/blender/modifiers/intern/MOD_weld.c | 4 +- .../nodes/composite/node_composite_tree.c | 2 +- .../nodes/composite/node_composite_util.h | 4 +- .../composite/nodes/node_composite_common.c | 2 +- .../nodes/node_composite_cryptomatte.c | 2 +- .../composite/nodes/node_composite_image.c | 2 +- .../nodes/node_composite_outputFile.c | 4 +- .../nodes/node_composite_splitViewer.c | 2 +- .../composite/nodes/node_composite_viewer.c | 2 +- source/blender/nodes/intern/node_common.c | 4 +- source/blender/nodes/intern/node_socket.c | 2 +- .../blender/nodes/shader/node_shader_tree.c | 10 +- .../blender/nodes/shader/node_shader_util.h | 6 +- .../nodes/shader/nodes/node_shader_common.c | 2 +- .../nodes/shader/nodes/node_shader_valToRgb.c | 2 +- .../blender/nodes/texture/node_texture_tree.c | 6 +- .../blender/nodes/texture/node_texture_util.c | 2 +- .../blender/nodes/texture/node_texture_util.h | 8 +- .../nodes/texture/nodes/node_texture_at.c | 2 +- .../nodes/texture/nodes/node_texture_bricks.c | 2 +- .../texture/nodes/node_texture_checker.c | 2 +- .../nodes/texture/nodes/node_texture_common.c | 2 +- .../texture/nodes/node_texture_compose.c | 2 +- .../nodes/texture/nodes/node_texture_coord.c | 2 +- .../nodes/texture/nodes/node_texture_curves.c | 2 +- .../texture/nodes/node_texture_decompose.c | 2 +- .../texture/nodes/node_texture_distance.c | 4 +- .../texture/nodes/node_texture_hueSatVal.c | 2 +- .../nodes/texture/nodes/node_texture_image.c | 2 +- .../nodes/texture/nodes/node_texture_invert.c | 2 +- .../nodes/texture/nodes/node_texture_math.c | 2 +- .../nodes/texture/nodes/node_texture_mixRgb.c | 2 +- .../nodes/texture/nodes/node_texture_output.c | 2 +- .../nodes/texture/nodes/node_texture_proc.c | 2 +- .../nodes/texture/nodes/node_texture_rotate.c | 2 +- .../nodes/texture/nodes/node_texture_scale.c | 2 +- .../texture/nodes/node_texture_texture.c | 2 +- .../texture/nodes/node_texture_translate.c | 4 +- .../texture/nodes/node_texture_valToNor.c | 2 +- .../texture/nodes/node_texture_valToRgb.c | 4 +- .../nodes/texture/nodes/node_texture_viewer.c | 2 +- .../physics/intern/BPH_mass_spring.cpp | 8 +- source/blender/physics/intern/hair_volume.cpp | 2 +- .../blender/physics/intern/implicit_blender.c | 6 +- .../blender/physics/intern/implicit_eigen.cpp | 8 +- source/blender/python/bmesh/bmesh_py_api.c | 4 +- .../blender/python/bmesh/bmesh_py_geometry.c | 2 +- source/blender/python/bmesh/bmesh_py_ops.c | 4 +- .../blender/python/bmesh/bmesh_py_ops_call.c | 2 +- source/blender/python/bmesh/bmesh_py_types.c | 4 +- .../python/bmesh/bmesh_py_types_customdata.c | 6 +- .../python/bmesh/bmesh_py_types_meshdata.c | 4 +- .../python/bmesh/bmesh_py_types_select.c | 2 +- source/blender/python/bmesh/bmesh_py_utils.c | 2 +- source/blender/python/generic/blf_py_api.c | 2 +- source/blender/python/generic/bpy_threads.c | 2 +- source/blender/python/generic/imbuf_py_api.c | 8 +- source/blender/python/gpu/gpu_py_batch.c | 4 +- source/blender/python/gpu/gpu_py_offscreen.c | 2 +- source/blender/python/gpu/gpu_py_types.h | 6 +- .../blender/python/gpu/gpu_py_vertex_buffer.c | 2 +- source/blender/python/intern/bpy.c | 16 +-- source/blender/python/intern/bpy_app.c | 2 +- .../blender/python/intern/bpy_app_alembic.c | 2 +- source/blender/python/intern/bpy_app_ffmpeg.c | 2 +- .../blender/python/intern/bpy_app_handlers.c | 6 +- source/blender/python/intern/bpy_app_ocio.c | 2 +- source/blender/python/intern/bpy_app_oiio.c | 2 +- .../python/intern/bpy_app_opensubdiv.c | 2 +- .../blender/python/intern/bpy_app_openvdb.c | 2 +- source/blender/python/intern/bpy_app_sdl.c | 2 +- source/blender/python/intern/bpy_app_timers.c | 4 +- .../python/intern/bpy_app_translations.c | 4 +- source/blender/python/intern/bpy_app_usd.c | 2 +- source/blender/python/intern/bpy_capi_utils.c | 4 +- source/blender/python/intern/bpy_gizmo_wrap.c | 4 +- source/blender/python/intern/bpy_interface.c | 12 +- .../python/intern/bpy_interface_atexit.c | 2 +- .../blender/python/intern/bpy_library_load.c | 6 +- .../blender/python/intern/bpy_library_write.c | 6 +- source/blender/python/intern/bpy_msgbus.c | 8 +- source/blender/python/intern/bpy_operator.c | 10 +- .../blender/python/intern/bpy_operator_wrap.c | 2 +- source/blender/python/intern/bpy_props.c | 2 +- source/blender/python/intern/bpy_rna.c | 20 +-- source/blender/python/intern/bpy_rna_anim.c | 8 +- .../blender/python/intern/bpy_rna_callback.c | 4 +- source/blender/python/intern/bpy_rna_gizmo.c | 4 +- .../python/intern/bpy_rna_id_collection.c | 6 +- source/blender/python/intern/bpy_traceback.c | 2 +- .../python/intern/bpy_utils_previews.c | 4 +- .../blender/python/intern/bpy_utils_units.c | 2 +- source/blender/python/mathutils/mathutils.h | 6 +- .../python/mathutils/mathutils_Color.c | 2 +- .../python/mathutils/mathutils_Euler.c | 4 +- .../python/mathutils/mathutils_Matrix.c | 4 +- .../python/mathutils/mathutils_Quaternion.c | 2 +- .../python/mathutils/mathutils_bvhtree.c | 10 +- .../python/mathutils/mathutils_geometry.c | 6 +- .../python/mathutils/mathutils_kdtree.c | 2 +- .../blender/render/extern/include/RE_engine.h | 4 +- .../render/extern/include/RE_pipeline.h | 2 +- .../render/intern/include/render_types.h | 2 +- .../blender/render/intern/source/bake_api.c | 4 +- .../render/intern/source/external_engine.c | 10 +- .../render/intern/source/imagetexture.c | 10 +- .../blender/render/intern/source/initrender.c | 8 +- .../render/intern/source/multires_bake.c | 8 +- .../blender/render/intern/source/pipeline.c | 26 ++-- .../render/intern/source/pointdensity.c | 10 +- .../render/intern/source/render_result.c | 8 +- .../render/intern/source/render_texture.c | 14 +- .../blender/shader_fx/intern/FX_shader_flip.c | 4 +- .../blender/shader_fx/intern/FX_shader_glow.c | 4 +- .../shader_fx/intern/FX_shader_light.c | 4 +- .../shader_fx/intern/FX_shader_shadow.c | 4 +- .../shader_fx/intern/FX_shader_swirl.c | 4 +- .../blender/shader_fx/intern/FX_shader_wave.c | 4 +- source/blender/windowmanager/WM_api.h | 2 +- source/blender/windowmanager/WM_keymap.h | 2 +- source/blender/windowmanager/WM_types.h | 6 +- .../windowmanager/gizmo/intern/wm_gizmo.c | 4 +- .../gizmo/intern/wm_gizmo_group.c | 2 +- .../gizmo/intern/wm_gizmo_group_type.c | 4 +- .../windowmanager/gizmo/intern/wm_gizmo_map.c | 4 +- .../gizmo/intern/wm_gizmo_target_props.c | 4 +- .../gizmo/intern/wm_gizmo_type.c | 4 +- source/blender/windowmanager/intern/wm.c | 14 +- .../blender/windowmanager/intern/wm_cursors.c | 2 +- .../windowmanager/intern/wm_dragdrop.c | 2 +- source/blender/windowmanager/intern/wm_draw.c | 12 +- .../windowmanager/intern/wm_event_query.c | 6 +- .../windowmanager/intern/wm_event_system.c | 16 +-- .../blender/windowmanager/intern/wm_files.c | 28 ++-- .../windowmanager/intern/wm_files_link.c | 16 +-- .../blender/windowmanager/intern/wm_gesture.c | 4 +- .../windowmanager/intern/wm_gesture_ops.c | 4 +- .../windowmanager/intern/wm_init_exit.c | 36 +++--- source/blender/windowmanager/intern/wm_jobs.c | 2 +- .../blender/windowmanager/intern/wm_keymap.c | 6 +- .../windowmanager/intern/wm_menu_type.c | 2 +- .../windowmanager/intern/wm_operator_props.c | 2 +- .../windowmanager/intern/wm_operator_type.c | 4 +- .../windowmanager/intern/wm_operator_utils.c | 2 +- .../windowmanager/intern/wm_operators.c | 12 +- .../windowmanager/intern/wm_panel_type.c | 2 +- .../intern/wm_platform_support.c | 6 +- .../windowmanager/intern/wm_playanim.c | 14 +- .../windowmanager/intern/wm_splash_screen.c | 4 +- .../blender/windowmanager/intern/wm_surface.c | 4 +- .../windowmanager/intern/wm_toolsystem.c | 8 +- .../windowmanager/intern/wm_uilist_type.c | 2 +- .../blender/windowmanager/intern/wm_utils.c | 2 +- .../blender/windowmanager/intern/wm_window.c | 20 +-- source/blender/windowmanager/intern/wm_xr.c | 2 +- .../message_bus/intern/wm_message_bus.c | 4 +- .../message_bus/intern/wm_message_bus_rna.c | 4 +- .../intern/wm_message_bus_static.c | 4 +- source/creator/creator.c | 12 +- source/creator/creator_args.c | 12 +- source/creator/creator_signals.c | 10 +- tests/gtests/alembic/abc_export_test.cc | 4 +- tests/gtests/alembic/abc_matrix_test.cc | 2 +- tests/gtests/blenlib/BLI_array_ref_test.cc | 2 +- tests/gtests/blenlib/BLI_array_store_test.cc | 8 +- tests/gtests/blenlib/BLI_array_test.cc | 2 +- tests/gtests/blenlib/BLI_array_utils_test.cc | 2 +- tests/gtests/blenlib/BLI_delaunay_2d_test.cc | 2 +- tests/gtests/blenlib/BLI_edgehash_test.cc | 4 +- .../blenlib/BLI_ghash_performance_test.cc | 4 +- tests/gtests/blenlib/BLI_ghash_test.cc | 2 +- tests/gtests/blenlib/BLI_heap_simple_test.cc | 4 +- tests/gtests/blenlib/BLI_heap_test.cc | 2 +- tests/gtests/blenlib/BLI_index_range_test.cc | 2 +- tests/gtests/blenlib/BLI_kdopbvh_test.cc | 2 +- .../blenlib/BLI_linklist_lockfree_test.cc | 2 +- tests/gtests/blenlib/BLI_listbase_test.cc | 2 +- tests/gtests/blenlib/BLI_map_test.cc | 2 +- tests/gtests/blenlib/BLI_memiter_test.cc | 2 +- tests/gtests/blenlib/BLI_optional_test.cc | 2 +- tests/gtests/blenlib/BLI_path_util_test.cc | 2 +- tests/gtests/blenlib/BLI_polyfill_2d_test.cc | 8 +- tests/gtests/blenlib/BLI_set_test.cc | 2 +- tests/gtests/blenlib/BLI_stack_cxx_test.cc | 2 +- tests/gtests/blenlib/BLI_stack_test.cc | 2 +- tests/gtests/blenlib/BLI_string_map_test.cc | 2 +- tests/gtests/blenlib/BLI_string_ref_test.cc | 2 +- tests/gtests/blenlib/BLI_string_test.cc | 2 +- tests/gtests/blenlib/BLI_string_utf8_test.cc | 2 +- .../blenlib/BLI_task_performance_test.cc | 2 +- tests/gtests/blenlib/BLI_vector_set_test.cc | 2 +- tests/gtests/blenlib/BLI_vector_test.cc | 2 +- .../blenloader/blendfile_loading_base_test.cc | 4 +- .../blenloader/blendfile_loading_base_test.h | 2 +- tests/gtests/bmesh/bmesh_core_test.cc | 2 +- tests/gtests/testing/mock_log.h | 2 +- tests/gtests/testing/testing.h | 2 +- 1715 files changed, 5246 insertions(+), 5251 deletions(-) diff --git a/intern/atomic/intern/atomic_ops_msvc.h b/intern/atomic/intern/atomic_ops_msvc.h index d9655defa81..9c68d74995d 100644 --- a/intern/atomic/intern/atomic_ops_msvc.h +++ b/intern/atomic/intern/atomic_ops_msvc.h @@ -37,8 +37,8 @@ #endif #define WIN32_LEAN_AND_MEAN -#include #include +#include #if defined(__clang__) # pragma GCC diagnostic push diff --git a/intern/atomic/intern/atomic_ops_utils.h b/intern/atomic/intern/atomic_ops_utils.h index b54e12eb49d..57e5b74dd72 100644 --- a/intern/atomic/intern/atomic_ops_utils.h +++ b/intern/atomic/intern/atomic_ops_utils.h @@ -47,10 +47,10 @@ #ifndef __ATOMIC_OPS_UTILS_H__ #define __ATOMIC_OPS_UTILS_H__ -#include -#include -#include #include +#include +#include +#include #include diff --git a/intern/audaspace/intern/AUD_PyInit.cpp b/intern/audaspace/intern/AUD_PyInit.cpp index 843fe1e6cf1..47dc4d51c87 100644 --- a/intern/audaspace/intern/AUD_PyInit.cpp +++ b/intern/audaspace/intern/AUD_PyInit.cpp @@ -25,8 +25,8 @@ #include "AUD_PyInit.h" #include -#include #include +#include extern "C" { extern void *BKE_sound_get_factory(void *sound); diff --git a/intern/clog/clog.c b/intern/clog/clog.c index 9074e0f85e1..921ee17a672 100644 --- a/intern/clog/clog.c +++ b/intern/clog/clog.c @@ -18,23 +18,23 @@ * \ingroup clog */ +#include #include +#include #include #include -#include -#include /* Disable for small single threaded programs * to avoid having to link with pthreads. */ #ifdef WITH_CLOG_PTHREADS -# include # include "atomic_ops.h" +# include #endif /* For 'isatty' to check for color. */ #if defined(__unix__) || defined(__APPLE__) || defined(__HAIKU__) -# include # include +# include #endif #if defined(_MSC_VER) diff --git a/intern/cycles/app/cycles_cubin_cc.cpp b/intern/cycles/app/cycles_cubin_cc.cpp index 774c18f4219..9d4d52b34ac 100644 --- a/intern/cycles/app/cycles_cubin_cc.cpp +++ b/intern/cycles/app/cycles_cubin_cc.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include #include +#include #include #include diff --git a/intern/cycles/app/cycles_server.cpp b/intern/cycles/app/cycles_server.cpp index c5a4c9b375b..1ad70a376ed 100644 --- a/intern/cycles/app/cycles_server.cpp +++ b/intern/cycles/app/cycles_server.cpp @@ -20,11 +20,11 @@ #include "util/util_args.h" #include "util/util_foreach.h" +#include "util/util_logging.h" #include "util/util_path.h" #include "util/util_stats.h" #include "util/util_string.h" #include "util/util_task.h" -#include "util/util_logging.h" using namespace ccl; diff --git a/intern/cycles/app/cycles_standalone.cpp b/intern/cycles/app/cycles_standalone.cpp index d2d112e8d7e..e45c37be494 100644 --- a/intern/cycles/app/cycles_standalone.cpp +++ b/intern/cycles/app/cycles_standalone.cpp @@ -16,12 +16,12 @@ #include +#include "device/device.h" #include "render/buffers.h" #include "render/camera.h" -#include "device/device.h" +#include "render/integrator.h" #include "render/scene.h" #include "render/session.h" -#include "render/integrator.h" #include "util/util_args.h" #include "util/util_foreach.h" diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp index 11db5b1a07d..aec00f845f3 100644 --- a/intern/cycles/app/cycles_xml.cpp +++ b/intern/cycles/app/cycles_xml.cpp @@ -16,9 +16,9 @@ #include -#include #include #include +#include #include "graph/node_xml.h" @@ -32,8 +32,8 @@ #include "render/nodes.h" #include "render/object.h" #include "render/osl.h" -#include "render/shader.h" #include "render/scene.h" +#include "render/shader.h" #include "subd/subd_patch.h" #include "subd/subd_split.h" diff --git a/intern/cycles/blender/blender_device.h b/intern/cycles/blender/blender_device.h index fd6c045c966..8d2ecac7483 100644 --- a/intern/cycles/blender/blender_device.h +++ b/intern/cycles/blender/blender_device.h @@ -18,9 +18,9 @@ #define __BLENDER_DEVICE_H__ #include "MEM_guardedalloc.h" -#include "RNA_types.h" #include "RNA_access.h" #include "RNA_blender_cpp.h" +#include "RNA_types.h" #include "device/device.h" diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp index 075c9250e8c..a6f380a9ae7 100644 --- a/intern/cycles/blender/blender_mesh.cpp +++ b/intern/cycles/blender/blender_mesh.cpp @@ -14,25 +14,25 @@ * limitations under the License. */ +#include "render/camera.h" #include "render/colorspace.h" #include "render/mesh.h" #include "render/object.h" #include "render/scene.h" -#include "render/camera.h" -#include "blender/blender_sync.h" #include "blender/blender_session.h" +#include "blender/blender_sync.h" #include "blender/blender_util.h" #include "subd/subd_patch.h" #include "subd/subd_split.h" #include "util/util_algorithm.h" +#include "util/util_disjoint_set.h" #include "util/util_foreach.h" #include "util/util_hash.h" #include "util/util_logging.h" #include "util/util_math.h" -#include "util/util_disjoint_set.h" #include "mikktspace.h" diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp index 4e488f12d0d..4b29c28913b 100644 --- a/intern/cycles/blender/blender_object.cpp +++ b/intern/cycles/blender/blender_object.cpp @@ -15,14 +15,14 @@ */ #include "render/camera.h" -#include "render/integrator.h" #include "render/graph.h" +#include "render/integrator.h" #include "render/light.h" #include "render/mesh.h" -#include "render/object.h" -#include "render/scene.h" #include "render/nodes.h" +#include "render/object.h" #include "render/particles.h" +#include "render/scene.h" #include "render/shader.h" #include "blender/blender_object_cull.h" diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp index 816b4552fff..89bcebda193 100644 --- a/intern/cycles/blender/blender_python.cpp +++ b/intern/cycles/blender/blender_python.cpp @@ -19,8 +19,8 @@ #include "blender/CCL_api.h" #include "blender/blender_device.h" -#include "blender/blender_sync.h" #include "blender/blender_session.h" +#include "blender/blender_sync.h" #include "blender/blender_util.h" #include "render/denoising.h" @@ -38,8 +38,8 @@ #ifdef WITH_OSL # include "render/osl.h" -# include # include +# include #endif #ifdef WITH_OPENCL diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index 8e01ad9a96d..5ea96d6bdfd 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -41,8 +41,8 @@ #include "util/util_progress.h" #include "util/util_time.h" -#include "blender/blender_sync.h" #include "blender/blender_session.h" +#include "blender/blender_sync.h" #include "blender/blender_util.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index 59c1539d207..edde1fd243e 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -24,14 +24,14 @@ #include "render/shader.h" #include "blender/blender_image.h" -#include "blender/blender_texture.h" #include "blender/blender_sync.h" +#include "blender/blender_texture.h" #include "blender/blender_util.h" #include "util/util_debug.h" #include "util/util_foreach.h" -#include "util/util_string.h" #include "util/util_set.h" +#include "util/util_string.h" #include "util/util_task.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index 9f7797efb97..91d715af7e2 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -16,6 +16,7 @@ #include "render/background.h" #include "render/camera.h" +#include "render/curves.h" #include "render/film.h" #include "render/graph.h" #include "render/integrator.h" @@ -25,19 +26,18 @@ #include "render/object.h" #include "render/scene.h" #include "render/shader.h" -#include "render/curves.h" #include "device/device.h" #include "blender/blender_device.h" -#include "blender/blender_sync.h" #include "blender/blender_session.h" +#include "blender/blender_sync.h" #include "blender/blender_util.h" #include "util/util_debug.h" #include "util/util_foreach.h" -#include "util/util_opengl.h" #include "util/util_hash.h" +#include "util/util_opengl.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h index 25e933dc599..650b4f5bb4e 100644 --- a/intern/cycles/blender/blender_sync.h +++ b/intern/cycles/blender/blender_sync.h @@ -18,9 +18,9 @@ #define __BLENDER_SYNC_H__ #include "MEM_guardedalloc.h" -#include "RNA_types.h" #include "RNA_access.h" #include "RNA_blender_cpp.h" +#include "RNA_types.h" #include "blender/blender_id_map.h" #include "blender/blender_viewport.h" diff --git a/intern/cycles/blender/blender_texture.h b/intern/cycles/blender/blender_texture.h index 896bf62da70..8ab061aaed9 100644 --- a/intern/cycles/blender/blender_texture.h +++ b/intern/cycles/blender/blender_texture.h @@ -17,8 +17,8 @@ #ifndef __BLENDER_TEXTURE_H__ #define __BLENDER_TEXTURE_H__ -#include #include "blender/blender_sync.h" +#include CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_viewport.h b/intern/cycles/blender/blender_viewport.h index d2b55358c27..3e44e552f1d 100644 --- a/intern/cycles/blender/blender_viewport.h +++ b/intern/cycles/blender/blender_viewport.h @@ -18,9 +18,9 @@ #define __BLENDER_VIEWPORT_H__ #include "MEM_guardedalloc.h" -#include "RNA_types.h" #include "RNA_access.h" #include "RNA_blender_cpp.h" +#include "RNA_types.h" #include "render/film.h" #include "util/util_param.h" diff --git a/intern/cycles/bvh/bvh_build.cpp b/intern/cycles/bvh/bvh_build.cpp index b472c55d156..db156219f09 100644 --- a/intern/cycles/bvh/bvh_build.cpp +++ b/intern/cycles/bvh/bvh_build.cpp @@ -22,20 +22,20 @@ #include "bvh/bvh_params.h" #include "bvh_split.h" +#include "render/curves.h" #include "render/hair.h" #include "render/mesh.h" #include "render/object.h" #include "render/scene.h" -#include "render/curves.h" #include "util/util_algorithm.h" #include "util/util_foreach.h" #include "util/util_logging.h" #include "util/util_progress.h" -#include "util/util_stack_allocator.h" -#include "util/util_simd.h" -#include "util/util_time.h" #include "util/util_queue.h" +#include "util/util_simd.h" +#include "util/util_stack_allocator.h" +#include "util/util_time.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/bvh/bvh_embree.cpp b/intern/cycles/bvh/bvh_embree.cpp index 639dfe3cee2..9356adf3ea5 100644 --- a/intern/cycles/bvh/bvh_embree.cpp +++ b/intern/cycles/bvh/bvh_embree.cpp @@ -35,9 +35,9 @@ #ifdef WITH_EMBREE +# include # include # include -# include # include "bvh/bvh_embree.h" @@ -45,9 +45,9 @@ */ # include "kernel/bvh/bvh_embree.h" # include "kernel/kernel_compat_cpu.h" -# include "kernel/split/kernel_split_data_types.h" # include "kernel/kernel_globals.h" # include "kernel/kernel_random.h" +# include "kernel/split/kernel_split_data_types.h" # include "render/hair.h" # include "render/mesh.h" diff --git a/intern/cycles/bvh/bvh_optix.cpp b/intern/cycles/bvh/bvh_optix.cpp index da548e9c0db..26b64c24db5 100644 --- a/intern/cycles/bvh/bvh_optix.cpp +++ b/intern/cycles/bvh/bvh_optix.cpp @@ -18,8 +18,8 @@ #ifdef WITH_OPTIX # include "bvh/bvh_optix.h" -# include "render/hair.h" # include "render/geometry.h" +# include "render/hair.h" # include "render/mesh.h" # include "render/object.h" # include "util/util_foreach.h" diff --git a/intern/cycles/device/cuda/device_cuda_impl.cpp b/intern/cycles/device/cuda/device_cuda_impl.cpp index a4e7bc2f64a..0f261ef2f70 100644 --- a/intern/cycles/device/cuda/device_cuda_impl.cpp +++ b/intern/cycles/device/cuda/device_cuda_impl.cpp @@ -39,8 +39,8 @@ # include "util/util_path.h" # include "util/util_string.h" # include "util/util_system.h" -# include "util/util_types.h" # include "util/util_time.h" +# include "util/util_types.h" # include "util/util_windows.h" # include "kernel/split/kernel_split_data_types.h" diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index c0d02e0605f..d94d409175b 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -25,11 +25,11 @@ #include "util/util_logging.h" #include "util/util_math.h" #include "util/util_opengl.h" -#include "util/util_time.h" +#include "util/util_string.h" #include "util/util_system.h" +#include "util/util_time.h" #include "util/util_types.h" #include "util/util_vector.h" -#include "util/util_string.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index 2aeed3f0e89..a98ac171709 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -27,8 +27,8 @@ #include "util/util_list.h" #include "util/util_stats.h" #include "util/util_string.h" -#include "util/util_thread.h" #include "util/util_texture.h" +#include "util/util_thread.h" #include "util/util_types.h" #include "util/util_vector.h" diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index 6957adb478f..9a703b45c0a 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -16,9 +16,9 @@ #ifdef WITH_CUDA +# include "device/cuda/device_cuda.h" # include "device/device.h" # include "device/device_intern.h" -# include "device/cuda/device_cuda.h" # include "util/util_logging.h" # include "util/util_string.h" diff --git a/intern/cycles/device/device_memory.cpp b/intern/cycles/device/device_memory.cpp index 3c4f68cfc77..671cd7c29f3 100644 --- a/intern/cycles/device/device_memory.cpp +++ b/intern/cycles/device/device_memory.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "device/device.h" #include "device/device_memory.h" +#include "device/device.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/device_multi.cpp b/intern/cycles/device/device_multi.cpp index 631c4169e2e..3636ecaa7a1 100644 --- a/intern/cycles/device/device_multi.cpp +++ b/intern/cycles/device/device_multi.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include #include +#include #include "device/device.h" #include "device/device_intern.h" diff --git a/intern/cycles/device/device_network.cpp b/intern/cycles/device/device_network.cpp index 80334ad8f22..2742cbf53aa 100644 --- a/intern/cycles/device/device_network.cpp +++ b/intern/cycles/device/device_network.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ +#include "device/device_network.h" #include "device/device.h" #include "device/device_intern.h" -#include "device/device_network.h" #include "util/util_foreach.h" #include "util/util_logging.h" diff --git a/intern/cycles/device/device_network.h b/intern/cycles/device/device_network.h index 5b69b815cc6..e74c4508ab6 100644 --- a/intern/cycles/device/device_network.h +++ b/intern/cycles/device/device_network.h @@ -19,19 +19,19 @@ #ifdef WITH_NETWORK -# include -# include # include # include +# include +# include # include # include # include # include # include +# include # include # include -# include # include "render/buffers.h" diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp index ccfc53d5a21..891b73351a0 100644 --- a/intern/cycles/device/device_opencl.cpp +++ b/intern/cycles/device/device_opencl.cpp @@ -16,9 +16,9 @@ #ifdef WITH_OPENCL +# include "device/opencl/device_opencl.h" # include "device/device.h" # include "device/device_intern.h" -# include "device/opencl/device_opencl.h" # include "util/util_foreach.h" # include "util/util_logging.h" diff --git a/intern/cycles/device/device_optix.cpp b/intern/cycles/device/device_optix.cpp index 329876ce6f6..c23732839b6 100644 --- a/intern/cycles/device/device_optix.cpp +++ b/intern/cycles/device/device_optix.cpp @@ -17,28 +17,28 @@ #ifdef WITH_OPTIX -# include "device/cuda/device_cuda.h" -# include "device/device_intern.h" -# include "device/device_denoising.h" # include "bvh/bvh.h" -# include "render/scene.h" +# include "device/cuda/device_cuda.h" +# include "device/device_denoising.h" +# include "device/device_intern.h" +# include "render/buffers.h" # include "render/hair.h" # include "render/mesh.h" # include "render/object.h" -# include "render/buffers.h" +# include "render/scene.h" +# include "util/util_debug.h" +# include "util/util_logging.h" # include "util/util_md5.h" # include "util/util_path.h" # include "util/util_time.h" -# include "util/util_debug.h" -# include "util/util_logging.h" # ifdef WITH_CUDA_DYNLOAD # include // Do not use CUDA SDK headers when using CUEW # define OPTIX_DONT_INCLUDE_CUDA # endif -# include # include +# include // TODO(pmours): Disable this once drivers have native support # define OPTIX_DENOISER_NO_PIXEL_STRIDE 1 diff --git a/intern/cycles/device/opencl/memory_manager.h b/intern/cycles/device/opencl/memory_manager.h index 2fbc97a0756..23624f837a6 100644 --- a/intern/cycles/device/opencl/memory_manager.h +++ b/intern/cycles/device/opencl/memory_manager.h @@ -19,8 +19,8 @@ #include "device/device.h" #include "util/util_map.h" -#include "util/util_vector.h" #include "util/util_string.h" +#include "util/util_vector.h" #include "clew.h" diff --git a/intern/cycles/device/opencl/opencl_util.cpp b/intern/cycles/device/opencl/opencl_util.cpp index f59f109db70..580a73f6e8b 100644 --- a/intern/cycles/device/opencl/opencl_util.cpp +++ b/intern/cycles/device/opencl/opencl_util.cpp @@ -16,15 +16,15 @@ #ifdef WITH_OPENCL -# include "device/opencl/device_opencl.h" # include "device/device_intern.h" +# include "device/opencl/device_opencl.h" # include "util/util_debug.h" # include "util/util_logging.h" # include "util/util_md5.h" # include "util/util_path.h" -# include "util/util_time.h" # include "util/util_system.h" +# include "util/util_time.h" using std::cerr; using std::endl; diff --git a/intern/cycles/kernel/kernel.h b/intern/cycles/kernel/kernel.h index 3debfc76fbb..b907c6a2bac 100644 --- a/intern/cycles/kernel/kernel.h +++ b/intern/cycles/kernel/kernel.h @@ -19,8 +19,8 @@ /* CPU Kernel Interface */ -#include "util/util_types.h" #include "kernel/kernel_types.h" +#include "util/util_types.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/kernel_compat_cpu.h b/intern/cycles/kernel/kernel_compat_cpu.h index 006dd00dd73..88f6a264a5a 100644 --- a/intern/cycles/kernel/kernel_compat_cpu.h +++ b/intern/cycles/kernel/kernel_compat_cpu.h @@ -35,11 +35,11 @@ # define __NODES_FEATURES__ NODE_FEATURE_ALL #endif +#include "util/util_half.h" #include "util/util_math.h" #include "util/util_simd.h" -#include "util/util_half.h" -#include "util/util_types.h" #include "util/util_texture.h" +#include "util/util_types.h" #define ccl_addr_space diff --git a/intern/cycles/kernel/kernel_globals.h b/intern/cycles/kernel/kernel_globals.h index a440021b6b9..c186e8560eb 100644 --- a/intern/cycles/kernel/kernel_globals.h +++ b/intern/cycles/kernel/kernel_globals.h @@ -22,8 +22,8 @@ #include "kernel/kernel_profiling.h" #ifdef __KERNEL_CPU__ -# include "util/util_vector.h" # include "util/util_map.h" +# include "util/util_vector.h" #endif #ifdef __KERNEL_OPENCL__ diff --git a/intern/cycles/kernel/osl/osl_closures.h b/intern/cycles/kernel/osl/osl_closures.h index d3db6b71f5c..d12afdb80dd 100644 --- a/intern/cycles/kernel/osl/osl_closures.h +++ b/intern/cycles/kernel/osl/osl_closures.h @@ -33,12 +33,12 @@ #ifndef __OSL_CLOSURES_H__ #define __OSL_CLOSURES_H__ -#include "util/util_types.h" #include "kernel/kernel_types.h" +#include "util/util_types.h" +#include #include #include -#include CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/osl/osl_globals.h b/intern/cycles/kernel/osl/osl_globals.h index 0e6c8d21534..c06c9abd4c1 100644 --- a/intern/cycles/kernel/osl/osl_globals.h +++ b/intern/cycles/kernel/osl/osl_globals.h @@ -27,8 +27,8 @@ # include "util/util_map.h" # include "util/util_param.h" # include "util/util_thread.h" -# include "util/util_vector.h" # include "util/util_unique_ptr.h" +# include "util/util_vector.h" # ifndef WIN32 using std::isfinite; diff --git a/intern/cycles/kernel/osl/osl_services.h b/intern/cycles/kernel/osl/osl_services.h index 469c5188730..d32dace23bf 100644 --- a/intern/cycles/kernel/osl/osl_services.h +++ b/intern/cycles/kernel/osl/osl_services.h @@ -25,8 +25,8 @@ * attributes. */ -#include #include +#include #ifdef WITH_PTEX class PtexCache; diff --git a/intern/cycles/kernel/shaders/node_environment_texture.osl b/intern/cycles/kernel/shaders/node_environment_texture.osl index 2bae30c785c..d04743eb368 100644 --- a/intern/cycles/kernel/shaders/node_environment_texture.osl +++ b/intern/cycles/kernel/shaders/node_environment_texture.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_color.h" +#include "stdcycles.h" vector environment_texture_direction_to_equirectangular(vector dir) { diff --git a/intern/cycles/kernel/shaders/node_fresnel.osl b/intern/cycles/kernel/shaders/node_fresnel.osl index 1658debf82c..cff084c344d 100644 --- a/intern/cycles/kernel/shaders/node_fresnel.osl +++ b/intern/cycles/kernel/shaders/node_fresnel.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_fresnel.h" +#include "stdcycles.h" shader node_fresnel(float IOR = 1.45, normal Normal = N, output float Fac = 0.0) { diff --git a/intern/cycles/kernel/shaders/node_glass_bsdf.osl b/intern/cycles/kernel/shaders/node_glass_bsdf.osl index 120d57c37dd..0042d573f8d 100644 --- a/intern/cycles/kernel/shaders/node_glass_bsdf.osl +++ b/intern/cycles/kernel/shaders/node_glass_bsdf.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_fresnel.h" +#include "stdcycles.h" shader node_glass_bsdf(color Color = 0.8, string distribution = "sharp", diff --git a/intern/cycles/kernel/shaders/node_glossy_bsdf.osl b/intern/cycles/kernel/shaders/node_glossy_bsdf.osl index a93b013c1d6..c73604d3650 100644 --- a/intern/cycles/kernel/shaders/node_glossy_bsdf.osl +++ b/intern/cycles/kernel/shaders/node_glossy_bsdf.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_fresnel.h" +#include "stdcycles.h" shader node_glossy_bsdf(color Color = 0.8, string distribution = "GGX", diff --git a/intern/cycles/kernel/shaders/node_hsv.osl b/intern/cycles/kernel/shaders/node_hsv.osl index 40bef11977e..4417057b10f 100644 --- a/intern/cycles/kernel/shaders/node_hsv.osl +++ b/intern/cycles/kernel/shaders/node_hsv.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_color.h" +#include "stdcycles.h" shader node_hsv(float Hue = 0.5, float Saturation = 1.0, diff --git a/intern/cycles/kernel/shaders/node_image_texture.osl b/intern/cycles/kernel/shaders/node_image_texture.osl index bfaab514321..22d34a1082c 100644 --- a/intern/cycles/kernel/shaders/node_image_texture.osl +++ b/intern/cycles/kernel/shaders/node_image_texture.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_color.h" +#include "stdcycles.h" point texco_remap_square(point co) { diff --git a/intern/cycles/kernel/shaders/node_layer_weight.osl b/intern/cycles/kernel/shaders/node_layer_weight.osl index 4da69b62d2e..1662be2cad1 100644 --- a/intern/cycles/kernel/shaders/node_layer_weight.osl +++ b/intern/cycles/kernel/shaders/node_layer_weight.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_fresnel.h" +#include "stdcycles.h" shader node_layer_weight(float Blend = 0.5, normal Normal = N, diff --git a/intern/cycles/kernel/shaders/node_math.osl b/intern/cycles/kernel/shaders/node_math.osl index 6c3dd1547a6..dbaa7ccb60e 100644 --- a/intern/cycles/kernel/shaders/node_math.osl +++ b/intern/cycles/kernel/shaders/node_math.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_math.h" +#include "stdcycles.h" /* OSL asin, acos, and pow functions are safe by default. */ shader node_math(string type = "add", diff --git a/intern/cycles/kernel/shaders/node_mix.osl b/intern/cycles/kernel/shaders/node_mix.osl index a296b139af5..a13b4bb7b96 100644 --- a/intern/cycles/kernel/shaders/node_mix.osl +++ b/intern/cycles/kernel/shaders/node_mix.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_color.h" +#include "stdcycles.h" color node_mix_blend(float t, color col1, color col2) { diff --git a/intern/cycles/kernel/shaders/node_musgrave_texture.osl b/intern/cycles/kernel/shaders/node_musgrave_texture.osl index cd054102968..d03b84c1ab4 100644 --- a/intern/cycles/kernel/shaders/node_musgrave_texture.osl +++ b/intern/cycles/kernel/shaders/node_musgrave_texture.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_noise.h" +#include "stdcycles.h" #include "vector2.h" #include "vector4.h" diff --git a/intern/cycles/kernel/shaders/node_noise_texture.osl b/intern/cycles/kernel/shaders/node_noise_texture.osl index ab8f304c80d..4121b415673 100644 --- a/intern/cycles/kernel/shaders/node_noise_texture.osl +++ b/intern/cycles/kernel/shaders/node_noise_texture.osl @@ -14,10 +14,10 @@ * limitations under the License. */ +#include "node_noise.h" #include "stdcycles.h" #include "vector2.h" #include "vector4.h" -#include "node_noise.h" #define vector3 point diff --git a/intern/cycles/kernel/shaders/node_principled_bsdf.osl b/intern/cycles/kernel/shaders/node_principled_bsdf.osl index 7fb562ffe47..1711811ac65 100644 --- a/intern/cycles/kernel/shaders/node_principled_bsdf.osl +++ b/intern/cycles/kernel/shaders/node_principled_bsdf.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_fresnel.h" +#include "stdcycles.h" shader node_principled_bsdf(string distribution = "Multiscatter GGX", string subsurface_method = "burley", diff --git a/intern/cycles/kernel/shaders/node_rgb_curves.osl b/intern/cycles/kernel/shaders/node_rgb_curves.osl index 1aca7966257..8850040d580 100644 --- a/intern/cycles/kernel/shaders/node_rgb_curves.osl +++ b/intern/cycles/kernel/shaders/node_rgb_curves.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_ramp_util.h" +#include "stdcycles.h" shader node_rgb_curves(color ramp[] = {0.0}, float min_x = 0.0, diff --git a/intern/cycles/kernel/shaders/node_rgb_ramp.osl b/intern/cycles/kernel/shaders/node_rgb_ramp.osl index 5d4e13cbca6..2131edb2688 100644 --- a/intern/cycles/kernel/shaders/node_rgb_ramp.osl +++ b/intern/cycles/kernel/shaders/node_rgb_ramp.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_ramp_util.h" +#include "stdcycles.h" shader node_rgb_ramp(color ramp_color[] = {0.0}, float ramp_alpha[] = {0.0}, diff --git a/intern/cycles/kernel/shaders/node_separate_hsv.osl b/intern/cycles/kernel/shaders/node_separate_hsv.osl index ad1d7ae70d7..2f902b72dbc 100644 --- a/intern/cycles/kernel/shaders/node_separate_hsv.osl +++ b/intern/cycles/kernel/shaders/node_separate_hsv.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_color.h" +#include "stdcycles.h" shader node_separate_hsv(color Color = 0.8, output float H = 0.0, diff --git a/intern/cycles/kernel/shaders/node_sky_texture.osl b/intern/cycles/kernel/shaders/node_sky_texture.osl index 145a95800b2..4def237a2e0 100644 --- a/intern/cycles/kernel/shaders/node_sky_texture.osl +++ b/intern/cycles/kernel/shaders/node_sky_texture.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_color.h" +#include "stdcycles.h" float sky_angle_between(float thetav, float phiv, float theta, float phi) { diff --git a/intern/cycles/kernel/shaders/node_vector_curves.osl b/intern/cycles/kernel/shaders/node_vector_curves.osl index 41993fd8b56..9d3a2b82b0a 100644 --- a/intern/cycles/kernel/shaders/node_vector_curves.osl +++ b/intern/cycles/kernel/shaders/node_vector_curves.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_ramp_util.h" +#include "stdcycles.h" shader node_vector_curves(color ramp[] = {0.0}, float min_x = 0.0, diff --git a/intern/cycles/kernel/shaders/node_vector_math.osl b/intern/cycles/kernel/shaders/node_vector_math.osl index 7f3ea781f38..218851598b4 100644 --- a/intern/cycles/kernel/shaders/node_vector_math.osl +++ b/intern/cycles/kernel/shaders/node_vector_math.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_math.h" +#include "stdcycles.h" shader node_vector_math(string type = "add", vector Vector1 = vector(0.0, 0.0, 0.0), diff --git a/intern/cycles/kernel/shaders/node_vector_rotate.osl b/intern/cycles/kernel/shaders/node_vector_rotate.osl index d32733b0966..2efe3470ae2 100644 --- a/intern/cycles/kernel/shaders/node_vector_rotate.osl +++ b/intern/cycles/kernel/shaders/node_vector_rotate.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_math.h" +#include "stdcycles.h" shader node_vector_rotate(int invert = 0, string type = "axis", diff --git a/intern/cycles/kernel/shaders/node_velvet_bsdf.osl b/intern/cycles/kernel/shaders/node_velvet_bsdf.osl index 2a35a3da5a5..299acef35ee 100644 --- a/intern/cycles/kernel/shaders/node_velvet_bsdf.osl +++ b/intern/cycles/kernel/shaders/node_velvet_bsdf.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_fresnel.h" +#include "stdcycles.h" shader node_velvet_bsdf(color Color = 0.8, float Sigma = 0.0, diff --git a/intern/cycles/kernel/shaders/node_voronoi_texture.osl b/intern/cycles/kernel/shaders/node_voronoi_texture.osl index 7a24cde95fc..04d61c32f8a 100644 --- a/intern/cycles/kernel/shaders/node_voronoi_texture.osl +++ b/intern/cycles/kernel/shaders/node_voronoi_texture.osl @@ -14,10 +14,10 @@ * limitations under the License. */ +#include "node_hash.h" #include "stdcycles.h" #include "vector2.h" #include "vector4.h" -#include "node_hash.h" #define vector3 point diff --git a/intern/cycles/kernel/shaders/node_wave_texture.osl b/intern/cycles/kernel/shaders/node_wave_texture.osl index 5cc77aac75a..f17397be243 100644 --- a/intern/cycles/kernel/shaders/node_wave_texture.osl +++ b/intern/cycles/kernel/shaders/node_wave_texture.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_noise.h" +#include "stdcycles.h" /* Wave */ diff --git a/intern/cycles/kernel/shaders/node_white_noise_texture.osl b/intern/cycles/kernel/shaders/node_white_noise_texture.osl index 03b791b04ef..94735a019d5 100644 --- a/intern/cycles/kernel/shaders/node_white_noise_texture.osl +++ b/intern/cycles/kernel/shaders/node_white_noise_texture.osl @@ -14,10 +14,10 @@ * limitations under the License. */ +#include "node_hash.h" #include "stdcycles.h" #include "vector2.h" #include "vector4.h" -#include "node_hash.h" #define vector3 point diff --git a/intern/cycles/kernel/shaders/node_wireframe.osl b/intern/cycles/kernel/shaders/node_wireframe.osl index d5d5b63ade8..673a451c928 100644 --- a/intern/cycles/kernel/shaders/node_wireframe.osl +++ b/intern/cycles/kernel/shaders/node_wireframe.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "oslutil.h" +#include "stdcycles.h" shader node_wireframe(string bump_offset = "center", int use_pixel_size = 0, diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h index 88c9dbf5838..02c0cb48108 100644 --- a/intern/cycles/kernel/svm/svm.h +++ b/intern/cycles/kernel/svm/svm.h @@ -161,53 +161,53 @@ CCL_NAMESPACE_END #include "svm_fractal_noise.h" #include "kernel/svm/svm_color_util.h" -#include "kernel/svm/svm_math_util.h" #include "kernel/svm/svm_mapping_util.h" +#include "kernel/svm/svm_math_util.h" #include "kernel/svm/svm_aov.h" #include "kernel/svm/svm_attribute.h" -#include "kernel/svm/svm_gradient.h" #include "kernel/svm/svm_blackbody.h" +#include "kernel/svm/svm_brick.h" +#include "kernel/svm/svm_brightness.h" +#include "kernel/svm/svm_bump.h" +#include "kernel/svm/svm_camera.h" +#include "kernel/svm/svm_checker.h" +#include "kernel/svm/svm_clamp.h" #include "kernel/svm/svm_closure.h" -#include "kernel/svm/svm_noisetex.h" #include "kernel/svm/svm_convert.h" #include "kernel/svm/svm_displace.h" #include "kernel/svm/svm_fresnel.h" -#include "kernel/svm/svm_wireframe.h" -#include "kernel/svm/svm_wavelength.h" -#include "kernel/svm/svm_camera.h" +#include "kernel/svm/svm_gamma.h" #include "kernel/svm/svm_geometry.h" +#include "kernel/svm/svm_gradient.h" #include "kernel/svm/svm_hsv.h" #include "kernel/svm/svm_ies.h" #include "kernel/svm/svm_image.h" -#include "kernel/svm/svm_gamma.h" -#include "kernel/svm/svm_brightness.h" #include "kernel/svm/svm_invert.h" #include "kernel/svm/svm_light_path.h" #include "kernel/svm/svm_magic.h" +#include "kernel/svm/svm_map_range.h" #include "kernel/svm/svm_mapping.h" -#include "kernel/svm/svm_normal.h" -#include "kernel/svm/svm_wave.h" #include "kernel/svm/svm_math.h" #include "kernel/svm/svm_mix.h" +#include "kernel/svm/svm_musgrave.h" +#include "kernel/svm/svm_noisetex.h" +#include "kernel/svm/svm_normal.h" #include "kernel/svm/svm_ramp.h" #include "kernel/svm/svm_sepcomb_hsv.h" #include "kernel/svm/svm_sepcomb_vector.h" -#include "kernel/svm/svm_musgrave.h" #include "kernel/svm/svm_sky.h" #include "kernel/svm/svm_tex_coord.h" #include "kernel/svm/svm_value.h" -#include "kernel/svm/svm_voronoi.h" -#include "kernel/svm/svm_checker.h" -#include "kernel/svm/svm_brick.h" #include "kernel/svm/svm_vector_rotate.h" #include "kernel/svm/svm_vector_transform.h" -#include "kernel/svm/svm_voxel.h" -#include "kernel/svm/svm_bump.h" -#include "kernel/svm/svm_map_range.h" -#include "kernel/svm/svm_clamp.h" -#include "kernel/svm/svm_white_noise.h" #include "kernel/svm/svm_vertex_color.h" +#include "kernel/svm/svm_voronoi.h" +#include "kernel/svm/svm_voxel.h" +#include "kernel/svm/svm_wave.h" +#include "kernel/svm/svm_wavelength.h" +#include "kernel/svm/svm_white_noise.h" +#include "kernel/svm/svm_wireframe.h" #ifdef __SHADER_RAYTRACE__ # include "kernel/svm/svm_ao.h" diff --git a/intern/cycles/render/attribute.cpp b/intern/cycles/render/attribute.cpp index d0d9888ac88..a3d3c1c2bda 100644 --- a/intern/cycles/render/attribute.cpp +++ b/intern/cycles/render/attribute.cpp @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "render/image.h" -#include "render/hair.h" -#include "render/mesh.h" #include "render/attribute.h" +#include "render/hair.h" +#include "render/image.h" +#include "render/mesh.h" #include "util/util_foreach.h" #include "util/util_transform.h" diff --git a/intern/cycles/render/background.cpp b/intern/cycles/render/background.cpp index 25ec0d3f0ba..694bb640995 100644 --- a/intern/cycles/render/background.cpp +++ b/intern/cycles/render/background.cpp @@ -16,8 +16,8 @@ #include "render/background.h" #include "device/device.h" -#include "render/integrator.h" #include "render/graph.h" +#include "render/integrator.h" #include "render/nodes.h" #include "render/scene.h" #include "render/shader.h" diff --git a/intern/cycles/render/bake.cpp b/intern/cycles/render/bake.cpp index 11ccfc95293..35f942b3e9b 100644 --- a/intern/cycles/render/bake.cpp +++ b/intern/cycles/render/bake.cpp @@ -15,10 +15,10 @@ */ #include "render/bake.h" +#include "render/integrator.h" #include "render/mesh.h" #include "render/object.h" #include "render/shader.h" -#include "render/integrator.h" #include "util/util_foreach.h" diff --git a/intern/cycles/render/buffers.cpp b/intern/cycles/render/buffers.cpp index 19d3f00bf82..2d89fb9ffba 100644 --- a/intern/cycles/render/buffers.cpp +++ b/intern/cycles/render/buffers.cpp @@ -16,8 +16,8 @@ #include -#include "render/buffers.h" #include "device/device.h" +#include "render/buffers.h" #include "util/util_foreach.h" #include "util/util_hash.h" diff --git a/intern/cycles/render/colorspace.cpp b/intern/cycles/render/colorspace.cpp index 7684d48756f..7605fcaf5ff 100644 --- a/intern/cycles/render/colorspace.cpp +++ b/intern/cycles/render/colorspace.cpp @@ -17,8 +17,8 @@ #include "render/colorspace.h" #include "util/util_color.h" -#include "util/util_image.h" #include "util/util_half.h" +#include "util/util_image.h" #include "util/util_logging.h" #include "util/util_math.h" #include "util/util_thread.h" diff --git a/intern/cycles/render/constant_fold.h b/intern/cycles/render/constant_fold.h index 7f622488a88..fec4123c361 100644 --- a/intern/cycles/render/constant_fold.h +++ b/intern/cycles/render/constant_fold.h @@ -17,8 +17,8 @@ #ifndef __CONSTANT_FOLD_H__ #define __CONSTANT_FOLD_H__ -#include "util/util_types.h" #include "kernel/svm/svm_types.h" +#include "util/util_types.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/render/curves.cpp b/intern/cycles/render/curves.cpp index 66fbc9eb4a8..1907bb33d06 100644 --- a/intern/cycles/render/curves.cpp +++ b/intern/cycles/render/curves.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "device/device.h" #include "render/curves.h" +#include "device/device.h" #include "render/mesh.h" #include "render/object.h" #include "render/scene.h" diff --git a/intern/cycles/render/denoising.h b/intern/cycles/render/denoising.h index c234d00eb49..5c6f913cb38 100644 --- a/intern/cycles/render/denoising.h +++ b/intern/cycles/render/denoising.h @@ -23,8 +23,8 @@ #include "render/buffers.h" #include "util/util_string.h" -#include "util/util_vector.h" #include "util/util_unique_ptr.h" +#include "util/util_vector.h" #include diff --git a/intern/cycles/render/film.cpp b/intern/cycles/render/film.cpp index 48d9c97e0fb..d1e2ef66c2c 100644 --- a/intern/cycles/render/film.cpp +++ b/intern/cycles/render/film.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "render/camera.h" -#include "device/device.h" #include "render/film.h" +#include "device/device.h" +#include "render/camera.h" #include "render/integrator.h" #include "render/mesh.h" #include "render/scene.h" diff --git a/intern/cycles/render/geometry.cpp b/intern/cycles/render/geometry.cpp index 748a8f7cf67..d46ed430c4f 100644 --- a/intern/cycles/render/geometry.cpp +++ b/intern/cycles/render/geometry.cpp @@ -33,8 +33,8 @@ #include "render/shader.h" #include "render/stats.h" -#include "subd/subd_split.h" #include "subd/subd_patch_table.h" +#include "subd/subd_split.h" #include "kernel/osl/osl_globals.h" diff --git a/intern/cycles/render/geometry.h b/intern/cycles/render/geometry.h index 82f539d391d..b0284304843 100644 --- a/intern/cycles/render/geometry.h +++ b/intern/cycles/render/geometry.h @@ -24,8 +24,8 @@ #include "render/attribute.h" #include "util/util_boundbox.h" -#include "util/util_transform.h" #include "util/util_set.h" +#include "util/util_transform.h" #include "util/util_types.h" #include "util/util_vector.h" diff --git a/intern/cycles/render/graph.cpp b/intern/cycles/render/graph.cpp index 0e520c700a7..d2db59894ea 100644 --- a/intern/cycles/render/graph.cpp +++ b/intern/cycles/render/graph.cpp @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "render/attribute.h" #include "render/graph.h" +#include "render/attribute.h" +#include "render/constant_fold.h" #include "render/nodes.h" #include "render/scene.h" #include "render/shader.h" -#include "render/constant_fold.h" #include "util/util_algorithm.h" #include "util/util_foreach.h" diff --git a/intern/cycles/render/hair.cpp b/intern/cycles/render/hair.cpp index 7220fe7093b..3daa4cc1e35 100644 --- a/intern/cycles/render/hair.cpp +++ b/intern/cycles/render/hair.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "render/curves.h" #include "render/hair.h" +#include "render/curves.h" #include "render/scene.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp index 23f97ba5aa3..40fdf4b4119 100644 --- a/intern/cycles/render/image.cpp +++ b/intern/cycles/render/image.cpp @@ -15,9 +15,9 @@ */ #include "render/image.h" -#include "render/image_oiio.h" #include "device/device.h" #include "render/colorspace.h" +#include "render/image_oiio.h" #include "render/scene.h" #include "render/stats.h" diff --git a/intern/cycles/render/integrator.cpp b/intern/cycles/render/integrator.cpp index d856f7a300f..2f9d088899e 100644 --- a/intern/cycles/render/integrator.cpp +++ b/intern/cycles/render/integrator.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ +#include "render/integrator.h" #include "device/device.h" #include "render/background.h" -#include "render/integrator.h" #include "render/film.h" #include "render/jitter.h" #include "render/light.h" @@ -27,8 +27,8 @@ #include "kernel/kernel_types.h" #include "util/util_foreach.h" -#include "util/util_logging.h" #include "util/util_hash.h" +#include "util/util_logging.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/render/light.cpp b/intern/cycles/render/light.cpp index 8263f68fa9c..9adf8e5341a 100644 --- a/intern/cycles/render/light.cpp +++ b/intern/cycles/render/light.cpp @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "render/background.h" +#include "render/light.h" #include "device/device.h" -#include "render/integrator.h" +#include "render/background.h" #include "render/film.h" #include "render/graph.h" -#include "render/light.h" +#include "render/integrator.h" #include "render/mesh.h" #include "render/nodes.h" #include "render/object.h" @@ -28,9 +28,9 @@ #include "util/util_foreach.h" #include "util/util_hash.h" +#include "util/util_logging.h" #include "util/util_path.h" #include "util/util_progress.h" -#include "util/util_logging.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/render/merge.cpp b/intern/cycles/render/merge.cpp index cac07e59fe3..3ea3952b96c 100644 --- a/intern/cycles/render/merge.cpp +++ b/intern/cycles/render/merge.cpp @@ -22,8 +22,8 @@ #include "util/util_time.h" #include "util/util_unique_ptr.h" -#include #include +#include OIIO_NAMESPACE_USING diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp index f855697b889..c262d770331 100644 --- a/intern/cycles/render/mesh.cpp +++ b/intern/cycles/render/mesh.cpp @@ -25,8 +25,8 @@ #include "render/object.h" #include "render/scene.h" -#include "subd/subd_split.h" #include "subd/subd_patch_table.h" +#include "subd/subd_split.h" #include "util/util_foreach.h" #include "util/util_logging.h" diff --git a/intern/cycles/render/mesh_subdivision.cpp b/intern/cycles/render/mesh_subdivision.cpp index 40dd658eadd..3d72b2fab91 100644 --- a/intern/cycles/render/mesh_subdivision.cpp +++ b/intern/cycles/render/mesh_subdivision.cpp @@ -14,16 +14,16 @@ * limitations under the License. */ -#include "render/mesh.h" #include "render/attribute.h" #include "render/camera.h" +#include "render/mesh.h" -#include "subd/subd_split.h" #include "subd/subd_patch.h" #include "subd/subd_patch_table.h" +#include "subd/subd_split.h" -#include "util/util_foreach.h" #include "util/util_algorithm.h" +#include "util/util_foreach.h" #include "util/util_hash.h" CCL_NAMESPACE_BEGIN @@ -32,10 +32,10 @@ CCL_NAMESPACE_BEGIN CCL_NAMESPACE_END -# include -# include -# include # include +# include +# include +# include /* specializations of TopologyRefinerFactory for ccl::Mesh */ diff --git a/intern/cycles/render/mesh_volume.cpp b/intern/cycles/render/mesh_volume.cpp index 241be2d7592..d73ba3b06dd 100644 --- a/intern/cycles/render/mesh_volume.cpp +++ b/intern/cycles/render/mesh_volume.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "render/mesh.h" #include "render/attribute.h" +#include "render/mesh.h" #include "render/scene.h" #include "util/util_foreach.h" diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index 26b816b65e9..ac07d91c4ca 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -14,17 +14,17 @@ * limitations under the License. */ +#include "render/nodes.h" #include "render/colorspace.h" +#include "render/constant_fold.h" #include "render/film.h" #include "render/image.h" #include "render/integrator.h" #include "render/light.h" #include "render/mesh.h" -#include "render/nodes.h" +#include "render/osl.h" #include "render/scene.h" #include "render/svm.h" -#include "render/osl.h" -#include "render/constant_fold.h" #include "util/util_foreach.h" #include "util/util_logging.h" diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h index 1f52a2a49ab..e79de34bc2c 100644 --- a/intern/cycles/render/nodes.h +++ b/intern/cycles/render/nodes.h @@ -17,9 +17,9 @@ #ifndef __NODES_H__ #define __NODES_H__ +#include "graph/node.h" #include "render/graph.h" #include "render/image.h" -#include "graph/node.h" #include "util/util_array.h" #include "util/util_string.h" diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp index 342a641c0be..90a1d90019d 100644 --- a/intern/cycles/render/object.cpp +++ b/intern/cycles/render/object.cpp @@ -14,24 +14,24 @@ * limitations under the License. */ -#include "render/camera.h" +#include "render/object.h" #include "device/device.h" +#include "render/camera.h" +#include "render/curves.h" #include "render/hair.h" #include "render/integrator.h" #include "render/light.h" #include "render/mesh.h" -#include "render/curves.h" -#include "render/object.h" #include "render/particles.h" #include "render/scene.h" #include "util/util_foreach.h" #include "util/util_logging.h" #include "util/util_map.h" +#include "util/util_murmurhash.h" #include "util/util_progress.h" #include "util/util_set.h" #include "util/util_vector.h" -#include "util/util_murmurhash.h" #include "subd/subd_patch_table.h" diff --git a/intern/cycles/render/object.h b/intern/cycles/render/object.h index 2c2870cd0f2..7c84c2de4fb 100644 --- a/intern/cycles/render/object.h +++ b/intern/cycles/render/object.h @@ -23,8 +23,8 @@ #include "util/util_array.h" #include "util/util_boundbox.h" #include "util/util_param.h" -#include "util/util_transform.h" #include "util/util_thread.h" +#include "util/util_transform.h" #include "util/util_types.h" #include "util/util_vector.h" diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp index 74eb61e2dff..06d832a29ca 100644 --- a/intern/cycles/render/osl.cpp +++ b/intern/cycles/render/osl.cpp @@ -20,10 +20,10 @@ #include "render/colorspace.h" #include "render/graph.h" #include "render/light.h" +#include "render/nodes.h" #include "render/osl.h" #include "render/scene.h" #include "render/shader.h" -#include "render/nodes.h" #ifdef WITH_OSL diff --git a/intern/cycles/render/particles.cpp b/intern/cycles/render/particles.cpp index 8335404b197..ec9276eff86 100644 --- a/intern/cycles/render/particles.cpp +++ b/intern/cycles/render/particles.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "device/device.h" #include "render/particles.h" +#include "device/device.h" #include "render/scene.h" #include "util/util_foreach.h" diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp index e827a424c3c..f5b68d5a4fe 100644 --- a/intern/cycles/render/scene.cpp +++ b/intern/cycles/render/scene.cpp @@ -16,11 +16,11 @@ #include +#include "device/device.h" #include "render/background.h" #include "render/bake.h" #include "render/camera.h" #include "render/curves.h" -#include "device/device.h" #include "render/film.h" #include "render/integrator.h" #include "render/light.h" diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index b5d434a604c..b1b30979b0e 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -14,12 +14,13 @@ * limitations under the License. */ -#include #include +#include +#include "device/device.h" +#include "render/bake.h" #include "render/buffers.h" #include "render/camera.h" -#include "device/device.h" #include "render/graph.h" #include "render/integrator.h" #include "render/light.h" @@ -27,7 +28,6 @@ #include "render/object.h" #include "render/scene.h" #include "render/session.h" -#include "render/bake.h" #include "util/util_foreach.h" #include "util/util_function.h" diff --git a/intern/cycles/render/session.h b/intern/cycles/render/session.h index 8053e46b12e..61970d87e9c 100644 --- a/intern/cycles/render/session.h +++ b/intern/cycles/render/session.h @@ -17,8 +17,8 @@ #ifndef __SESSION_H__ #define __SESSION_H__ -#include "render/buffers.h" #include "device/device.h" +#include "render/buffers.h" #include "render/shader.h" #include "render/stats.h" #include "render/tile.h" diff --git a/intern/cycles/render/shader.h b/intern/cycles/render/shader.h index 1509150228f..7801fd29276 100644 --- a/intern/cycles/render/shader.h +++ b/intern/cycles/render/shader.h @@ -23,8 +23,8 @@ # include #endif -#include "render/attribute.h" #include "kernel/kernel_types.h" +#include "render/attribute.h" #include "graph/node.h" diff --git a/intern/cycles/render/svm.cpp b/intern/cycles/render/svm.cpp index c4218f7df1e..b4858f488c3 100644 --- a/intern/cycles/render/svm.cpp +++ b/intern/cycles/render/svm.cpp @@ -25,8 +25,8 @@ #include "render/shader.h" #include "render/svm.h" -#include "util/util_logging.h" #include "util/util_foreach.h" +#include "util/util_logging.h" #include "util/util_progress.h" #include "util/util_task.h" diff --git a/intern/cycles/render/tables.cpp b/intern/cycles/render/tables.cpp index d88925939e3..270e05abe29 100644 --- a/intern/cycles/render/tables.cpp +++ b/intern/cycles/render/tables.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ +#include "render/tables.h" #include "device/device.h" #include "render/scene.h" -#include "render/tables.h" #include "util/util_logging.h" diff --git a/intern/cycles/test/render_graph_finalize_test.cpp b/intern/cycles/test/render_graph_finalize_test.cpp index ca93f8b02d0..87389ebfb16 100644 --- a/intern/cycles/test/render_graph_finalize_test.cpp +++ b/intern/cycles/test/render_graph_finalize_test.cpp @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "testing/testing.h" #include "testing/mock_log.h" +#include "testing/testing.h" #include "render/graph.h" -#include "render/scene.h" #include "render/nodes.h" +#include "render/scene.h" #include "util/util_array.h" #include "util/util_logging.h" #include "util/util_string.h" diff --git a/intern/cycles/test/util_avxf_test.h b/intern/cycles/test/util_avxf_test.h index 353c8fa9b28..d93563fdb3f 100644 --- a/intern/cycles/test/util_avxf_test.h +++ b/intern/cycles/test/util_avxf_test.h @@ -15,8 +15,8 @@ */ #include "testing/testing.h" -#include "util/util_types.h" #include "util/util_system.h" +#include "util/util_types.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/util/util_boundbox.h b/intern/cycles/util/util_boundbox.h index b5c3f1a8954..7fab7bd5a15 100644 --- a/intern/cycles/util/util_boundbox.h +++ b/intern/cycles/util/util_boundbox.h @@ -17,8 +17,8 @@ #ifndef __UTIL_BOUNDBOX_H__ #define __UTIL_BOUNDBOX_H__ -#include #include +#include #include "util/util_math.h" #include "util/util_string.h" diff --git a/intern/cycles/util/util_disjoint_set.h b/intern/cycles/util/util_disjoint_set.h index 80f3c714a29..946632371d2 100644 --- a/intern/cycles/util/util_disjoint_set.h +++ b/intern/cycles/util/util_disjoint_set.h @@ -17,8 +17,8 @@ #ifndef __UTIL_DISJOINT_SET_H__ #define __UTIL_DISJOINT_SET_H__ -#include #include "util_array.h" +#include CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/util/util_half.h b/intern/cycles/util/util_half.h index 647e9cf2fd6..8de62893ba8 100644 --- a/intern/cycles/util/util_half.h +++ b/intern/cycles/util/util_half.h @@ -17,8 +17,8 @@ #ifndef __UTIL_HALF_H__ #define __UTIL_HALF_H__ -#include "util/util_types.h" #include "util/util_math.h" +#include "util/util_types.h" #ifdef __KERNEL_SSE2__ # include "util/util_simd.h" diff --git a/intern/cycles/util/util_md5.cpp b/intern/cycles/util/util_md5.cpp index c11f495f785..0df521c2b58 100644 --- a/intern/cycles/util/util_md5.cpp +++ b/intern/cycles/util/util_md5.cpp @@ -26,8 +26,8 @@ #include "util_md5.h" #include "util_path.h" -#include #include +#include CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/util/util_path.cpp b/intern/cycles/util/util_path.cpp index 77293c45f6b..8905c8bc7f0 100644 --- a/intern/cycles/util/util_path.cpp +++ b/intern/cycles/util/util_path.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "util/util_md5.h" #include "util/util_path.h" +#include "util/util_md5.h" #include "util/util_string.h" #include @@ -36,8 +36,8 @@ OIIO_NAMESPACE_USING # define DIR_SEP '/' # include # include -# include # include +# include #endif #ifdef HAVE_SHLWAPI_H diff --git a/intern/cycles/util/util_profiling.cpp b/intern/cycles/util/util_profiling.cpp index dc5bc35c48d..073b09f719f 100644 --- a/intern/cycles/util/util_profiling.cpp +++ b/intern/cycles/util/util_profiling.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ +#include "util/util_profiling.h" #include "util/util_algorithm.h" #include "util/util_foreach.h" -#include "util/util_profiling.h" #include "util/util_set.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/util/util_progress.h b/intern/cycles/util/util_progress.h index 23e49b4db7a..26534a29dfe 100644 --- a/intern/cycles/util/util_progress.h +++ b/intern/cycles/util/util_progress.h @@ -25,8 +25,8 @@ #include "util/util_function.h" #include "util/util_string.h" -#include "util/util_time.h" #include "util/util_thread.h" +#include "util/util_time.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/util/util_sky_model.cpp b/intern/cycles/util/util_sky_model.cpp index 4a6a9f32607..8cdad8a90a4 100644 --- a/intern/cycles/util/util_sky_model.cpp +++ b/intern/cycles/util/util_sky_model.cpp @@ -101,9 +101,9 @@ All instructions on how to use this code are in the accompanying header file. #include "util/util_sky_model_data.h" #include +#include #include #include -#include CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/util/util_string.h b/intern/cycles/util/util_string.h index f71145741c9..ce2d4acdde4 100644 --- a/intern/cycles/util/util_string.h +++ b/intern/cycles/util/util_string.h @@ -17,9 +17,9 @@ #ifndef __UTIL_STRING_H__ #define __UTIL_STRING_H__ +#include #include #include -#include #include "util/util_vector.h" diff --git a/intern/cycles/util/util_system.cpp b/intern/cycles/util/util_system.cpp index f700f9bd277..6d32153209a 100644 --- a/intern/cycles/util/util_system.cpp +++ b/intern/cycles/util/util_system.cpp @@ -17,8 +17,8 @@ #include "util/util_system.h" #include "util/util_logging.h" -#include "util/util_types.h" #include "util/util_string.h" +#include "util/util_types.h" #include @@ -35,8 +35,8 @@ OIIO_NAMESPACE_USING # include # include #else -# include # include +# include #endif CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/util/util_task.cpp b/intern/cycles/util/util_task.cpp index 24286116dfb..61aa28c6815 100644 --- a/intern/cycles/util/util_task.cpp +++ b/intern/cycles/util/util_task.cpp @@ -14,10 +14,10 @@ * limitations under the License. */ +#include "util/util_task.h" #include "util/util_foreach.h" #include "util/util_logging.h" #include "util/util_system.h" -#include "util/util_task.h" #include "util/util_time.h" //#define THREADING_DEBUG_ENABLED diff --git a/intern/cycles/util/util_thread.h b/intern/cycles/util/util_thread.h index 18ec5b32144..f6dbc9186b8 100644 --- a/intern/cycles/util/util_thread.h +++ b/intern/cycles/util/util_thread.h @@ -17,11 +17,11 @@ #ifndef __UTIL_THREAD_H__ #define __UTIL_THREAD_H__ -#include -#include #include #include +#include #include +#include #ifdef _WIN32 # include "util_windows.h" diff --git a/intern/cycles/util/util_transform.cpp b/intern/cycles/util/util_transform.cpp index 302a8a386ac..101122740d7 100644 --- a/intern/cycles/util/util_transform.cpp +++ b/intern/cycles/util/util_transform.cpp @@ -46,8 +46,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "util/util_projection.h" #include "util/util_transform.h" +#include "util/util_projection.h" #include "util/util_boundbox.h" #include "util/util_math.h" diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h index 8a1890ad319..f6535848480 100644 --- a/intern/cycles/util/util_types.h +++ b/intern/cycles/util/util_types.h @@ -153,8 +153,8 @@ CCL_NAMESPACE_END /* SSE types. */ #ifndef __KERNEL_GPU__ # include "util/util_sseb.h" -# include "util/util_ssei.h" # include "util/util_ssef.h" +# include "util/util_ssei.h" # if defined(__KERNEL_AVX__) || defined(__KERNEL_AVX2__) # include "util/util_avxb.h" # include "util/util_avxf.h" diff --git a/intern/dualcon/intern/Projections.cpp b/intern/dualcon/intern/Projections.cpp index b065ba95330..3bf7f8f1de2 100644 --- a/intern/dualcon/intern/Projections.cpp +++ b/intern/dualcon/intern/Projections.cpp @@ -18,8 +18,8 @@ # include "MEM_guardedalloc.h" #endif -#include #include "Projections.h" +#include const int vertmap[8][3] = { {0, 0, 0}, diff --git a/intern/dualcon/intern/dualcon_c_api.cpp b/intern/dualcon/intern/dualcon_c_api.cpp index 459bb711e13..d6d9dc4e76f 100644 --- a/intern/dualcon/intern/dualcon_c_api.cpp +++ b/intern/dualcon/intern/dualcon_c_api.cpp @@ -14,10 +14,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include -#include "dualcon.h" #include "ModelReader.h" +#include "dualcon.h" #include "octree.h" +#include #include #include diff --git a/intern/dualcon/intern/octree.h b/intern/dualcon/intern/octree.h index b2d88f0d2b5..004897950b3 100644 --- a/intern/dualcon/intern/octree.h +++ b/intern/dualcon/intern/octree.h @@ -17,18 +17,18 @@ #ifndef __OCTREE_H__ #define __OCTREE_H__ +#include "GeoCommon.h" +#include "MemoryAllocator.h" +#include "ModelReader.h" +#include "Projections.h" +#include "Queue.h" +#include "cubes.h" +#include "dualcon.h" +#include "manifold_table.h" #include #include -#include #include -#include "GeoCommon.h" -#include "Projections.h" -#include "ModelReader.h" -#include "MemoryAllocator.h" -#include "cubes.h" -#include "Queue.h" -#include "manifold_table.h" -#include "dualcon.h" +#include /** * Main class and structures for scan-convertion, sign-generation, diff --git a/intern/eigen/intern/svd.cc b/intern/eigen/intern/svd.cc index 945d1bdee14..bfd7064353d 100644 --- a/intern/eigen/intern/svd.cc +++ b/intern/eigen/intern/svd.cc @@ -29,8 +29,8 @@ #endif #include -#include #include +#include #include "svd.h" diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h index 123e18430a9..d6eb5f9db1d 100644 --- a/intern/ffmpeg/ffmpeg_compat.h +++ b/intern/ffmpeg/ffmpeg_compat.h @@ -37,9 +37,9 @@ #endif #include -#include -#include #include +#include +#include #if (LIBAVFORMAT_VERSION_MAJOR > 52) || \ ((LIBAVFORMAT_VERSION_MAJOR >= 52) && (LIBAVFORMAT_VERSION_MINOR >= 101)) diff --git a/intern/ghost/GHOST_IContext.h b/intern/ghost/GHOST_IContext.h index 33422b8e351..d404287fe56 100644 --- a/intern/ghost/GHOST_IContext.h +++ b/intern/ghost/GHOST_IContext.h @@ -25,8 +25,8 @@ #ifndef __GHOST_IContext_H__ #define __GHOST_IContext_H__ -#include "STR_String.h" #include "GHOST_Types.h" +#include "STR_String.h" /** * Interface for GHOST context. diff --git a/intern/ghost/GHOST_IEvent.h b/intern/ghost/GHOST_IEvent.h index fc7e563e1d8..0d9bfb2c4de 100644 --- a/intern/ghost/GHOST_IEvent.h +++ b/intern/ghost/GHOST_IEvent.h @@ -25,8 +25,8 @@ #ifndef __GHOST_IEVENT_H__ #define __GHOST_IEVENT_H__ -#include #include "GHOST_Types.h" +#include class GHOST_IWindow; diff --git a/intern/ghost/GHOST_ISystem.h b/intern/ghost/GHOST_ISystem.h index 5d529141ca7..8adf49fe1f9 100644 --- a/intern/ghost/GHOST_ISystem.h +++ b/intern/ghost/GHOST_ISystem.h @@ -27,10 +27,10 @@ #ifndef __GHOST_ISYSTEM_H__ #define __GHOST_ISYSTEM_H__ -#include "GHOST_Types.h" #include "GHOST_IContext.h" #include "GHOST_ITimerTask.h" #include "GHOST_IWindow.h" +#include "GHOST_Types.h" class GHOST_IEventConsumer; diff --git a/intern/ghost/GHOST_IWindow.h b/intern/ghost/GHOST_IWindow.h index 07133d86ce4..c456f2b1dba 100644 --- a/intern/ghost/GHOST_IWindow.h +++ b/intern/ghost/GHOST_IWindow.h @@ -25,9 +25,9 @@ #ifndef __GHOST_IWINDOW_H__ #define __GHOST_IWINDOW_H__ -#include "STR_String.h" #include "GHOST_Rect.h" #include "GHOST_Types.h" +#include "STR_String.h" /** * Interface for GHOST windows. diff --git a/intern/ghost/intern/GHOST_C-api.cpp b/intern/ghost/intern/GHOST_C-api.cpp index d43a2637ad3..af2a13945d1 100644 --- a/intern/ghost/intern/GHOST_C-api.cpp +++ b/intern/ghost/intern/GHOST_C-api.cpp @@ -25,11 +25,11 @@ #include -#include "intern/GHOST_Debug.h" #include "GHOST_C-api.h" -#include "GHOST_ISystem.h" #include "GHOST_IEvent.h" #include "GHOST_IEventConsumer.h" +#include "GHOST_ISystem.h" +#include "intern/GHOST_Debug.h" #ifdef WITH_XR_OPENXR # include "GHOST_IXrContext.h" #endif diff --git a/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp b/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp index 843c8adc6cb..db6ead6d96a 100644 --- a/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp +++ b/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp @@ -25,9 +25,9 @@ * Copyright (C) 2001 NaN Technologies B.V. */ -#include "GHOST_Debug.h" -#include "GHOST_C-api.h" #include "GHOST_CallbackEventConsumer.h" +#include "GHOST_C-api.h" +#include "GHOST_Debug.h" GHOST_CallbackEventConsumer::GHOST_CallbackEventConsumer(GHOST_EventCallbackProcPtr eventCallback, GHOST_TUserDataPtr userData) diff --git a/intern/ghost/intern/GHOST_CallbackEventConsumer.h b/intern/ghost/intern/GHOST_CallbackEventConsumer.h index 7abe0253f75..9c3fc642209 100644 --- a/intern/ghost/intern/GHOST_CallbackEventConsumer.h +++ b/intern/ghost/intern/GHOST_CallbackEventConsumer.h @@ -25,8 +25,8 @@ #ifndef __GHOST_CALLBACKEVENTCONSUMER_H__ #define __GHOST_CALLBACKEVENTCONSUMER_H__ -#include "GHOST_IEventConsumer.h" #include "GHOST_C-api.h" +#include "GHOST_IEventConsumer.h" /** * Event consumer that will forward events to a call-back routine. diff --git a/intern/ghost/intern/GHOST_ContextCGL.mm b/intern/ghost/intern/GHOST_ContextCGL.mm index e2e74a3113b..c5303aa54da 100644 --- a/intern/ghost/intern/GHOST_ContextCGL.mm +++ b/intern/ghost/intern/GHOST_ContextCGL.mm @@ -26,11 +26,11 @@ #include "GHOST_ContextCGL.h" #include -#include #include +#include -#include #include +#include static void ghost_fatal_error_dialog(const char *msg) { diff --git a/intern/ghost/intern/GHOST_ContextD3D.cpp b/intern/ghost/intern/GHOST_ContextD3D.cpp index ed65d499073..ad948578d53 100644 --- a/intern/ghost/intern/GHOST_ContextD3D.cpp +++ b/intern/ghost/intern/GHOST_ContextD3D.cpp @@ -27,8 +27,8 @@ #include #include -#include "GHOST_ContextWGL.h" /* For shared drawing */ #include "GHOST_ContextD3D.h" +#include "GHOST_ContextWGL.h" /* For shared drawing */ HMODULE GHOST_ContextD3D::s_d3d_lib = NULL; PFN_D3D11_CREATE_DEVICE GHOST_ContextD3D::s_D3D11CreateDeviceFn = NULL; diff --git a/intern/ghost/intern/GHOST_ContextWGL.cpp b/intern/ghost/intern/GHOST_ContextWGL.cpp index 6d5d4f75351..ddb34a8afd9 100644 --- a/intern/ghost/intern/GHOST_ContextWGL.cpp +++ b/intern/ghost/intern/GHOST_ContextWGL.cpp @@ -27,8 +27,8 @@ #include -#include #include +#include #include HGLRC GHOST_ContextWGL::s_sharedHGLRC = NULL; diff --git a/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm b/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm index f060d45c911..954c3efb22c 100644 --- a/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm +++ b/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm @@ -20,8 +20,8 @@ #include -#include "GHOST_DisplayManagerCocoa.h" #include "GHOST_Debug.h" +#include "GHOST_DisplayManagerCocoa.h" // We do not support multiple monitors at the moment diff --git a/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp b/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp index 059f04992fb..b836f256b27 100644 --- a/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp +++ b/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp @@ -22,8 +22,8 @@ * \ingroup GHOST */ -#include "GHOST_SystemSDL.h" #include "GHOST_DisplayManagerSDL.h" +#include "GHOST_SystemSDL.h" #include "GHOST_WindowManager.h" diff --git a/intern/ghost/intern/GHOST_DropTargetWin32.cpp b/intern/ghost/intern/GHOST_DropTargetWin32.cpp index 931aca81fb8..9f8ce3b5095 100644 --- a/intern/ghost/intern/GHOST_DropTargetWin32.cpp +++ b/intern/ghost/intern/GHOST_DropTargetWin32.cpp @@ -21,8 +21,8 @@ * \ingroup GHOST */ -#include "GHOST_Debug.h" #include "GHOST_DropTargetWin32.h" +#include "GHOST_Debug.h" #include #include "utf_winfunc.h" diff --git a/intern/ghost/intern/GHOST_DropTargetWin32.h b/intern/ghost/intern/GHOST_DropTargetWin32.h index ee124f3ba0e..ee75c017981 100644 --- a/intern/ghost/intern/GHOST_DropTargetWin32.h +++ b/intern/ghost/intern/GHOST_DropTargetWin32.h @@ -24,10 +24,10 @@ #ifndef __GHOST_DROPTARGETWIN32_H__ #define __GHOST_DROPTARGETWIN32_H__ -#include -#include -#include "GHOST_WindowWin32.h" #include "GHOST_SystemWin32.h" +#include "GHOST_WindowWin32.h" +#include +#include class GHOST_DropTargetWin32 : public IDropTarget { public: diff --git a/intern/ghost/intern/GHOST_DropTargetX11.h b/intern/ghost/intern/GHOST_DropTargetX11.h index d3f98ff11cf..9ca12442085 100644 --- a/intern/ghost/intern/GHOST_DropTargetX11.h +++ b/intern/ghost/intern/GHOST_DropTargetX11.h @@ -24,9 +24,9 @@ #ifndef __GHOST_DROPTARGETX11_H__ #define __GHOST_DROPTARGETX11_H__ -#include -#include "GHOST_WindowX11.h" #include "GHOST_SystemX11.h" +#include "GHOST_WindowX11.h" +#include #include "xdnd.h" diff --git a/intern/ghost/intern/GHOST_EventManager.cpp b/intern/ghost/intern/GHOST_EventManager.cpp index 3c27e2c826a..f16d90899b9 100644 --- a/intern/ghost/intern/GHOST_EventManager.cpp +++ b/intern/ghost/intern/GHOST_EventManager.cpp @@ -26,8 +26,8 @@ */ #include "GHOST_EventManager.h" -#include #include "GHOST_Debug.h" +#include #include // [mce] temp debug GHOST_EventManager::GHOST_EventManager() diff --git a/intern/ghost/intern/GHOST_EventPrinter.cpp b/intern/ghost/intern/GHOST_EventPrinter.cpp index e459da39d14..fb34b1d3b1a 100644 --- a/intern/ghost/intern/GHOST_EventPrinter.cpp +++ b/intern/ghost/intern/GHOST_EventPrinter.cpp @@ -23,10 +23,10 @@ */ #include "GHOST_EventPrinter.h" -#include -#include "GHOST_EventKey.h" -#include "GHOST_EventDragnDrop.h" #include "GHOST_Debug.h" +#include "GHOST_EventDragnDrop.h" +#include "GHOST_EventKey.h" +#include #include diff --git a/intern/ghost/intern/GHOST_ImeWin32.cpp b/intern/ghost/intern/GHOST_ImeWin32.cpp index 104b0f67c77..112a266ae28 100644 --- a/intern/ghost/intern/GHOST_ImeWin32.cpp +++ b/intern/ghost/intern/GHOST_ImeWin32.cpp @@ -25,8 +25,8 @@ #ifdef WITH_INPUT_IME -# include "GHOST_C-api.h" # include "GHOST_ImeWin32.h" +# include "GHOST_C-api.h" # include "GHOST_WindowWin32.h" # include "utfconv.h" diff --git a/intern/ghost/intern/GHOST_NDOFManager.cpp b/intern/ghost/intern/GHOST_NDOFManager.cpp index 3fe61ee0aa9..a9fbadab37a 100644 --- a/intern/ghost/intern/GHOST_NDOFManager.cpp +++ b/intern/ghost/intern/GHOST_NDOFManager.cpp @@ -14,14 +14,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "GHOST_Debug.h" #include "GHOST_NDOFManager.h" -#include "GHOST_EventNDOF.h" +#include "GHOST_Debug.h" #include "GHOST_EventKey.h" +#include "GHOST_EventNDOF.h" #include "GHOST_WindowManager.h" -#include // for memory functions -#include // for error/info reporting #include +#include // for error/info reporting +#include // for memory functions #ifdef DEBUG_NDOF_MOTION // printable version of each GHOST_TProgress value diff --git a/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm b/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm index 4c9c58c36be..5274b2d1ba9 100644 --- a/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm +++ b/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm @@ -19,8 +19,8 @@ #include "GHOST_NDOFManagerCocoa.h" #include "GHOST_SystemCocoa.h" -#include #include +#include #if DEBUG_NDOF_DRIVER # include diff --git a/intern/ghost/intern/GHOST_Path-api.cpp b/intern/ghost/intern/GHOST_Path-api.cpp index 9e4ed1e0eea..df3592fb5e5 100644 --- a/intern/ghost/intern/GHOST_Path-api.cpp +++ b/intern/ghost/intern/GHOST_Path-api.cpp @@ -23,10 +23,10 @@ #include -#include "intern/GHOST_Debug.h" -#include "GHOST_Types.h" -#include "GHOST_Path-api.h" #include "GHOST_ISystemPaths.h" +#include "GHOST_Path-api.h" +#include "GHOST_Types.h" +#include "intern/GHOST_Debug.h" GHOST_TSuccess GHOST_CreateSystemPaths(void) { diff --git a/intern/ghost/intern/GHOST_System.cpp b/intern/ghost/intern/GHOST_System.cpp index 12096d65240..97704435f04 100644 --- a/intern/ghost/intern/GHOST_System.cpp +++ b/intern/ghost/intern/GHOST_System.cpp @@ -23,13 +23,13 @@ #include "GHOST_System.h" -#include #include /* just for printf */ +#include #include "GHOST_DisplayManager.h" #include "GHOST_EventManager.h" -#include "GHOST_TimerTask.h" #include "GHOST_TimerManager.h" +#include "GHOST_TimerTask.h" #include "GHOST_WindowManager.h" #ifdef WITH_INPUT_NDOF diff --git a/intern/ghost/intern/GHOST_System.h b/intern/ghost/intern/GHOST_System.h index dff27b0903d..2eec6ca43b3 100644 --- a/intern/ghost/intern/GHOST_System.h +++ b/intern/ghost/intern/GHOST_System.h @@ -27,10 +27,10 @@ #include "GHOST_ISystem.h" -#include "GHOST_Debug.h" #include "GHOST_Buttons.h" -#include "GHOST_ModifierKeys.h" +#include "GHOST_Debug.h" #include "GHOST_EventManager.h" +#include "GHOST_ModifierKeys.h" #ifdef GHOST_DEBUG # include "GHOST_EventPrinter.h" #endif // GHOST_DEBUG diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index 9d899a4fc2f..9becff40995 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemCocoa.mm @@ -20,17 +20,17 @@ #include "GHOST_SystemCocoa.h" #include "GHOST_DisplayManagerCocoa.h" -#include "GHOST_EventKey.h" #include "GHOST_EventButton.h" #include "GHOST_EventCursor.h" -#include "GHOST_EventWheel.h" -#include "GHOST_EventTrackpad.h" #include "GHOST_EventDragnDrop.h" +#include "GHOST_EventKey.h" #include "GHOST_EventString.h" +#include "GHOST_EventTrackpad.h" +#include "GHOST_EventWheel.h" #include "GHOST_TimerManager.h" #include "GHOST_TimerTask.h" -#include "GHOST_WindowManager.h" #include "GHOST_WindowCocoa.h" +#include "GHOST_WindowManager.h" #if defined(WITH_GL_EGL) # include "GHOST_ContextEGL.h" @@ -49,9 +49,9 @@ /* For the currently not ported to Cocoa keyboard layout functions (64bit & 10.6 compatible) */ #include +#include #include #include -#include #pragma mark KeyMap, mouse converters diff --git a/intern/ghost/intern/GHOST_SystemNULL.h b/intern/ghost/intern/GHOST_SystemNULL.h index 10138bfc6eb..68a726f2be8 100644 --- a/intern/ghost/intern/GHOST_SystemNULL.h +++ b/intern/ghost/intern/GHOST_SystemNULL.h @@ -22,9 +22,9 @@ #ifndef __GHOST_SYSTEMNULL_H__ #define __GHOST_SYSTEMNULL_H__ -#include "GHOST_System.h" #include "../GHOST_Types.h" #include "GHOST_DisplayManagerNULL.h" +#include "GHOST_System.h" #include "GHOST_WindowNULL.h" class GHOST_WindowNULL; diff --git a/intern/ghost/intern/GHOST_SystemPathsUnix.cpp b/intern/ghost/intern/GHOST_SystemPathsUnix.cpp index 9514edb7404..ad3d490eb91 100644 --- a/intern/ghost/intern/GHOST_SystemPathsUnix.cpp +++ b/intern/ghost/intern/GHOST_SystemPathsUnix.cpp @@ -30,8 +30,8 @@ #include #include -#include /* for fprintf only */ #include /* for exit */ +#include /* for fprintf only */ #include /* for get home without use getenv() */ #include diff --git a/intern/ghost/intern/GHOST_SystemPathsUnix.h b/intern/ghost/intern/GHOST_SystemPathsUnix.h index dcd3ab34704..f9f89f6e79b 100644 --- a/intern/ghost/intern/GHOST_SystemPathsUnix.h +++ b/intern/ghost/intern/GHOST_SystemPathsUnix.h @@ -24,8 +24,8 @@ #ifndef __GHOST_SYSTEMPATHSUNIX_H__ #define __GHOST_SYSTEMPATHSUNIX_H__ -#include "GHOST_SystemPaths.h" #include "../GHOST_Types.h" +#include "GHOST_SystemPaths.h" class GHOST_SystemPathsUnix : public GHOST_SystemPaths { public: diff --git a/intern/ghost/intern/GHOST_SystemPathsWin32.cpp b/intern/ghost/intern/GHOST_SystemPathsWin32.cpp index 63a6b7224b5..673cbcad97e 100644 --- a/intern/ghost/intern/GHOST_SystemPathsWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemPathsWin32.cpp @@ -26,8 +26,8 @@ #ifndef _WIN32_IE # define _WIN32_IE 0x0501 #endif -#include #include "utfconv.h" +#include GHOST_SystemPathsWin32::GHOST_SystemPathsWin32() { diff --git a/intern/ghost/intern/GHOST_SystemSDL.cpp b/intern/ghost/intern/GHOST_SystemSDL.cpp index 656afb9d050..5dae0ce504b 100644 --- a/intern/ghost/intern/GHOST_SystemSDL.cpp +++ b/intern/ghost/intern/GHOST_SystemSDL.cpp @@ -26,9 +26,9 @@ #include "GHOST_WindowManager.h" +#include "GHOST_EventButton.h" #include "GHOST_EventCursor.h" #include "GHOST_EventKey.h" -#include "GHOST_EventButton.h" #include "GHOST_EventWheel.h" GHOST_SystemSDL::GHOST_SystemSDL() : GHOST_System() diff --git a/intern/ghost/intern/GHOST_SystemSDL.h b/intern/ghost/intern/GHOST_SystemSDL.h index c69a7c740bc..1994781530b 100644 --- a/intern/ghost/intern/GHOST_SystemSDL.h +++ b/intern/ghost/intern/GHOST_SystemSDL.h @@ -22,12 +22,12 @@ #ifndef __GHOST_SYSTEMSDL_H__ #define __GHOST_SYSTEMSDL_H__ -#include "GHOST_System.h" #include "../GHOST_Types.h" #include "GHOST_DisplayManagerSDL.h" +#include "GHOST_Event.h" +#include "GHOST_System.h" #include "GHOST_TimerManager.h" #include "GHOST_WindowSDL.h" -#include "GHOST_Event.h" extern "C" { #include "SDL.h" diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp index d03b9343eab..26d3aea403c 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemWin32.cpp @@ -21,8 +21,8 @@ * \ingroup GHOST */ -#include "GHOST_ContextD3D.h" #include "GHOST_SystemWin32.h" +#include "GHOST_ContextD3D.h" #include "GHOST_EventDragnDrop.h" #ifndef _WIN32_IE @@ -30,22 +30,22 @@ #endif #include -#include -#include #include #include +#include +#include #include -#include "utfconv.h" #include "utf_winfunc.h" +#include "utfconv.h" #include "GHOST_DisplayManagerWin32.h" #include "GHOST_EventButton.h" #include "GHOST_EventCursor.h" #include "GHOST_EventKey.h" #include "GHOST_EventWheel.h" -#include "GHOST_TimerTask.h" #include "GHOST_TimerManager.h" +#include "GHOST_TimerTask.h" #include "GHOST_WindowManager.h" #include "GHOST_WindowWin32.h" diff --git a/intern/ghost/intern/GHOST_SystemWin32.h b/intern/ghost/intern/GHOST_SystemWin32.h index bf9d18ca380..e624cc83427 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.h +++ b/intern/ghost/intern/GHOST_SystemWin32.h @@ -30,8 +30,8 @@ #endif // WIN32 #define WIN32_LEAN_AND_MEAN -#include #include // for drag-n-drop +#include #include "GHOST_System.h" diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index b0c35ce6546..a9d656a1c36 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -23,21 +23,21 @@ * \ingroup GHOST */ -#include -#include #include /* allow detectable autorepeate */ +#include #include +#include -#include "GHOST_SystemX11.h" -#include "GHOST_WindowX11.h" -#include "GHOST_WindowManager.h" -#include "GHOST_TimerManager.h" -#include "GHOST_EventCursor.h" -#include "GHOST_EventKey.h" -#include "GHOST_EventButton.h" -#include "GHOST_EventWheel.h" #include "GHOST_DisplayManagerX11.h" +#include "GHOST_EventButton.h" +#include "GHOST_EventCursor.h" #include "GHOST_EventDragnDrop.h" +#include "GHOST_EventKey.h" +#include "GHOST_EventWheel.h" +#include "GHOST_SystemX11.h" +#include "GHOST_TimerManager.h" +#include "GHOST_WindowManager.h" +#include "GHOST_WindowX11.h" #ifdef WITH_INPUT_NDOF # include "GHOST_NDOFManagerUnix.h" #endif @@ -74,10 +74,10 @@ #include #include -#include -#include -#include /* for fprintf only */ #include /* for exit */ +#include +#include /* for fprintf only */ +#include /* for debugging - so we can breakpoint X11 errors */ // #define USE_X11_ERROR_HANDLERS diff --git a/intern/ghost/intern/GHOST_SystemX11.h b/intern/ghost/intern/GHOST_SystemX11.h index 8736e20c57f..d0e0506e77b 100644 --- a/intern/ghost/intern/GHOST_SystemX11.h +++ b/intern/ghost/intern/GHOST_SystemX11.h @@ -25,11 +25,11 @@ #ifndef __GHOST_SYSTEMX11_H__ #define __GHOST_SYSTEMX11_H__ -#include #include /* allow detectable autorepeate */ +#include -#include "GHOST_System.h" #include "../GHOST_Types.h" +#include "GHOST_System.h" // For tablets #ifdef WITH_X11_XINPUT diff --git a/intern/ghost/intern/GHOST_TaskbarWin32.h b/intern/ghost/intern/GHOST_TaskbarWin32.h index abf1172cea8..58641123c24 100644 --- a/intern/ghost/intern/GHOST_TaskbarWin32.h +++ b/intern/ghost/intern/GHOST_TaskbarWin32.h @@ -25,8 +25,8 @@ #endif // WIN32 #define WIN32_LEAN_AND_MEAN -#include #include +#include // ITaskbarList, ITaskbarList2 and ITaskbarList3 might be missing, present here in that case. // Note, ITaskbarList3 is supported only since Windows 7, though. Check for that is done in diff --git a/intern/ghost/intern/GHOST_TaskbarX11.cpp b/intern/ghost/intern/GHOST_TaskbarX11.cpp index e33c84fe4d8..2fa8137e1be 100644 --- a/intern/ghost/intern/GHOST_TaskbarX11.cpp +++ b/intern/ghost/intern/GHOST_TaskbarX11.cpp @@ -20,10 +20,10 @@ #include "GHOST_TaskbarX11.h" -#include -#include #include +#include #include +#include typedef void *(*unity_get_entry_t)(const char *); typedef void (*unity_set_progress_t)(void *, double); diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm index 81eb27a129a..c90b49c27a5 100644 --- a/intern/ghost/intern/GHOST_WindowCocoa.mm +++ b/intern/ghost/intern/GHOST_WindowCocoa.mm @@ -18,9 +18,9 @@ */ #include "GHOST_WindowCocoa.h" -#include "GHOST_SystemCocoa.h" #include "GHOST_ContextNone.h" #include "GHOST_Debug.h" +#include "GHOST_SystemCocoa.h" #if defined(WITH_GL_EGL) # include "GHOST_ContextEGL.h" @@ -29,8 +29,8 @@ #endif #include -#include #include +#include #include diff --git a/intern/ghost/intern/GHOST_WindowManager.cpp b/intern/ghost/intern/GHOST_WindowManager.cpp index d1d66c35de5..eec4bc5f7d0 100644 --- a/intern/ghost/intern/GHOST_WindowManager.cpp +++ b/intern/ghost/intern/GHOST_WindowManager.cpp @@ -26,9 +26,9 @@ */ #include "GHOST_WindowManager.h" -#include #include "GHOST_Debug.h" #include "GHOST_Window.h" +#include GHOST_WindowManager::GHOST_WindowManager() : m_fullScreenWindow(0), m_activeWindow(0), m_activeWindowBeforeFullScreen(0) diff --git a/intern/ghost/intern/GHOST_WindowManager.h b/intern/ghost/intern/GHOST_WindowManager.h index a682eccf7e2..661439191c5 100644 --- a/intern/ghost/intern/GHOST_WindowManager.h +++ b/intern/ghost/intern/GHOST_WindowManager.h @@ -27,8 +27,8 @@ #include -#include "GHOST_Rect.h" #include "GHOST_IWindow.h" +#include "GHOST_Rect.h" /** * Manages system windows (platform independent implementation). diff --git a/intern/ghost/intern/GHOST_WindowSDL.h b/intern/ghost/intern/GHOST_WindowSDL.h index 6332ce584d2..eadd1b7df9d 100644 --- a/intern/ghost/intern/GHOST_WindowSDL.h +++ b/intern/ghost/intern/GHOST_WindowSDL.h @@ -22,8 +22,8 @@ #ifndef __GHOST_WINDOWSDL_H__ #define __GHOST_WINDOWSDL_H__ -#include "GHOST_Window.h" #include "GHOST_SystemSDL.h" +#include "GHOST_Window.h" #include diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp index 1d2630bc66d..6570f27ac5a 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.cpp +++ b/intern/ghost/intern/GHOST_WindowWin32.cpp @@ -23,14 +23,14 @@ #define _USE_MATH_DEFINES -#include "GHOST_ContextD3D.h" -#include "GHOST_WindowManager.h" #include "GHOST_WindowWin32.h" -#include "GHOST_SystemWin32.h" -#include "GHOST_DropTargetWin32.h" +#include "GHOST_ContextD3D.h" #include "GHOST_ContextNone.h" -#include "utfconv.h" +#include "GHOST_DropTargetWin32.h" +#include "GHOST_SystemWin32.h" +#include "GHOST_WindowManager.h" #include "utf_winfunc.h" +#include "utfconv.h" #if defined(WITH_GL_EGL) # include "GHOST_ContextEGL.h" @@ -41,10 +41,10 @@ # include #endif -#include +#include #include #include -#include +#include #ifndef GET_POINTERID_WPARAM # define GET_POINTERID_WPARAM(wParam) (LOWORD(wParam)) diff --git a/intern/ghost/intern/GHOST_WindowWin32.h b/intern/ghost/intern/GHOST_WindowWin32.h index 4795539e0f9..ac1ec0ee852 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.h +++ b/intern/ghost/intern/GHOST_WindowWin32.h @@ -29,8 +29,8 @@ # error WIN32 only! #endif // WIN32 -#include "GHOST_Window.h" #include "GHOST_TaskbarWin32.h" +#include "GHOST_Window.h" #ifdef WITH_INPUT_IME # include "GHOST_ImeWin32.h" #endif diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp index 349b11728bd..3bece605d45 100644 --- a/intern/ghost/intern/GHOST_WindowX11.cpp +++ b/intern/ghost/intern/GHOST_WindowX11.cpp @@ -22,18 +22,18 @@ */ /* For standard X11 cursors */ -#include #include -#include #include +#include +#include #ifdef WITH_X11_ALPHA # include #endif -#include "GHOST_WindowX11.h" -#include "GHOST_SystemX11.h" -#include "GHOST_IconX11.h" -#include "STR_String.h" #include "GHOST_Debug.h" +#include "GHOST_IconX11.h" +#include "GHOST_SystemX11.h" +#include "GHOST_WindowX11.h" +#include "STR_String.h" #ifdef WITH_XDND # include "GHOST_DropTargetX11.h" @@ -54,15 +54,15 @@ // For DPI value #include -#include #include +#include /* gethostname */ #include #include -#include #include +#include /* For obscure full screen mode stuff * lifted verbatim from blut. */ diff --git a/intern/ghost/intern/GHOST_Xr.cpp b/intern/ghost/intern/GHOST_Xr.cpp index 2f122ca8e13..dc63aac217c 100644 --- a/intern/ghost/intern/GHOST_Xr.cpp +++ b/intern/ghost/intern/GHOST_Xr.cpp @@ -25,9 +25,9 @@ #include "GHOST_C-api.h" -#include "GHOST_Xr_intern.h" #include "GHOST_XrContext.h" #include "GHOST_XrException.h" +#include "GHOST_Xr_intern.h" GHOST_XrContextHandle GHOST_XrContextCreate(const GHOST_XrContextCreateInfo *create_info) { diff --git a/intern/ghost/intern/GHOST_XrContext.cpp b/intern/ghost/intern/GHOST_XrContext.cpp index d7b83114c85..a757aa9a555 100644 --- a/intern/ghost/intern/GHOST_XrContext.cpp +++ b/intern/ghost/intern/GHOST_XrContext.cpp @@ -25,9 +25,9 @@ #include #include "GHOST_Types.h" -#include "GHOST_Xr_intern.h" #include "GHOST_XrException.h" #include "GHOST_XrSession.h" +#include "GHOST_Xr_intern.h" #include "GHOST_XrContext.h" diff --git a/intern/ghost/intern/GHOST_XrEvent.cpp b/intern/ghost/intern/GHOST_XrEvent.cpp index dfee2e95f10..30005055f9b 100644 --- a/intern/ghost/intern/GHOST_XrEvent.cpp +++ b/intern/ghost/intern/GHOST_XrEvent.cpp @@ -21,8 +21,8 @@ #include #include "GHOST_C-api.h" -#include "GHOST_Xr_intern.h" #include "GHOST_XrContext.h" +#include "GHOST_Xr_intern.h" static bool GHOST_XrEventPollNext(XrInstance instance, XrEventDataBuffer &r_event_data) { diff --git a/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp b/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp index f094b0744a2..ea97b3a50cf 100644 --- a/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp +++ b/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp @@ -25,8 +25,8 @@ #if defined(WITH_X11) # include "GHOST_ContextGLX.h" #elif defined(WIN32) -# include "GHOST_ContextWGL.h" # include "GHOST_ContextD3D.h" +# include "GHOST_ContextWGL.h" #endif #include "GHOST_C-api.h" #include "GHOST_Xr_intern.h" diff --git a/intern/ghost/intern/GHOST_XrSession.cpp b/intern/ghost/intern/GHOST_XrSession.cpp index a85bde3cab6..53d22cbd679 100644 --- a/intern/ghost/intern/GHOST_XrSession.cpp +++ b/intern/ghost/intern/GHOST_XrSession.cpp @@ -28,10 +28,10 @@ #include "GHOST_C-api.h" #include "GHOST_IXrGraphicsBinding.h" -#include "GHOST_Xr_intern.h" #include "GHOST_XrContext.h" #include "GHOST_XrException.h" #include "GHOST_XrSwapchain.h" +#include "GHOST_Xr_intern.h" #include "GHOST_XrSession.h" diff --git a/intern/ghost/intern/GHOST_XrSwapchain.cpp b/intern/ghost/intern/GHOST_XrSwapchain.cpp index f0b2fb80bf1..4c91bcc2dc3 100644 --- a/intern/ghost/intern/GHOST_XrSwapchain.cpp +++ b/intern/ghost/intern/GHOST_XrSwapchain.cpp @@ -23,9 +23,9 @@ #include "GHOST_C-api.h" #include "GHOST_IXrGraphicsBinding.h" -#include "GHOST_Xr_intern.h" #include "GHOST_XrException.h" #include "GHOST_XrSession.h" +#include "GHOST_Xr_intern.h" #include "GHOST_XrSwapchain.h" diff --git a/intern/ghost/test/gears/GHOST_C-Test.c b/intern/ghost/test/gears/GHOST_C-Test.c index 80675ac5e3d..3419f70dfcf 100644 --- a/intern/ghost/test/gears/GHOST_C-Test.c +++ b/intern/ghost/test/gears/GHOST_C-Test.c @@ -25,10 +25,10 @@ * in turn, is probably taken from somewhere as well. */ -#include -#include -#include #include +#include +#include +#include #define FALSE 0 @@ -36,8 +36,8 @@ #if defined(WIN32) || defined(__APPLE__) # ifdef WIN32 -# include # include +# include # else /* WIN32 */ /* __APPLE__ is defined */ # include diff --git a/intern/ghost/test/gears/GHOST_Test.cpp b/intern/ghost/test/gears/GHOST_Test.cpp index 47eddbcfb83..a554bfeebef 100644 --- a/intern/ghost/test/gears/GHOST_Test.cpp +++ b/intern/ghost/test/gears/GHOST_Test.cpp @@ -30,8 +30,8 @@ #if defined(WIN32) || defined(__APPLE__) # ifdef WIN32 -# include # include +# include # include # else // WIN32 \ @@ -42,12 +42,12 @@ # include #endif // defined(WIN32) || defined(__APPLE__) -#include "STR_String.h" #include "GHOST_Rect.h" +#include "STR_String.h" -#include "GHOST_ISystem.h" #include "GHOST_IEvent.h" #include "GHOST_IEventConsumer.h" +#include "GHOST_ISystem.h" #define LEFT_EYE 0 #define RIGHT_EYE 1 diff --git a/intern/ghost/test/multitest/EventToBuf.c b/intern/ghost/test/multitest/EventToBuf.c index 57fb950fa8b..788c0221753 100644 --- a/intern/ghost/test/multitest/EventToBuf.c +++ b/intern/ghost/test/multitest/EventToBuf.c @@ -23,8 +23,8 @@ #include "MEM_guardedalloc.h" -#include "GHOST_C-api.h" #include "EventToBuf.h" +#include "GHOST_C-api.h" char *eventtype_to_string(GHOST_TEventType type) { diff --git a/intern/ghost/test/multitest/GL.h b/intern/ghost/test/multitest/GL.h index 2a7d95212e1..34ac1a40d9e 100644 --- a/intern/ghost/test/multitest/GL.h +++ b/intern/ghost/test/multitest/GL.h @@ -20,8 +20,8 @@ #if defined(WIN32) || defined(__APPLE__) # ifdef WIN32 -# include # include +# include # else // WIN32 // __APPLE__ is defined # include diff --git a/intern/ghost/test/multitest/MultiTest.c b/intern/ghost/test/multitest/MultiTest.c index 374c7170dc6..75aa0119a7f 100644 --- a/intern/ghost/test/multitest/MultiTest.c +++ b/intern/ghost/test/multitest/MultiTest.c @@ -33,13 +33,13 @@ # pragma warning(disable : 4244 4305) #endif +#include +#include #include #include -#include -#include -#include #include "GL.h" +#include #include "MEM_guardedalloc.h" @@ -47,16 +47,16 @@ #include "BLF_api.h" -#include "Util.h" #include "Basic.h" -#include "ScrollBar.h" #include "EventToBuf.h" +#include "ScrollBar.h" +#include "Util.h" #include "WindowData.h" /* GPU API. */ -#include "GPU_immediate.h" #include "GPU_context.h" +#include "GPU_immediate.h" #include "GPU_init_exit.h" extern int datatoc_bfont_ttf_size; diff --git a/intern/ghost/test/multitest/Util.c b/intern/ghost/test/multitest/Util.c index c6cdebd39ce..962dd88c47b 100644 --- a/intern/ghost/test/multitest/Util.c +++ b/intern/ghost/test/multitest/Util.c @@ -19,9 +19,9 @@ #include -#include #include #include +#include #include "MEM_guardedalloc.h" diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h index 2a4ae5355a0..d5b109ee59f 100644 --- a/intern/guardedalloc/MEM_guardedalloc.h +++ b/intern/guardedalloc/MEM_guardedalloc.h @@ -52,8 +52,8 @@ #include /* needed for FILE* */ /* needed for uintptr_t and attributes, exception, dont use BLI anywhere else in MEM_* */ -#include "../../source/blender/blenlib/BLI_sys_types.h" #include "../../source/blender/blenlib/BLI_compiler_attrs.h" +#include "../../source/blender/blenlib/BLI_sys_types.h" #ifdef __cplusplus extern "C" { diff --git a/intern/guardedalloc/cpp/mallocn.cpp b/intern/guardedalloc/cpp/mallocn.cpp index 0804e096dc6..94d614b942f 100644 --- a/intern/guardedalloc/cpp/mallocn.cpp +++ b/intern/guardedalloc/cpp/mallocn.cpp @@ -18,8 +18,8 @@ * \ingroup MEM */ -#include #include "../MEM_guardedalloc.h" +#include void *operator new(size_t size, const char *str) throw(std::bad_alloc); void *operator new[](size_t size, const char *str) throw(std::bad_alloc); diff --git a/intern/guardedalloc/intern/mallocn_guarded_impl.c b/intern/guardedalloc/intern/mallocn_guarded_impl.c index de2b2eee93a..f601609c6e0 100644 --- a/intern/guardedalloc/intern/mallocn_guarded_impl.c +++ b/intern/guardedalloc/intern/mallocn_guarded_impl.c @@ -23,9 +23,9 @@ * Guarded memory allocation, and boundary-write detection. */ +#include #include #include /* memcpy */ -#include #include #include "MEM_guardedalloc.h" @@ -33,8 +33,8 @@ /* to ensure strict conversions */ #include "../../source/blender/blenlib/BLI_strict_flags.h" -#include "mallocn_intern.h" #include "atomic_ops.h" +#include "mallocn_intern.h" /* Only for debugging: * store original buffer's name when doing MEM_dupallocN diff --git a/intern/guardedalloc/intern/mallocn_lockfree_impl.c b/intern/guardedalloc/intern/mallocn_lockfree_impl.c index 87091bb9862..ab7d9097669 100644 --- a/intern/guardedalloc/intern/mallocn_lockfree_impl.c +++ b/intern/guardedalloc/intern/mallocn_lockfree_impl.c @@ -20,9 +20,9 @@ * Memory allocation which keeps track on allocated memory counters */ +#include #include #include /* memcpy */ -#include #include #include "MEM_guardedalloc.h" diff --git a/intern/guardedalloc/intern/mmap_win.c b/intern/guardedalloc/intern/mmap_win.c index 3508ae4e1aa..245fe05b6af 100644 --- a/intern/guardedalloc/intern/mmap_win.c +++ b/intern/guardedalloc/intern/mmap_win.c @@ -23,11 +23,11 @@ #ifdef WIN32 -# include # include # include -# include # include +# include +# include # include "mmap_win.h" diff --git a/intern/guardedalloc/test/simpletest/memtest.c b/intern/guardedalloc/test/simpletest/memtest.c index 8acced088f6..5c37ceb5b24 100644 --- a/intern/guardedalloc/test/simpletest/memtest.c +++ b/intern/guardedalloc/test/simpletest/memtest.c @@ -29,10 +29,10 @@ /* Number of chunks to test with */ #define NUM_BLOCKS 10 -#include -#include -#include #include "MEM_guardedalloc.h" +#include +#include +#include static void mem_error_cb(const char *errorStr) { diff --git a/intern/iksolver/intern/IK_QJacobianSolver.h b/intern/iksolver/intern/IK_QJacobianSolver.h index 1ba3a1bebe1..cef13625dc4 100644 --- a/intern/iksolver/intern/IK_QJacobianSolver.h +++ b/intern/iksolver/intern/IK_QJacobianSolver.h @@ -28,8 +28,8 @@ * @date 28/6/2001 */ -#include #include +#include #include "IK_Math.h" #include "IK_QJacobian.h" diff --git a/intern/locale/boost_locale_wrapper.cpp b/intern/locale/boost_locale_wrapper.cpp index e03f8500a3d..73433fe7c5e 100644 --- a/intern/locale/boost_locale_wrapper.cpp +++ b/intern/locale/boost_locale_wrapper.cpp @@ -17,8 +17,8 @@ * All rights reserved. */ -#include #include +#include #include "boost_locale_wrapper.h" diff --git a/intern/memutil/MEM_Allocator.h b/intern/memutil/MEM_Allocator.h index dc7ddcefeeb..50a3e978197 100644 --- a/intern/memutil/MEM_Allocator.h +++ b/intern/memutil/MEM_Allocator.h @@ -21,8 +21,8 @@ #ifndef __MEM_ALLOCATOR_H__ #define __MEM_ALLOCATOR_H__ -#include #include "guardedalloc/MEM_guardedalloc.h" +#include template struct MEM_Allocator { typedef size_t size_type; diff --git a/intern/memutil/MEM_CacheLimiter.h b/intern/memutil/MEM_CacheLimiter.h index a13c3f518db..6ca61fbcde1 100644 --- a/intern/memutil/MEM_CacheLimiter.h +++ b/intern/memutil/MEM_CacheLimiter.h @@ -53,10 +53,10 @@ * \endcode */ +#include "MEM_Allocator.h" #include #include #include -#include "MEM_Allocator.h" template class MEM_CacheLimiter; diff --git a/intern/mikktspace/mikktspace.c b/intern/mikktspace/mikktspace.c index 47bed53ed28..9fe2c0a815e 100644 --- a/intern/mikktspace/mikktspace.c +++ b/intern/mikktspace/mikktspace.c @@ -22,12 +22,12 @@ */ #include -#include -#include -#include #include -#include #include +#include +#include +#include +#include #include "mikktspace.h" diff --git a/intern/opencolorio/fallback_impl.cc b/intern/opencolorio/fallback_impl.cc index f5481b5d7cd..a6b93ac4959 100644 --- a/intern/opencolorio/fallback_impl.cc +++ b/intern/opencolorio/fallback_impl.cc @@ -21,9 +21,9 @@ #include #include -#include "MEM_guardedalloc.h" #include "BLI_math_color.h" #include "BLI_math_vector.h" +#include "MEM_guardedalloc.h" #include "ocio_impl.h" diff --git a/intern/opencolorio/ocio_impl.cc b/intern/opencolorio/ocio_impl.cc index fd749bb4050..0e25c89f5d7 100644 --- a/intern/opencolorio/ocio_impl.cc +++ b/intern/opencolorio/ocio_impl.cc @@ -62,9 +62,9 @@ using namespace OCIO_NAMESPACE; # include # include # include -# include -# include # include +# include +# include using std::map; using std::set; using std::string; diff --git a/intern/opensubdiv/internal/opensubdiv.cc b/intern/opensubdiv/internal/opensubdiv.cc index dc19d3d9306..74b81b13351 100644 --- a/intern/opensubdiv/internal/opensubdiv.cc +++ b/intern/opensubdiv/internal/opensubdiv.cc @@ -22,8 +22,8 @@ #include -#include "opensubdiv_device_context_opencl.h" #include "opensubdiv_device_context_cuda.h" +#include "opensubdiv_device_context_opencl.h" #include "opensubdiv_gl_mesh_capi.h" void openSubdiv_init(void) diff --git a/intern/opensubdiv/internal/opensubdiv_converter_internal.cc b/intern/opensubdiv/internal/opensubdiv_converter_internal.cc index e8d2f237936..0335219d6b9 100644 --- a/intern/opensubdiv/internal/opensubdiv_converter_internal.cc +++ b/intern/opensubdiv/internal/opensubdiv_converter_internal.cc @@ -22,8 +22,8 @@ #include "internal/opensubdiv_converter_internal.h" -#include #include +#include namespace opensubdiv_capi { diff --git a/intern/opensubdiv/internal/opensubdiv_device_context_cuda.cc b/intern/opensubdiv/internal/opensubdiv_device_context_cuda.cc index 5ce8af0434e..c0355ab24a8 100644 --- a/intern/opensubdiv/internal/opensubdiv_device_context_cuda.cc +++ b/intern/opensubdiv/internal/opensubdiv_device_context_cuda.cc @@ -39,10 +39,10 @@ # include # endif +# include # include # include # include -# include # include "internal/opensubdiv_util.h" diff --git a/intern/opensubdiv/internal/opensubdiv_evaluator.cc b/intern/opensubdiv/internal/opensubdiv_evaluator.cc index 4f5a1db82ca..c599a3c9f68 100644 --- a/intern/opensubdiv/internal/opensubdiv_evaluator.cc +++ b/intern/opensubdiv/internal/opensubdiv_evaluator.cc @@ -18,8 +18,8 @@ #include "opensubdiv_evaluator_capi.h" -#include #include "MEM_guardedalloc.h" +#include #include "internal/opensubdiv_evaluator_internal.h" diff --git a/intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc b/intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc index 431258aa415..c35909a045b 100644 --- a/intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc +++ b/intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc @@ -39,7 +39,6 @@ #include "internal/opensubdiv_topology_refiner_internal.h" #include "internal/opensubdiv_util.h" -#include "internal/opensubdiv_util.h" #include "opensubdiv_topology_refiner_capi.h" using OpenSubdiv::Far::PatchMap; diff --git a/intern/opensubdiv/internal/opensubdiv_gl_mesh.cc b/intern/opensubdiv/internal/opensubdiv_gl_mesh.cc index 0e4d9ce0a83..6afd763a63e 100644 --- a/intern/opensubdiv/internal/opensubdiv_gl_mesh.cc +++ b/intern/opensubdiv/internal/opensubdiv_gl_mesh.cc @@ -44,9 +44,9 @@ typedef Mesh OsdOmp #endif // OpenCL backend. #ifdef OPENSUBDIV_HAS_OPENCL +# include "opensubdiv_device_context_opencl.h" # include # include -# include "opensubdiv_device_context_opencl.h" using OpenSubdiv::Osd::CLEvaluator; using OpenSubdiv::Osd::CLGLVertexBuffer; using OpenSubdiv::Osd::CLStencilTable; @@ -57,9 +57,9 @@ static CLDeviceContext g_cl_device_context; #endif // CUDA backend. #ifdef OPENSUBDIV_HAS_CUDA +# include "opensubdiv_device_context_cuda.h" # include # include -# include "opensubdiv_device_context_cuda.h" using OpenSubdiv::Osd::CudaEvaluator; using OpenSubdiv::Osd::CudaGLVertexBuffer; using OpenSubdiv::Osd::CudaStencilTable; @@ -89,12 +89,12 @@ typedef Mesh #include +#include #include "internal/opensubdiv_util.h" diff --git a/intern/opensubdiv/internal/opensubdiv_util.h b/intern/opensubdiv/internal/opensubdiv_util.h index 7817ebac96e..e515859b42f 100644 --- a/intern/opensubdiv/internal/opensubdiv_util.h +++ b/intern/opensubdiv/internal/opensubdiv_util.h @@ -21,11 +21,11 @@ #include #include -#include #include #include #include #include +#include namespace opensubdiv_capi { diff --git a/intern/openvdb/intern/openvdb_level_set.cc b/intern/openvdb/intern/openvdb_level_set.cc index a850aae2be5..ed0020a66ce 100644 --- a/intern/openvdb/intern/openvdb_level_set.cc +++ b/intern/openvdb/intern/openvdb_level_set.cc @@ -18,10 +18,10 @@ */ #include "openvdb_level_set.h" -#include "openvdb_util.h" -#include "openvdb_capi.h" #include "MEM_guardedalloc.h" #include "openvdb/tools/Composite.h" +#include "openvdb_capi.h" +#include "openvdb_util.h" OpenVDBLevelSet::OpenVDBLevelSet() { diff --git a/intern/openvdb/intern/openvdb_level_set.h b/intern/openvdb/intern/openvdb_level_set.h index c2e1e582fff..882958513fd 100644 --- a/intern/openvdb/intern/openvdb_level_set.h +++ b/intern/openvdb/intern/openvdb_level_set.h @@ -20,13 +20,13 @@ #ifndef __OPENVDB_LEVEL_SET_H__ #define __OPENVDB_LEVEL_SET_H__ -#include +#include "openvdb_capi.h" #include +#include +#include +#include #include #include -#include -#include -#include "openvdb_capi.h" struct OpenVDBLevelSet { private: diff --git a/intern/openvdb/openvdb_capi.cc b/intern/openvdb/openvdb_capi.cc index 22d0d20ea4e..9209bfa30cc 100644 --- a/intern/openvdb/openvdb_capi.cc +++ b/intern/openvdb/openvdb_capi.cc @@ -19,9 +19,9 @@ #include "openvdb_capi.h" #include "openvdb_dense_convert.h" -#include "openvdb_util.h" #include "openvdb_level_set.h" #include "openvdb_transform.h" +#include "openvdb_util.h" int OpenVDB_getVersionHex() { diff --git a/intern/rigidbody/rb_bullet_api.cpp b/intern/rigidbody/rb_bullet_api.cpp index 1b22080756d..a928aaca049 100644 --- a/intern/rigidbody/rb_bullet_api.cpp +++ b/intern/rigidbody/rb_bullet_api.cpp @@ -50,22 +50,22 @@ * -- Joshua Leung, June 2010 */ -#include #include +#include #include "RBI_api.h" #include "btBulletDynamicsCommon.h" -#include "LinearMath/btVector3.h" -#include "LinearMath/btScalar.h" -#include "LinearMath/btMatrix3x3.h" -#include "LinearMath/btTransform.h" #include "LinearMath/btConvexHullComputer.h" +#include "LinearMath/btMatrix3x3.h" +#include "LinearMath/btScalar.h" +#include "LinearMath/btTransform.h" +#include "LinearMath/btVector3.h" -#include "BulletCollision/Gimpact/btGImpactShape.h" -#include "BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h" #include "BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h" +#include "BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h" +#include "BulletCollision/Gimpact/btGImpactShape.h" struct rbDynamicsWorld { btDiscreteDynamicsWorld *dynamicsWorld; diff --git a/intern/string/STR_String.h b/intern/string/STR_String.h index 4e6d04c1c64..97b23345f91 100644 --- a/intern/string/STR_String.h +++ b/intern/string/STR_String.h @@ -29,11 +29,11 @@ # define assertd(exp) ((void)NULL) #endif -#include #include +#include -#include #include +#include #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" diff --git a/intern/string/intern/STR_String.cpp b/intern/string/intern/STR_String.cpp index 3a4e703ca26..306e786969b 100644 --- a/intern/string/intern/STR_String.cpp +++ b/intern/string/intern/STR_String.cpp @@ -24,12 +24,12 @@ * This file was formerly known as: GEN_StdString.cpp. */ -#include -#include -#include -#include -#include #include "STR_String.h" +#include +#include +#include +#include +#include /*------------------------------------------------------------------------------------------------- Construction / destruction diff --git a/intern/utfconv/utf_winfunc.c b/intern/utfconv/utf_winfunc.c index 4dc290a0146..615379d454a 100644 --- a/intern/utfconv/utf_winfunc.c +++ b/intern/utfconv/utf_winfunc.c @@ -24,8 +24,8 @@ #include "utf_winfunc.h" #include "utfconv.h" #include -#include #include +#include FILE *ufopen(const char *filename, const char *mode) { diff --git a/intern/utfconv/utfconv.h b/intern/utfconv/utfconv.h index c291f1b4e1b..6470802bedf 100644 --- a/intern/utfconv/utfconv.h +++ b/intern/utfconv/utfconv.h @@ -21,9 +21,9 @@ #ifndef __UTFCONV_H__ #define __UTFCONV_H__ -#include #include #include +#include #ifdef __cplusplus extern "C" { diff --git a/source/blender/blendthumb/src/BlenderThumb.cpp b/source/blender/blendthumb/src/BlenderThumb.cpp index be0adffbdfd..939e7bbf67c 100644 --- a/source/blender/blendthumb/src/BlenderThumb.cpp +++ b/source/blender/blendthumb/src/BlenderThumb.cpp @@ -14,9 +14,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include #include #include // For IThumbnailProvider. -#include #pragma comment(lib, "shlwapi.lib") @@ -94,9 +94,9 @@ IFACEMETHODIMP CBlendThumb::Initialize(IStream *pStream, DWORD) return hr; } +#include "Wincodec.h" #include #include -#include "Wincodec.h" const unsigned char gzip_magic[3] = {0x1f, 0x8b, 0x08}; // IThumbnailProvider diff --git a/source/blender/blendthumb/src/Dll.cpp b/source/blender/blendthumb/src/Dll.cpp index fec792ebfeb..8a8ae8c9996 100644 --- a/source/blender/blendthumb/src/Dll.cpp +++ b/source/blender/blendthumb/src/Dll.cpp @@ -14,11 +14,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include #include +#include // For SHChangeNotify #include #include // For IThumbnailProvider. -#include // For SHChangeNotify -#include extern HRESULT CBlendThumb_CreateInstance(REFIID riid, void **ppv); diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c index 5664b9ae0a0..520456653d1 100644 --- a/source/blender/blenfont/intern/blf.c +++ b/source/blender/blenfont/intern/blf.c @@ -25,10 +25,10 @@ * Wraps OpenGL and FreeType. */ +#include #include #include #include -#include #include @@ -47,12 +47,12 @@ #include "IMB_colormanagement.h" -#include "GPU_shader.h" -#include "GPU_matrix.h" #include "GPU_immediate.h" +#include "GPU_matrix.h" +#include "GPU_shader.h" -#include "blf_internal_types.h" #include "blf_internal.h" +#include "blf_internal_types.h" /* Max number of font in memory. * Take care that now every font have a glyph cache per size/dpi, diff --git a/source/blender/blenfont/intern/blf_dir.c b/source/blender/blenfont/intern/blf_dir.c index 204be5a86b2..9603470615d 100644 --- a/source/blender/blenfont/intern/blf_dir.c +++ b/source/blender/blenfont/intern/blf_dir.c @@ -36,16 +36,16 @@ #include "DNA_vec_types.h" -#include "BLI_utildefines.h" #include "BLI_fileops.h" #include "BLI_listbase.h" #include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include "BLF_api.h" -#include "blf_internal_types.h" #include "blf_internal.h" +#include "blf_internal_types.h" static ListBase global_font_dir = {NULL, NULL}; diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c index 0f75d9b5ab0..4d56f6f868f 100644 --- a/source/blender/blenfont/intern/blf_font.c +++ b/source/blender/blenfont/intern/blf_font.c @@ -25,10 +25,10 @@ * Also low level functions for managing \a FontBLF. */ +#include #include #include #include -#include #include @@ -50,11 +50,11 @@ #include "UI_interface.h" -#include "GPU_matrix.h" #include "GPU_batch.h" +#include "GPU_matrix.h" -#include "blf_internal_types.h" #include "blf_internal.h" +#include "blf_internal_types.h" #include "BLI_strict_flags.h" diff --git a/source/blender/blenfont/intern/blf_font_win32_compat.c b/source/blender/blenfont/intern/blf_font_win32_compat.c index e73df4dbfc7..7d130204c07 100644 --- a/source/blender/blenfont/intern/blf_font_win32_compat.c +++ b/source/blender/blenfont/intern/blf_font_win32_compat.c @@ -31,8 +31,8 @@ # include "MEM_guardedalloc.h" -# include "BLI_utildefines.h" # include "BLI_fileops.h" +# include "BLI_utildefines.h" # include "blf_internal.h" diff --git a/source/blender/blenfont/intern/blf_glyph.c b/source/blender/blenfont/intern/blf_glyph.c index 3270eec58f9..a38cb323777 100644 --- a/source/blender/blenfont/intern/blf_glyph.c +++ b/source/blender/blenfont/intern/blf_glyph.c @@ -23,10 +23,10 @@ * Glyph rendering, texturing and caching. Wraps Freetype and OpenGL functions. */ +#include #include #include #include -#include #include @@ -37,8 +37,8 @@ #include "MEM_guardedalloc.h" -#include "DNA_vec_types.h" #include "DNA_userdef_types.h" +#include "DNA_vec_types.h" #include "BLI_listbase.h" #include "BLI_rect.h" @@ -46,14 +46,14 @@ #include "BLF_api.h" -#include "GPU_immediate.h" #include "GPU_extensions.h" +#include "GPU_immediate.h" -#include "blf_internal_types.h" #include "blf_internal.h" +#include "blf_internal_types.h" -#include "BLI_strict_flags.h" #include "BLI_math_vector.h" +#include "BLI_strict_flags.h" KerningCacheBLF *blf_kerning_cache_find(FontBLF *font) { diff --git a/source/blender/blenfont/intern/blf_internal_types.h b/source/blender/blenfont/intern/blf_internal_types.h index 6ea1702200f..6fae3eb4376 100644 --- a/source/blender/blenfont/intern/blf_internal_types.h +++ b/source/blender/blenfont/intern/blf_internal_types.h @@ -24,8 +24,8 @@ #ifndef __BLF_INTERNAL_TYPES_H__ #define __BLF_INTERNAL_TYPES_H__ -#include "GPU_vertex_buffer.h" #include "GPU_texture.h" +#include "GPU_vertex_buffer.h" #define BLF_BATCH_DRAW_LEN_MAX 2048 /* in glyph */ diff --git a/source/blender/blenfont/intern/blf_thumbs.c b/source/blender/blenfont/intern/blf_thumbs.c index 4e44a85443d..b7308d47d71 100644 --- a/source/blender/blenfont/intern/blf_thumbs.c +++ b/source/blender/blenfont/intern/blf_thumbs.c @@ -30,10 +30,10 @@ #include FT_FREETYPE_H -#include "BLI_utildefines.h" #include "BLI_listbase.h" #include "BLI_rect.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include "blf_internal.h" #include "blf_internal_types.h" diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h index 3deba174738..9162ed56655 100644 --- a/source/blender/blenkernel/BKE_DerivedMesh.h +++ b/source/blender/blenkernel/BKE_DerivedMesh.h @@ -63,14 +63,14 @@ * as it is and stick with using BMesh and CDDM. */ -#include "DNA_defs.h" #include "DNA_customdata_types.h" +#include "DNA_defs.h" #include "DNA_meshdata_types.h" #include "BLI_compiler_attrs.h" -#include "BKE_customdata.h" #include "BKE_bvhutils.h" +#include "BKE_customdata.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/blenkernel/BKE_cloth.h b/source/blender/blenkernel/BKE_cloth.h index 96837f380d4..f5073ff7aa5 100644 --- a/source/blender/blenkernel/BKE_cloth.h +++ b/source/blender/blenkernel/BKE_cloth.h @@ -23,8 +23,8 @@ * \ingroup bke */ -#include #include "BLI_math_inline.h" +#include #ifdef __cplusplus extern "C" { diff --git a/source/blender/blenkernel/BKE_collision.h b/source/blender/blenkernel/BKE_collision.h index 1b6638f8f86..c3ecd0b7ed0 100644 --- a/source/blender/blenkernel/BKE_collision.h +++ b/source/blender/blenkernel/BKE_collision.h @@ -23,8 +23,8 @@ * \ingroup bke */ -#include #include +#include #include #include diff --git a/source/blender/blenkernel/BKE_displist.h b/source/blender/blenkernel/BKE_displist.h index 8be8fee9d6e..b7e4acdc636 100644 --- a/source/blender/blenkernel/BKE_displist.h +++ b/source/blender/blenkernel/BKE_displist.h @@ -24,8 +24,8 @@ * \ingroup bke * \brief display list (or rather multi purpose list) stuff. */ -#include "DNA_customdata_types.h" #include "BKE_customdata.h" +#include "DNA_customdata_types.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h index 2ff6f1f3652..a25b73625fa 100644 --- a/source/blender/blenkernel/BKE_modifier.h +++ b/source/blender/blenkernel/BKE_modifier.h @@ -20,9 +20,9 @@ * \ingroup bke */ -#include "DNA_modifier_types.h" /* needed for all enum typdefs */ -#include "BLI_compiler_attrs.h" #include "BKE_customdata.h" +#include "BLI_compiler_attrs.h" +#include "DNA_modifier_types.h" /* needed for all enum typdefs */ #ifdef __cplusplus extern "C" { diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index e9f83a55a70..eff546a7c55 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -27,11 +27,11 @@ * \ingroup bke */ -#include "BLI_utildefines.h" #include "BLI_buffer.h" +#include "BLI_utildefines.h" -#include "DNA_particle_types.h" #include "DNA_object_types.h" +#include "DNA_particle_types.h" #include "BKE_customdata.h" diff --git a/source/blender/blenkernel/BKE_pointcache.h b/source/blender/blenkernel/BKE_pointcache.h index 5cb15f00859..c2fad6db314 100644 --- a/source/blender/blenkernel/BKE_pointcache.h +++ b/source/blender/blenkernel/BKE_pointcache.h @@ -25,9 +25,9 @@ */ #include "DNA_ID.h" +#include "DNA_boid_types.h" #include "DNA_dynamicpaint_types.h" #include "DNA_object_force_types.h" -#include "DNA_boid_types.h" #include /* for FILE */ #ifdef __cplusplus diff --git a/source/blender/blenkernel/BKE_report.h b/source/blender/blenkernel/BKE_report.h index cddbd36f870..d7ce9625548 100644 --- a/source/blender/blenkernel/BKE_report.h +++ b/source/blender/blenkernel/BKE_report.h @@ -27,9 +27,9 @@ extern "C" { #include -#include "DNA_windowmanager_types.h" #include "BLI_compiler_attrs.h" #include "BLI_utildefines.h" +#include "DNA_windowmanager_types.h" /* Reporting Information and Errors * diff --git a/source/blender/blenkernel/BKE_shader_fx.h b/source/blender/blenkernel/BKE_shader_fx.h index 8f0cc8c9ef4..d6d0f0f71de 100644 --- a/source/blender/blenkernel/BKE_shader_fx.h +++ b/source/blender/blenkernel/BKE_shader_fx.h @@ -20,9 +20,9 @@ * \ingroup bke */ -#include "DNA_shader_fx_types.h" /* needed for all enum typdefs */ -#include "BLI_compiler_attrs.h" #include "BKE_customdata.h" +#include "BLI_compiler_attrs.h" +#include "DNA_shader_fx_types.h" /* needed for all enum typdefs */ #ifdef __cplusplus extern "C" { diff --git a/source/blender/blenkernel/BKE_subdiv_ccg.h b/source/blender/blenkernel/BKE_subdiv_ccg.h index 4e2a3d6e519..7d612f293ab 100644 --- a/source/blender/blenkernel/BKE_subdiv_ccg.h +++ b/source/blender/blenkernel/BKE_subdiv_ccg.h @@ -24,8 +24,8 @@ #ifndef __BKE_SUBDIV_CCG_H__ #define __BKE_SUBDIV_CCG_H__ -#include "BKE_customdata.h" #include "BKE_DerivedMesh.h" +#include "BKE_customdata.h" #include "BLI_bitmap.h" #include "BLI_sys_types.h" diff --git a/source/blender/blenkernel/intern/CCGSubSurf.c b/source/blender/blenkernel/intern/CCGSubSurf.c index d91296e0c01..d76a4d8f859 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf.c +++ b/source/blender/blenkernel/intern/CCGSubSurf.c @@ -18,19 +18,19 @@ * \ingroup bke */ +#include #include #include -#include -#include "MEM_guardedalloc.h" #include "BLI_sys_types.h" // for intptr_t support +#include "MEM_guardedalloc.h" #include "BLI_utildefines.h" /* for BLI_assert */ #include "BKE_ccg.h" +#include "BKE_subsurf.h" #include "CCGSubSurf.h" #include "CCGSubSurf_intern.h" -#include "BKE_subsurf.h" #ifdef WITH_OPENSUBDIV # include "opensubdiv_capi.h" diff --git a/source/blender/blenkernel/intern/CCGSubSurf_legacy.c b/source/blender/blenkernel/intern/CCGSubSurf_legacy.c index 01735b34e5e..f3f681baa01 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf_legacy.c +++ b/source/blender/blenkernel/intern/CCGSubSurf_legacy.c @@ -18,12 +18,12 @@ * \ingroup bke */ -#include "MEM_guardedalloc.h" #include "BLI_sys_types.h" // for intptr_t support +#include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" /* for BLI_assert */ #include "BLI_math.h" #include "BLI_task.h" +#include "BLI_utildefines.h" /* for BLI_assert */ #include "CCGSubSurf.h" #include "CCGSubSurf_intern.h" diff --git a/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv.c b/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv.c index 699075f6cff..3257dd2334c 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv.c +++ b/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv.c @@ -20,13 +20,13 @@ #ifdef WITH_OPENSUBDIV -# include "MEM_guardedalloc.h" # include "BLI_sys_types.h" // for intptr_t support +# include "MEM_guardedalloc.h" -# include "BLI_utildefines.h" /* for BLI_assert */ # include "BLI_listbase.h" # include "BLI_math.h" # include "BLI_threads.h" +# include "BLI_utildefines.h" /* for BLI_assert */ # include "CCGSubSurf.h" # include "CCGSubSurf_intern.h" @@ -42,8 +42,8 @@ # include "opensubdiv_gl_mesh_capi.h" # include "opensubdiv_topology_refiner_capi.h" -# include "GPU_glew.h" # include "GPU_extensions.h" +# include "GPU_glew.h" # define OSD_LOG \ if (false) \ diff --git a/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv_converter.c b/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv_converter.c index e77b65eca25..16766d52e57 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv_converter.c +++ b/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv_converter.c @@ -22,11 +22,11 @@ # include -# include "MEM_guardedalloc.h" # include "BLI_sys_types.h" // for intptr_t support +# include "MEM_guardedalloc.h" -# include "BLI_utildefines.h" /* for BLI_assert */ # include "BLI_math.h" +# include "BLI_utildefines.h" /* for BLI_assert */ # include "CCGSubSurf.h" # include "CCGSubSurf_intern.h" diff --git a/source/blender/blenkernel/intern/CCGSubSurf_util.c b/source/blender/blenkernel/intern/CCGSubSurf_util.c index ebd4531a67b..58d5f2e0495 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf_util.c +++ b/source/blender/blenkernel/intern/CCGSubSurf_util.c @@ -18,12 +18,12 @@ * \ingroup bke */ +#include #include #include -#include -#include "MEM_guardedalloc.h" #include "BLI_sys_types.h" // for intptr_t support +#include "MEM_guardedalloc.h" #include "BLI_utildefines.h" /* for BLI_assert */ diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index f51c792f474..baef2b2290e 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -21,8 +21,8 @@ * \ingroup bke */ -#include #include +#include #include "MEM_guardedalloc.h" @@ -36,38 +36,38 @@ #include "DNA_scene_types.h" #include "BLI_array.h" -#include "BLI_blenlib.h" #include "BLI_bitmap.h" -#include "BLI_math.h" -#include "BLI_utildefines.h" +#include "BLI_blenlib.h" #include "BLI_linklist.h" +#include "BLI_math.h" #include "BLI_task.h" +#include "BLI_utildefines.h" #include "BKE_DerivedMesh.h" +#include "BKE_bvhutils.h" #include "BKE_colorband.h" +#include "BKE_deform.h" #include "BKE_editmesh.h" #include "BKE_key.h" #include "BKE_layer.h" #include "BKE_lib_id.h" #include "BKE_material.h" -#include "BKE_modifier.h" #include "BKE_mesh.h" #include "BKE_mesh_iterators.h" #include "BKE_mesh_mapping.h" #include "BKE_mesh_runtime.h" #include "BKE_mesh_tangent.h" +#include "BKE_modifier.h" +#include "BKE_multires.h" #include "BKE_object.h" #include "BKE_object_deform.h" #include "BKE_paint.h" -#include "BKE_multires.h" -#include "BKE_bvhutils.h" -#include "BKE_deform.h" #include "BLI_sys_types.h" /* for intptr_t support */ +#include "BKE_shrinkwrap.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "BKE_shrinkwrap.h" #include "CLG_log.h" diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index d59505f1fa6..c332939e906 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -21,31 +21,31 @@ * \ingroup bke */ -#include #include -#include #include +#include +#include #include "MEM_guardedalloc.h" #include "DNA_anim_types.h" #include "DNA_armature_types.h" #include "DNA_constraint_types.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BLI_blenlib.h" +#include "BLI_ghash.h" #include "BLI_math.h" #include "BLI_string_utils.h" #include "BLI_utildefines.h" -#include "BLI_ghash.h" #include "BLT_translation.h" #include "BKE_action.h" -#include "BKE_armature.h" #include "BKE_anim.h" #include "BKE_animsys.h" +#include "BKE_armature.h" #include "BKE_constraint.h" #include "BKE_deform.h" #include "BKE_fcurve.h" diff --git a/source/blender/blenkernel/intern/addon.c b/source/blender/blenkernel/intern/addon.c index 99ef38722f5..177c29cd935 100644 --- a/source/blender/blenkernel/intern/addon.c +++ b/source/blender/blenkernel/intern/addon.c @@ -23,10 +23,10 @@ #include "RNA_types.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" -#include "BLI_string.h" #include "BLI_listbase.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" #include "BKE_addon.h" /* own include */ #include "BKE_idprop.h" diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index 6b8f8e5303e..8804e7ae26c 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -25,9 +25,9 @@ #include +#include "BLI_dlrbTree.h" #include "BLI_listbase.h" #include "BLI_math.h" -#include "BLI_dlrbTree.h" #include "BLT_translation.h" @@ -36,20 +36,20 @@ #include "DNA_key_types.h" #include "DNA_scene_types.h" +#include "BKE_action.h" #include "BKE_anim.h" #include "BKE_animsys.h" -#include "BKE_action.h" #include "BKE_curve.h" #include "BKE_key.h" #include "BKE_main.h" #include "BKE_object.h" #include "BKE_particle.h" -#include "BKE_scene.h" #include "BKE_report.h" +#include "BKE_scene.h" #include "DEG_depsgraph.h" -#include "DEG_depsgraph_query.h" #include "DEG_depsgraph_build.h" +#include "DEG_depsgraph_query.h" #include "GPU_batch.h" diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index ada104a7b5a..2027dbe6c23 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -21,22 +21,22 @@ * \ingroup bke */ -#include -#include -#include #include #include +#include +#include +#include #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_blenlib.h" #include "BLI_alloca.h" +#include "BLI_blenlib.h" #include "BLI_dynstr.h" #include "BLI_listbase.h" -#include "BLI_string_utils.h" #include "BLI_math_rotation.h" #include "BLI_math_vector.h" +#include "BLI_string_utils.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/blenkernel/intern/appdir.c b/source/blender/blenkernel/intern/appdir.c index fbac9e6b773..0e578250b39 100644 --- a/source/blender/blenkernel/intern/appdir.c +++ b/source/blender/blenkernel/intern/appdir.c @@ -20,20 +20,20 @@ * Access to application level directories. */ +#include #include #include -#include -#include "BLI_utildefines.h" #include "BLI_fileops.h" #include "BLI_fileops_types.h" #include "BLI_listbase.h" #include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_string_utf8.h" +#include "BLI_utildefines.h" -#include "BKE_blender_version.h" #include "BKE_appdir.h" /* own include */ +#include "BKE_blender_version.h" #include "GHOST_Path-api.h" @@ -49,9 +49,9 @@ # undef _WIN32_IE # endif # define _WIN32_IE 0x0501 -# include -# include # include "BLI_winstuff.h" +# include +# include #else /* non windows */ # ifdef WITH_BINRELOC # include "binreloc.h" diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index c23cb9231d7..9c88ffb5d52 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -22,46 +22,46 @@ */ #include -#include -#include -#include -#include #include +#include +#include +#include +#include #include "MEM_guardedalloc.h" -#include "BLI_math.h" -#include "BLI_listbase.h" -#include "BLI_string.h" +#include "BLI_alloca.h" #include "BLI_ghash.h" +#include "BLI_listbase.h" +#include "BLI_math.h" +#include "BLI_string.h" #include "BLI_task.h" #include "BLI_utildefines.h" -#include "BLI_alloca.h" #include "BLT_translation.h" #include "DNA_anim_types.h" #include "DNA_armature_types.h" #include "DNA_constraint_types.h" #include "DNA_gpencil_types.h" -#include "DNA_mesh_types.h" #include "DNA_lattice_types.h" #include "DNA_listBase.h" +#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" -#include "BKE_animsys.h" -#include "BKE_armature.h" #include "BKE_action.h" #include "BKE_anim.h" +#include "BKE_animsys.h" +#include "BKE_armature.h" #include "BKE_constraint.h" #include "BKE_curve.h" #include "BKE_deform.h" #include "BKE_displist.h" #include "BKE_idprop.h" #include "BKE_idtype.h" -#include "BKE_lib_id.h" #include "BKE_lattice.h" +#include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_object.h" #include "BKE_scene.h" diff --git a/source/blender/blenkernel/intern/armature_update.c b/source/blender/blenkernel/intern/armature_update.c index e30accf6279..e51b9ea85d1 100644 --- a/source/blender/blenkernel/intern/armature_update.c +++ b/source/blender/blenkernel/intern/armature_update.c @@ -25,9 +25,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_listbase.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "DNA_armature_types.h" #include "DNA_constraint_types.h" diff --git a/source/blender/blenkernel/intern/autoexec.c b/source/blender/blenkernel/intern/autoexec.c index 1616c46d05b..07b096af941 100644 --- a/source/blender/blenkernel/intern/autoexec.c +++ b/source/blender/blenkernel/intern/autoexec.c @@ -26,9 +26,9 @@ #include "DNA_userdef_types.h" -#include "BLI_utildefines.h" #include "BLI_fnmatch.h" #include "BLI_path_util.h" +#include "BLI_utildefines.h" #ifdef WIN32 # include "BLI_string.h" diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index ac432bf0b64..70ab52828f2 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -23,23 +23,23 @@ * Application level startup/shutdown functionality. */ -#include #include +#include #include #include "MEM_guardedalloc.h" -#include "BLI_string.h" #include "BLI_listbase.h" +#include "BLI_string.h" #include "BLI_utildefines.h" #include "IMB_imbuf.h" #include "IMB_moviecache.h" #include "BKE_addon.h" -#include "BKE_blender.h" /* own include */ -#include "BKE_blender_version.h" /* own include */ +#include "BKE_blender.h" /* own include */ #include "BKE_blender_user_menu.h" +#include "BKE_blender_version.h" /* own include */ #include "BKE_blendfile.h" #include "BKE_brush.h" #include "BKE_cachefile.h" diff --git a/source/blender/blenkernel/intern/blender_copybuffer.c b/source/blender/blenkernel/intern/blender_copybuffer.c index 8619db34d93..4d27621a861 100644 --- a/source/blender/blenkernel/intern/blender_copybuffer.c +++ b/source/blender/blenkernel/intern/blender_copybuffer.c @@ -24,9 +24,9 @@ #include "MEM_guardedalloc.h" -#include "DNA_userdef_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" +#include "DNA_userdef_types.h" #include "DNA_view3d_types.h" #include "DNA_windowmanager_types.h" diff --git a/source/blender/blenkernel/intern/blender_undo.c b/source/blender/blenkernel/intern/blender_undo.c index bb705e2295c..99eb4dc9122 100644 --- a/source/blender/blenkernel/intern/blender_undo.c +++ b/source/blender/blenkernel/intern/blender_undo.c @@ -27,12 +27,12 @@ # include // for open close read #endif -#include -#include -#include -#include -#include /* for open */ #include +#include /* for open */ +#include +#include +#include +#include #include "MEM_guardedalloc.h" @@ -49,8 +49,8 @@ #include "BKE_global.h" #include "BKE_main.h" -#include "BLO_undofile.h" #include "BLO_readfile.h" +#include "BLO_undofile.h" #include "BLO_writefile.h" #include "DEG_depsgraph.h" diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c index 3890bf4e7f8..6bf47a8c280 100644 --- a/source/blender/blenkernel/intern/blendfile.c +++ b/source/blender/blenkernel/intern/blendfile.c @@ -31,9 +31,9 @@ #include "DNA_workspace_types.h" #include "BLI_listbase.h" +#include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_system.h" -#include "BLI_path_util.h" #include "BLI_utildefines.h" #include "IMB_colormanagement.h" diff --git a/source/blender/blenkernel/intern/boids.c b/source/blender/blenkernel/intern/boids.c index becef327fab..a493d5f49c8 100644 --- a/source/blender/blenkernel/intern/boids.c +++ b/source/blender/blenkernel/intern/boids.c @@ -21,23 +21,23 @@ * \ingroup bke */ -#include #include +#include #include "MEM_guardedalloc.h" #include "DNA_object_force_types.h" #include "DNA_scene_types.h" -#include "BLI_rand.h" -#include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_kdtree.h" +#include "BLI_math.h" +#include "BLI_rand.h" #include "BLI_utildefines.h" +#include "BKE_boids.h" #include "BKE_collision.h" #include "BKE_effect.h" -#include "BKE_boids.h" #include "BKE_particle.h" #include "BKE_modifier.h" diff --git a/source/blender/blenkernel/intern/bpath.c b/source/blender/blenkernel/intern/bpath.c index 7e3e629d328..5891a0361d8 100644 --- a/source/blender/blenkernel/intern/bpath.c +++ b/source/blender/blenkernel/intern/bpath.c @@ -27,53 +27,53 @@ #include -#include #include +#include /* path/file handling stuff */ #ifndef WIN32 # include # include #else -# include # include "BLI_winstuff.h" +# include #endif #include "MEM_guardedalloc.h" #include "DNA_brush_types.h" #include "DNA_cachefile_types.h" +#include "DNA_fluid_types.h" +#include "DNA_freestyle_types.h" #include "DNA_image_types.h" +#include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_modifier_types.h" #include "DNA_movieclip_types.h" +#include "DNA_node_types.h" #include "DNA_object_fluidsim_types.h" #include "DNA_object_force_types.h" #include "DNA_object_types.h" #include "DNA_particle_types.h" +#include "DNA_scene_types.h" #include "DNA_sequence_types.h" #include "DNA_sound_types.h" #include "DNA_text_types.h" -#include "DNA_material_types.h" -#include "DNA_node_types.h" #include "DNA_texture_types.h" #include "DNA_vfont_types.h" -#include "DNA_scene_types.h" -#include "DNA_fluid_types.h" -#include "DNA_freestyle_types.h" #include "DNA_volume_types.h" #include "BLI_blenlib.h" #include "BLI_utildefines.h" #include "BKE_font.h" +#include "BKE_image.h" #include "BKE_lib_id.h" #include "BKE_library.h" #include "BKE_main.h" #include "BKE_node.h" #include "BKE_report.h" #include "BKE_sequencer.h" -#include "BKE_image.h" #include "BKE_bpath.h" /* own include */ diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index 67e9feac0cf..e6045c45dc8 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -21,10 +21,10 @@ #include "MEM_guardedalloc.h" #include "DNA_brush_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_gpencil_types.h" #include "DNA_defaults.h" +#include "DNA_gpencil_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BLI_listbase.h" #include "BLI_math.h" @@ -35,6 +35,7 @@ #include "BKE_brush.h" #include "BKE_colortools.h" #include "BKE_context.h" +#include "BKE_icons.h" #include "BKE_idtype.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" @@ -43,7 +44,6 @@ #include "BKE_material.h" #include "BKE_paint.h" #include "BKE_texture.h" -#include "BKE_icons.h" #include "IMB_colormanagement.h" #include "IMB_imbuf.h" diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c index 78723455f14..8f6b8bd6980 100644 --- a/source/blender/blenkernel/intern/bvhutils.c +++ b/source/blender/blenkernel/intern/bvhutils.c @@ -21,18 +21,18 @@ * \ingroup bke */ +#include +#include #include #include -#include -#include #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "BLI_utildefines.h" #include "BLI_linklist.h" #include "BLI_math.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include "BKE_bvhutils.h" #include "BKE_editmesh.h" diff --git a/source/blender/blenkernel/intern/cachefile.c b/source/blender/blenkernel/intern/cachefile.c index ef5b09213a6..605fba18d89 100644 --- a/source/blender/blenkernel/intern/cachefile.c +++ b/source/blender/blenkernel/intern/cachefile.c @@ -29,13 +29,13 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_utildefines.h" #include "BLI_fileops.h" #include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/blenkernel/intern/callbacks.c b/source/blender/blenkernel/intern/callbacks.c index 367fed818af..11ee9492b44 100644 --- a/source/blender/blenkernel/intern/callbacks.c +++ b/source/blender/blenkernel/intern/callbacks.c @@ -18,15 +18,15 @@ * \ingroup bke */ -#include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "BKE_callbacks.h" #include "MEM_guardedalloc.h" -#include "RNA_types.h" #include "RNA_access.h" +#include "RNA_types.h" static ListBase callback_slots[BKE_CB_EVT_TOT] = {{NULL}}; diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c index 1a2d8290609..30c2822e08b 100644 --- a/source/blender/blenkernel/intern/camera.c +++ b/source/blender/blenkernel/intern/camera.c @@ -21,19 +21,19 @@ * \ingroup bke */ -#include #include +#include +#include "DNA_ID.h" #include "DNA_camera_types.h" +#include "DNA_defaults.h" #include "DNA_light_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_view3d_types.h" -#include "DNA_ID.h" -#include "DNA_defaults.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_rect.h" #include "BLI_string.h" #include "BLI_utildefines.h" @@ -41,10 +41,10 @@ #include "BKE_animsys.h" #include "BKE_camera.h" #include "BKE_idtype.h" -#include "BKE_object.h" #include "BKE_layer.h" #include "BKE_lib_id.h" #include "BKE_main.h" +#include "BKE_object.h" #include "BKE_scene.h" #include "BKE_screen.h" diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 8d79d106145..8a0df6375be 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -30,25 +30,25 @@ #include "BLI_utildefines.h" #include "BKE_DerivedMesh.h" -#include "BKE_pbvh.h" #include "BKE_cdderivedmesh.h" +#include "BKE_curve.h" +#include "BKE_editmesh.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" #include "BKE_object.h" #include "BKE_paint.h" -#include "BKE_editmesh.h" -#include "BKE_curve.h" +#include "BKE_pbvh.h" +#include "DNA_curve_types.h" /* for Curve */ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "DNA_curve_types.h" /* for Curve */ #include "MEM_guardedalloc.h" -#include #include #include +#include typedef struct { DerivedMesh dm; diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index cd849f89f53..0a35c9879b7 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -24,17 +24,17 @@ #include "MEM_guardedalloc.h" #include "DNA_cloth_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" -#include "BLI_utildefines.h" +#include "BLI_edgehash.h" +#include "BLI_ghash.h" +#include "BLI_linklist.h" #include "BLI_math.h" #include "BLI_rand.h" -#include "BLI_edgehash.h" -#include "BLI_linklist.h" -#include "BLI_ghash.h" +#include "BLI_utildefines.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c index d9954323594..d39df4cc6a3 100644 --- a/source/blender/blenkernel/intern/collection.c +++ b/source/blender/blenkernel/intern/collection.c @@ -30,8 +30,8 @@ #include "BKE_collection.h" #include "BKE_icons.h" -#include "BKE_idtype.h" #include "BKE_idprop.h" +#include "BKE_idtype.h" #include "BKE_layer.h" #include "BKE_lib_id.h" #include "BKE_lib_remap.h" diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index 62ad361570c..9230746cd1d 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -26,18 +26,18 @@ #include "DNA_cloth_types.h" #include "DNA_collection_types.h" #include "DNA_effect_types.h" -#include "DNA_object_types.h" -#include "DNA_object_force_types.h" -#include "DNA_scene_types.h" #include "DNA_meshdata_types.h" +#include "DNA_object_force_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" -#include "BLI_utildefines.h" #include "BLI_blenlib.h" +#include "BLI_ghash.h" #include "BLI_linklist.h" #include "BLI_math.h" #include "BLI_task.h" #include "BLI_threads.h" -#include "BLI_ghash.h" +#include "BLI_utildefines.h" #include "BKE_cloth.h" #include "BKE_collection.h" @@ -46,8 +46,8 @@ #include "BKE_modifier.h" #include "BKE_scene.h" -#include "BLI_kdopbvh.h" #include "BKE_collision.h" +#include "BLI_kdopbvh.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_physics.h" diff --git a/source/blender/blenkernel/intern/colorband.c b/source/blender/blenkernel/intern/colorband.c index dd45d42d230..499b0305c9d 100644 --- a/source/blender/blenkernel/intern/colorband.c +++ b/source/blender/blenkernel/intern/colorband.c @@ -23,17 +23,17 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" -#include "BLI_utildefines.h" -#include "BLI_math_color.h" #include "BLI_heap.h" +#include "BLI_math.h" +#include "BLI_math_color.h" +#include "BLI_utildefines.h" #include "DNA_key_types.h" #include "DNA_texture_types.h" #include "BKE_colorband.h" -#include "BKE_material.h" #include "BKE_key.h" +#include "BKE_material.h" void BKE_colorband_init(ColorBand *coba, bool rangetype) { diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c index e2080f04d3a..315035c1bc2 100644 --- a/source/blender/blenkernel/intern/colortools.c +++ b/source/blender/blenkernel/intern/colortools.c @@ -21,10 +21,10 @@ * \ingroup bke */ -#include +#include #include #include -#include +#include #include "MEM_guardedalloc.h" @@ -33,9 +33,9 @@ #include "BLI_blenlib.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_task.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include "BKE_colortools.h" #include "BKE_curve.h" diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 3a86e3084d8..d131c1b4d18 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -21,35 +21,35 @@ * \ingroup bke */ -#include -#include -#include -#include #include +#include +#include +#include +#include #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_kdopbvh.h" -#include "BLI_utildefines.h" +#include "BLI_math.h" #include "BLI_string_utils.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" +#include "DNA_action_types.h" #include "DNA_armature_types.h" #include "DNA_cachefile_types.h" #include "DNA_constraint_types.h" -#include "DNA_modifier_types.h" -#include "DNA_object_types.h" -#include "DNA_action_types.h" #include "DNA_curve_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "DNA_modifier_types.h" +#include "DNA_object_types.h" #include "DNA_lattice_types.h" +#include "DNA_movieclip_types.h" #include "DNA_scene_types.h" #include "DNA_tracking_types.h" -#include "DNA_movieclip_types.h" #include "BKE_action.h" #include "BKE_anim.h" /* for the curve calculation part */ diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c index b2c551a1752..f6db23111a1 100644 --- a/source/blender/blenkernel/intern/context.c +++ b/source/blender/blenkernel/intern/context.c @@ -18,21 +18,21 @@ * \ingroup bke */ -#include -#include #include +#include +#include #include "MEM_guardedalloc.h" #include "DNA_collection_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_linestyle_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" #include "DNA_view3d_types.h" #include "DNA_windowmanager_types.h" -#include "DNA_object_types.h" -#include "DNA_linestyle_types.h" -#include "DNA_gpencil_types.h" #include "DNA_workspace_types.h" #include "DEG_depsgraph.h" diff --git a/source/blender/blenkernel/intern/crazyspace.c b/source/blender/blenkernel/intern/crazyspace.c index ac62bd52011..7ec1da8eab4 100644 --- a/source/blender/blenkernel/intern/crazyspace.c +++ b/source/blender/blenkernel/intern/crazyspace.c @@ -23,23 +23,23 @@ #include "MEM_guardedalloc.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_modifier_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "DNA_modifier_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" -#include "BLI_utildefines.h" #include "BLI_linklist.h" #include "BLI_math.h" +#include "BLI_utildefines.h" -#include "BKE_crazyspace.h" #include "BKE_DerivedMesh.h" -#include "BKE_modifier.h" -#include "BKE_multires.h" -#include "BKE_mesh.h" +#include "BKE_crazyspace.h" #include "BKE_editmesh.h" #include "BKE_lib_id.h" +#include "BKE_mesh.h" +#include "BKE_modifier.h" +#include "BKE_multires.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 13e6dc0fa40..ba1c75196db 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -22,29 +22,29 @@ */ #include // floor -#include #include +#include #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_linklist.h" +#include "BLI_math.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" #include "DNA_anim_types.h" #include "DNA_curve_types.h" -#include "DNA_material_types.h" #include "DNA_defaults.h" +#include "DNA_material_types.h" /* for dereferencing pointers */ #include "DNA_key_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_vfont_types.h" -#include "DNA_object_types.h" #include "BKE_animsys.h" #include "BKE_curve.h" @@ -54,8 +54,8 @@ #include "BKE_key.h" #include "BKE_lib_id.h" #include "BKE_main.h" -#include "BKE_object.h" #include "BKE_material.h" +#include "BKE_object.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/blenkernel/intern/curve_decimate.c b/source/blender/blenkernel/intern/curve_decimate.c index d569684d55c..68c0d2a3cec 100644 --- a/source/blender/blenkernel/intern/curve_decimate.c +++ b/source/blender/blenkernel/intern/curve_decimate.c @@ -20,9 +20,9 @@ #include "DNA_curve_types.h" -#include "MEM_guardedalloc.h" #include "BLI_heap.h" #include "BLI_math_vector.h" +#include "MEM_guardedalloc.h" #include "BKE_curve.h" diff --git a/source/blender/blenkernel/intern/curveprofile.c b/source/blender/blenkernel/intern/curveprofile.c index cd25d616454..0ab45921c56 100644 --- a/source/blender/blenkernel/intern/curveprofile.c +++ b/source/blender/blenkernel/intern/curveprofile.c @@ -21,24 +21,24 @@ * \ingroup bke */ -#include +#include #include #include -#include +#include #include "MEM_guardedalloc.h" -#include "DNA_curveprofile_types.h" #include "DNA_curve_types.h" +#include "DNA_curveprofile_types.h" #include "BLI_blenlib.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_task.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" -#include "BKE_curveprofile.h" #include "BKE_curve.h" +#include "BKE_curveprofile.h" #include "BKE_fcurve.h" void BKE_curveprofile_free_data(CurveProfile *profile) diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 117c96e2932..87a5ac80bc7 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -29,19 +29,19 @@ /* Since we have versioning code here (CustomData_verify_versions()). */ #define DNA_DEPRECATED_ALLOW +#include "DNA_ID.h" #include "DNA_customdata_types.h" #include "DNA_hair_types.h" #include "DNA_meshdata_types.h" #include "DNA_pointcloud_types.h" -#include "DNA_ID.h" -#include "BLI_utildefines.h" -#include "BLI_path_util.h" -#include "BLI_string.h" -#include "BLI_string_utils.h" #include "BLI_math.h" #include "BLI_math_color_blend.h" #include "BLI_mempool.h" +#include "BLI_path_util.h" +#include "BLI_string.h" +#include "BLI_string_utils.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/blenkernel/intern/customdata_file.c b/source/blender/blenkernel/intern/customdata_file.c index 379da377b42..1463e50f6e3 100644 --- a/source/blender/blenkernel/intern/customdata_file.c +++ b/source/blender/blenkernel/intern/customdata_file.c @@ -24,10 +24,10 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" +#include "BLI_endian_switch.h" #include "BLI_fileops.h" #include "BLI_string.h" -#include "BLI_endian_switch.h" +#include "BLI_utildefines.h" #include "BKE_customdata_file.h" #include "BKE_global.h" diff --git a/source/blender/blenkernel/intern/data_transfer.c b/source/blender/blenkernel/intern/data_transfer.c index 9fd04108746..48e0ee50d43 100644 --- a/source/blender/blenkernel/intern/data_transfer.c +++ b/source/blender/blenkernel/intern/data_transfer.c @@ -27,13 +27,13 @@ #include "MEM_guardedalloc.h" #include "DNA_customdata_types.h" -#include "DNA_meshdata_types.h" #include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "BKE_customdata.h" @@ -41,8 +41,8 @@ #include "BKE_deform.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" -#include "BKE_mesh_runtime.h" #include "BKE_mesh_remap.h" +#include "BKE_mesh_runtime.h" #include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_object_deform.h" diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c index 7d9238fea7c..9a3965a86f6 100644 --- a/source/blender/blenkernel/intern/deform.c +++ b/source/blender/blenkernel/intern/deform.c @@ -21,16 +21,16 @@ * \ingroup bke */ -#include -#include #include -#include +#include #include +#include +#include #include "MEM_guardedalloc.h" -#include "DNA_meshdata_types.h" #include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index 6963f629798..dc2f603aa5c 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -29,8 +29,8 @@ #include "DNA_curve_types.h" #include "DNA_mesh_types.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "DNA_vfont_types.h" #include "BLI_bitmap.h" @@ -42,18 +42,18 @@ #include "BLI_string.h" #include "BLI_utildefines.h" +#include "BKE_anim.h" +#include "BKE_curve.h" #include "BKE_displist.h" -#include "BKE_object.h" +#include "BKE_font.h" +#include "BKE_key.h" +#include "BKE_lattice.h" #include "BKE_lib_id.h" #include "BKE_mball.h" #include "BKE_mball_tessellate.h" #include "BKE_mesh.h" -#include "BKE_curve.h" -#include "BKE_key.h" -#include "BKE_anim.h" -#include "BKE_font.h" -#include "BKE_lattice.h" #include "BKE_modifier.h" +#include "BKE_object.h" #include "BLI_sys_types.h" // for intptr_t support diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 7f71409a3f2..1054988f22f 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -24,8 +24,8 @@ #include #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_kdtree.h" +#include "BLI_math.h" #include "BLI_string_utils.h" #include "BLI_task.h" #include "BLI_threads.h" @@ -74,8 +74,8 @@ #include "DEG_depsgraph_query.h" /* for image output */ -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" /* to read material/texture color */ #include "RE_render_ext.h" diff --git a/source/blender/blenkernel/intern/editlattice.c b/source/blender/blenkernel/intern/editlattice.c index b002a87a3f5..d48eb698c36 100644 --- a/source/blender/blenkernel/intern/editlattice.c +++ b/source/blender/blenkernel/intern/editlattice.c @@ -20,15 +20,15 @@ #include "MEM_guardedalloc.h" -#include "DNA_listBase.h" -#include "DNA_object_types.h" +#include "DNA_curve_types.h" #include "DNA_key_types.h" #include "DNA_lattice_types.h" +#include "DNA_listBase.h" #include "DNA_meshdata_types.h" -#include "DNA_curve_types.h" +#include "DNA_object_types.h" -#include "BLI_math_vector.h" #include "BLI_listbase.h" +#include "BLI_math_vector.h" #include "BKE_deform.h" #include "BKE_key.h" diff --git a/source/blender/blenkernel/intern/editmesh.c b/source/blender/blenkernel/intern/editmesh.c index 5f727c2d01e..94976ed0c96 100644 --- a/source/blender/blenkernel/intern/editmesh.c +++ b/source/blender/blenkernel/intern/editmesh.c @@ -24,8 +24,8 @@ #include "MEM_guardedalloc.h" #include "DNA_listBase.h" -#include "DNA_object_types.h" #include "DNA_mesh_types.h" +#include "DNA_object_types.h" #include "BLI_bitmap.h" #include "BLI_math.h" diff --git a/source/blender/blenkernel/intern/editmesh_bvh.c b/source/blender/blenkernel/intern/editmesh_bvh.c index 5af4e4c0023..72793919570 100644 --- a/source/blender/blenkernel/intern/editmesh_bvh.c +++ b/source/blender/blenkernel/intern/editmesh_bvh.c @@ -23,8 +23,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_kdopbvh.h" +#include "BLI_math.h" #include "BKE_editmesh.h" diff --git a/source/blender/blenkernel/intern/editmesh_tangent.c b/source/blender/blenkernel/intern/editmesh_tangent.c index df2fb8c8348..e291a68a4b1 100644 --- a/source/blender/blenkernel/intern/editmesh_tangent.c +++ b/source/blender/blenkernel/intern/editmesh_tangent.c @@ -21,14 +21,14 @@ #include "BLI_math.h" #include "BLI_task.h" -#include "DNA_defs.h" #include "DNA_customdata_types.h" +#include "DNA_defs.h" #include "DNA_meshdata_types.h" -#include "BKE_mesh.h" -#include "BKE_mesh_tangent.h" /* for utility functions */ #include "BKE_editmesh.h" #include "BKE_editmesh_tangent.h" +#include "BKE_mesh.h" +#include "BKE_mesh_tangent.h" /* for utility functions */ #include "MEM_guardedalloc.h" diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index 2cb91678893..f7ddc4385ac 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -21,8 +21,8 @@ * \ingroup bke */ -#include #include +#include #include #include @@ -34,18 +34,18 @@ #include "DNA_listBase.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_object_types.h" #include "DNA_object_force_types.h" +#include "DNA_object_types.h" #include "DNA_particle_types.h" -#include "DNA_texture_types.h" #include "DNA_scene_types.h" +#include "DNA_texture_types.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_ghash.h" +#include "BLI_math.h" #include "BLI_noise.h" #include "BLI_rand.h" #include "BLI_utildefines.h" -#include "BLI_ghash.h" #include "PIL_time.h" @@ -56,13 +56,13 @@ #include "BKE_curve.h" #include "BKE_displist.h" #include "BKE_effect.h" +#include "BKE_fluid.h" #include "BKE_global.h" #include "BKE_layer.h" #include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_particle.h" #include "BKE_scene.h" -#include "BKE_fluid.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_physics.h" diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c index 7dfdc1e1008..4bd55c3c2ca 100644 --- a/source/blender/blenkernel/intern/fcurve.c +++ b/source/blender/blenkernel/intern/fcurve.c @@ -21,11 +21,11 @@ * \ingroup bke */ -#include -#include -#include -#include #include +#include +#include +#include +#include #include "MEM_guardedalloc.h" @@ -33,27 +33,27 @@ #include "DNA_constraint_types.h" #include "DNA_object_types.h" -#include "BLI_blenlib.h" -#include "BLI_math.h" -#include "BLI_easing.h" -#include "BLI_threads.h" -#include "BLI_string_utils.h" -#include "BLI_utildefines.h" -#include "BLI_expr_pylike_eval.h" #include "BLI_alloca.h" +#include "BLI_blenlib.h" +#include "BLI_easing.h" +#include "BLI_expr_pylike_eval.h" +#include "BLI_math.h" +#include "BLI_string_utils.h" +#include "BLI_threads.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" -#include "BKE_fcurve.h" -#include "BKE_animsys.h" #include "BKE_action.h" +#include "BKE_animsys.h" #include "BKE_armature.h" #include "BKE_constraint.h" #include "BKE_context.h" #include "BKE_curve.h" +#include "BKE_fcurve.h" #include "BKE_global.h" -#include "BKE_object.h" #include "BKE_nla.h" +#include "BKE_object.h" #include "RNA_access.h" diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c index 54ddcac50c0..462447db7fa 100644 --- a/source/blender/blenkernel/intern/fluid.c +++ b/source/blender/blenkernel/intern/fluid.c @@ -59,8 +59,8 @@ # include "DNA_scene_types.h" # include "BLI_kdopbvh.h" -# include "BLI_threads.h" # include "BLI_kdtree.h" +# include "BLI_threads.h" # include "BLI_voxel.h" # include "BKE_bvhutils.h" diff --git a/source/blender/blenkernel/intern/fmodifier.c b/source/blender/blenkernel/intern/fmodifier.c index 10499ae0b5c..1d5a908e226 100644 --- a/source/blender/blenkernel/intern/fmodifier.c +++ b/source/blender/blenkernel/intern/fmodifier.c @@ -21,11 +21,11 @@ * \ingroup bke */ -#include -#include -#include -#include #include +#include +#include +#include +#include #include "MEM_guardedalloc.h" @@ -37,8 +37,8 @@ #include "BLI_blenlib.h" #include "BLI_ghash.h" -#include "BLI_noise.h" #include "BLI_math.h" /* windows needs for M_PI */ +#include "BLI_noise.h" #include "BLI_utildefines.h" #include "BKE_fcurve.h" diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c index ec6a265ed96..e25603e0af5 100644 --- a/source/blender/blenkernel/intern/font.c +++ b/source/blender/blenkernel/intern/font.c @@ -21,41 +21,41 @@ * \ingroup bke */ -#include -#include #include +#include #include +#include #include #include "CLG_log.h" #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_path_util.h" -#include "BLI_listbase.h" #include "BLI_ghash.h" +#include "BLI_listbase.h" +#include "BLI_math.h" +#include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_string_utf8.h" -#include "BLI_math.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include "BLI_vfontdata.h" #include "BLT_translation.h" -#include "DNA_packedFile_types.h" #include "DNA_curve_types.h" -#include "DNA_vfont_types.h" #include "DNA_object_types.h" +#include "DNA_packedFile_types.h" +#include "DNA_vfont_types.h" -#include "BKE_packedFile.h" -#include "BKE_lib_id.h" +#include "BKE_anim.h" +#include "BKE_curve.h" #include "BKE_font.h" #include "BKE_global.h" #include "BKE_idtype.h" +#include "BKE_lib_id.h" #include "BKE_main.h" -#include "BKE_anim.h" -#include "BKE_curve.h" +#include "BKE_packedFile.h" static CLG_LogRef LOG = {"bke.data_transfer"}; static ThreadRWMutex vfont_rwlock = BLI_RWLOCK_INITIALIZER; diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c index 0be92b7533d..7036da1f870 100644 --- a/source/blender/blenkernel/intern/gpencil.c +++ b/source/blender/blenkernel/intern/gpencil.c @@ -21,41 +21,41 @@ * \ingroup bke */ -#include -#include -#include -#include #include +#include +#include +#include +#include #include "CLG_log.h" #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math_vector.h" #include "BLI_polyfill_2d.h" #include "BLI_string_utils.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "DNA_anim_types.h" -#include "DNA_meshdata_types.h" -#include "DNA_material_types.h" #include "DNA_gpencil_types.h" -#include "DNA_userdef_types.h" +#include "DNA_material_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_space_types.h" -#include "DNA_object_types.h" +#include "DNA_userdef_types.h" #include "BKE_action.h" #include "BKE_animsys.h" -#include "BKE_curve.h" #include "BKE_collection.h" #include "BKE_colortools.h" +#include "BKE_curve.h" #include "BKE_deform.h" #include "BKE_gpencil.h" #include "BKE_icons.h" diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c index 1014db27d84..e73070f117b 100644 --- a/source/blender/blenkernel/intern/gpencil_modifier.c +++ b/source/blender/blenkernel/intern/gpencil_modifier.c @@ -26,25 +26,25 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" -#include "BLI_math_vector.h" #include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_string_utils.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" -#include "DNA_meshdata_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_gpencil_types.h" #include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" +#include "BKE_gpencil.h" +#include "BKE_gpencil_modifier.h" +#include "BKE_lattice.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" -#include "BKE_gpencil.h" -#include "BKE_lattice.h" #include "BKE_material.h" -#include "BKE_gpencil_modifier.h" #include "BKE_object.h" #include "DEG_depsgraph.h" diff --git a/source/blender/blenkernel/intern/hair.c b/source/blender/blenkernel/intern/hair.c index 1553fb44108..5836bf16384 100644 --- a/source/blender/blenkernel/intern/hair.c +++ b/source/blender/blenkernel/intern/hair.c @@ -36,9 +36,9 @@ #include "BKE_animsys.h" #include "BKE_customdata.h" -#include "BKE_idtype.h" #include "BKE_global.h" #include "BKE_hair.h" +#include "BKE_idtype.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_lib_remap.h" diff --git a/source/blender/blenkernel/intern/icons.c b/source/blender/blenkernel/intern/icons.c index 6363a23de6c..6da48195aab 100644 --- a/source/blender/blenkernel/intern/icons.c +++ b/source/blender/blenkernel/intern/icons.c @@ -40,15 +40,15 @@ #include "DNA_texture_types.h" #include "DNA_world_types.h" -#include "BLI_utildefines.h" +#include "BLI_fileops.h" #include "BLI_ghash.h" #include "BLI_linklist_lockfree.h" #include "BLI_string.h" -#include "BLI_fileops.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" -#include "BKE_icons.h" #include "BKE_global.h" /* only for G.background test */ +#include "BKE_icons.h" #include "BKE_studiolight.h" #include "BLI_sys_types.h" // for intptr_t support diff --git a/source/blender/blenkernel/intern/icons_rasterize.c b/source/blender/blenkernel/intern/icons_rasterize.c index f731285e029..355a94c077b 100644 --- a/source/blender/blenkernel/intern/icons_rasterize.c +++ b/source/blender/blenkernel/intern/icons_rasterize.c @@ -19,9 +19,9 @@ */ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_bitmap_draw_2d.h" #include "BLI_math_geom.h" +#include "BLI_utildefines.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/blenkernel/intern/idcode.c b/source/blender/blenkernel/intern/idcode.c index a6930a521af..454be246ad9 100644 --- a/source/blender/blenkernel/intern/idcode.c +++ b/source/blender/blenkernel/intern/idcode.c @@ -31,8 +31,8 @@ #include "BLT_translation.h" -#include "BKE_main.h" #include "BKE_idcode.h" +#include "BKE_main.h" typedef struct { unsigned short code; diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c index 33d468dee0f..554b8d93db3 100644 --- a/source/blender/blenkernel/intern/idprop.c +++ b/source/blender/blenkernel/intern/idprop.c @@ -21,15 +21,15 @@ * \ingroup bke */ +#include #include #include -#include #include -#include "BLI_utildefines.h" -#include "BLI_string.h" #include "BLI_listbase.h" #include "BLI_math.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" #include "BKE_idprop.h" #include "BKE_lib_id.h" diff --git a/source/blender/blenkernel/intern/idprop_utils.c b/source/blender/blenkernel/intern/idprop_utils.c index 312957c96ce..c966838171d 100644 --- a/source/blender/blenkernel/intern/idprop_utils.c +++ b/source/blender/blenkernel/intern/idprop_utils.c @@ -21,12 +21,12 @@ #include #include -#include "BLI_utildefines.h" -#include "BLI_string.h" #include "BLI_dynstr.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" -#include "BKE_idprop.h" #include "BKE_idcode.h" +#include "BKE_idprop.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 22ec1fe1b98..953b738213a 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -21,10 +21,10 @@ * \ingroup bke */ -#include -#include #include #include +#include +#include #ifndef WIN32 # include #else @@ -38,26 +38,26 @@ #include "MEM_guardedalloc.h" #include "IMB_colormanagement.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" -#include "IMB_moviecache.h" +#include "IMB_imbuf_types.h" #include "IMB_metadata.h" +#include "IMB_moviecache.h" #ifdef WITH_OPENEXR # include "intern/openexr/openexr_multi.h" #endif -#include "DNA_packedFile_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_camera_types.h" -#include "DNA_sequence_types.h" #include "DNA_brush_types.h" +#include "DNA_camera_types.h" +#include "DNA_defaults.h" +#include "DNA_light_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_light_types.h" +#include "DNA_object_types.h" +#include "DNA_packedFile_types.h" +#include "DNA_scene_types.h" +#include "DNA_sequence_types.h" #include "DNA_world_types.h" -#include "DNA_defaults.h" #include "BLI_blenlib.h" #include "BLI_math_vector.h" @@ -76,10 +76,10 @@ #include "BKE_image.h" #include "BKE_lib_id.h" #include "BKE_main.h" +#include "BKE_node.h" #include "BKE_packedFile.h" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_node.h" #include "BKE_sequencer.h" /* seq_foreground_frame_get() */ #include "BKE_workspace.h" @@ -99,8 +99,8 @@ /* for image user iteration */ #include "DNA_node_types.h" -#include "DNA_space_types.h" #include "DNA_screen_types.h" +#include "DNA_space_types.h" #include "DNA_view3d_types.h" static CLG_LogRef LOG = {"bke.image"}; diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c index 57bd2539003..269235176cd 100644 --- a/source/blender/blenkernel/intern/ipo.c +++ b/source/blender/blenkernel/intern/ipo.c @@ -30,25 +30,25 @@ */ #include +#include #include #include -#include /* since we have versioning code here */ #define DNA_DEPRECATED_ALLOW #include "DNA_anim_types.h" -#include "DNA_constraint_types.h" #include "DNA_camera_types.h" -#include "DNA_light_types.h" +#include "DNA_constraint_types.h" #include "DNA_ipo_types.h" #include "DNA_key_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_nla_types.h" -#include "DNA_sequence_types.h" -#include "DNA_scene_types.h" -#include "DNA_world_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" +#include "DNA_sequence_types.h" +#include "DNA_world_types.h" #include "BLI_blenlib.h" #include "BLI_dynstr.h" @@ -57,12 +57,12 @@ #include "BLT_translation.h" -#include "BKE_ipo.h" -#include "BKE_animsys.h" #include "BKE_action.h" +#include "BKE_animsys.h" #include "BKE_fcurve.h" #include "BKE_global.h" #include "BKE_idtype.h" +#include "BKE_ipo.h" #include "BKE_key.h" #include "BKE_lib_id.h" #include "BKE_main.h" diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c index 59ecf8178f0..a6708413f70 100644 --- a/source/blender/blenkernel/intern/key.c +++ b/source/blender/blenkernel/intern/key.c @@ -22,8 +22,8 @@ */ #include -#include #include +#include #include "MEM_guardedalloc.h" @@ -34,8 +34,8 @@ #include "BLT_translation.h" -#include "DNA_anim_types.h" #include "DNA_ID.h" +#include "DNA_anim_types.h" #include "DNA_key_types.h" #include "DNA_lattice_types.h" #include "DNA_mesh_types.h" @@ -47,13 +47,13 @@ #include "BKE_curve.h" #include "BKE_customdata.h" #include "BKE_deform.h" +#include "BKE_editmesh.h" #include "BKE_idtype.h" #include "BKE_key.h" #include "BKE_lattice.h" #include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_mesh.h" -#include "BKE_editmesh.h" #include "BKE_scene.h" #include "RNA_access.h" diff --git a/source/blender/blenkernel/intern/keyconfig.c b/source/blender/blenkernel/intern/keyconfig.c index 5e68d093d52..84f48441cf9 100644 --- a/source/blender/blenkernel/intern/keyconfig.c +++ b/source/blender/blenkernel/intern/keyconfig.c @@ -23,17 +23,17 @@ #include "RNA_types.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "DNA_listBase.h" #include "DNA_userdef_types.h" #include "DNA_windowmanager_types.h" -#include "BKE_keyconfig.h" /* own include */ #include "BKE_idprop.h" +#include "BKE_keyconfig.h" /* own include */ #include "MEM_guardedalloc.h" diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index 02bf4dfac8e..3f353d6d576 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -21,32 +21,32 @@ * \ingroup bke */ -#include -#include #include +#include #include +#include #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_listbase.h" #include "BLI_bitmap.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_task.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" +#include "DNA_curve_types.h" +#include "DNA_defaults.h" +#include "DNA_key_types.h" +#include "DNA_lattice_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" -#include "DNA_lattice_types.h" -#include "DNA_curve_types.h" -#include "DNA_key_types.h" -#include "DNA_defaults.h" +#include "DNA_scene_types.h" -#include "BKE_animsys.h" #include "BKE_anim.h" +#include "BKE_animsys.h" #include "BKE_curve.h" #include "BKE_displist.h" #include "BKE_idtype.h" diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c index f9f15918d67..8b3a46a3eb5 100644 --- a/source/blender/blenkernel/intern/layer.c +++ b/source/blender/blenkernel/intern/layer.c @@ -38,12 +38,12 @@ #include "BKE_object.h" #include "DNA_ID.h" -#include "DNA_space_types.h" #include "DNA_collection_types.h" #include "DNA_layer_types.h" -#include "DNA_object_types.h" #include "DNA_node_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "DNA_space_types.h" #include "DNA_view3d_types.h" #include "DNA_windowmanager_types.h" #include "DNA_workspace_types.h" diff --git a/source/blender/blenkernel/intern/layer_utils.c b/source/blender/blenkernel/intern/layer_utils.c index 716fe63dc29..d77c214130a 100644 --- a/source/blender/blenkernel/intern/layer_utils.c +++ b/source/blender/blenkernel/intern/layer_utils.c @@ -28,8 +28,8 @@ #include "DNA_ID.h" #include "DNA_layer_types.h" -#include "DNA_object_types.h" #include "DNA_mesh_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c index 9c4bef04adf..3e779c92a4a 100644 --- a/source/blender/blenkernel/intern/lib_id.c +++ b/source/blender/blenkernel/intern/lib_id.c @@ -24,12 +24,12 @@ * allocate and free of all library data */ -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include #include "CLG_log.h" @@ -46,28 +46,28 @@ #include "DNA_hair_types.h" #include "DNA_ipo_types.h" #include "DNA_key_types.h" -#include "DNA_light_types.h" #include "DNA_lattice_types.h" +#include "DNA_light_types.h" +#include "DNA_lightprobe_types.h" #include "DNA_linestyle_types.h" +#include "DNA_mask_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" #include "DNA_movieclip_types.h" -#include "DNA_mask_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" #include "DNA_pointcloud_types.h" -#include "DNA_lightprobe_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" -#include "DNA_speaker_types.h" #include "DNA_sound_types.h" +#include "DNA_speaker_types.h" #include "DNA_text_types.h" #include "DNA_vfont_types.h" #include "DNA_volume_types.h" #include "DNA_windowmanager_types.h" -#include "DNA_world_types.h" #include "DNA_workspace_types.h" +#include "DNA_world_types.h" #include "BLI_utildefines.h" @@ -84,8 +84,8 @@ #include "BKE_armature.h" #include "BKE_bpath.h" #include "BKE_brush.h" -#include "BKE_camera.h" #include "BKE_cachefile.h" +#include "BKE_camera.h" #include "BKE_collection.h" #include "BKE_context.h" #include "BKE_curve.h" @@ -98,28 +98,28 @@ #include "BKE_idtype.h" #include "BKE_image.h" #include "BKE_key.h" -#include "BKE_light.h" #include "BKE_lattice.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_lib_remap.h" +#include "BKE_light.h" +#include "BKE_lightprobe.h" #include "BKE_linestyle.h" -#include "BKE_mesh.h" -#include "BKE_material.h" #include "BKE_main.h" -#include "BKE_mball.h" #include "BKE_mask.h" +#include "BKE_material.h" +#include "BKE_mball.h" +#include "BKE_mesh.h" #include "BKE_movieclip.h" #include "BKE_node.h" #include "BKE_object.h" #include "BKE_paint.h" #include "BKE_particle.h" #include "BKE_pointcloud.h" -#include "BKE_lightprobe.h" #include "BKE_rigidbody.h" +#include "BKE_scene.h" #include "BKE_sound.h" #include "BKE_speaker.h" -#include "BKE_scene.h" #include "BKE_text.h" #include "BKE_texture.h" #include "BKE_volume.h" diff --git a/source/blender/blenkernel/intern/lib_id_delete.c b/source/blender/blenkernel/intern/lib_id_delete.c index 824d1600ecc..e1f4f36b822 100644 --- a/source/blender/blenkernel/intern/lib_id_delete.c +++ b/source/blender/blenkernel/intern/lib_id_delete.c @@ -25,27 +25,27 @@ /* all types are needed here, in order to do memory operations */ #include "DNA_armature_types.h" #include "DNA_brush_types.h" -#include "DNA_camera_types.h" #include "DNA_cachefile_types.h" +#include "DNA_camera_types.h" #include "DNA_collection_types.h" #include "DNA_gpencil_types.h" #include "DNA_ipo_types.h" #include "DNA_key_types.h" -#include "DNA_light_types.h" #include "DNA_lattice_types.h" +#include "DNA_light_types.h" +#include "DNA_lightprobe_types.h" #include "DNA_linestyle_types.h" +#include "DNA_mask_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" #include "DNA_movieclip_types.h" -#include "DNA_mask_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" -#include "DNA_lightprobe_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" -#include "DNA_speaker_types.h" #include "DNA_sound_types.h" +#include "DNA_speaker_types.h" #include "DNA_text_types.h" #include "DNA_vfont_types.h" #include "DNA_windowmanager_types.h" @@ -60,8 +60,8 @@ #include "BKE_animsys.h" #include "BKE_armature.h" #include "BKE_brush.h" -#include "BKE_camera.h" #include "BKE_cachefile.h" +#include "BKE_camera.h" #include "BKE_collection.h" #include "BKE_curve.h" #include "BKE_font.h" @@ -71,28 +71,28 @@ #include "BKE_image.h" #include "BKE_ipo.h" #include "BKE_key.h" -#include "BKE_light.h" #include "BKE_lattice.h" #include "BKE_lib_id.h" #include "BKE_lib_override.h" #include "BKE_lib_remap.h" #include "BKE_library.h" +#include "BKE_light.h" +#include "BKE_lightprobe.h" #include "BKE_linestyle.h" -#include "BKE_mesh.h" -#include "BKE_material.h" #include "BKE_main.h" #include "BKE_mask.h" +#include "BKE_material.h" #include "BKE_mball.h" +#include "BKE_mesh.h" #include "BKE_movieclip.h" #include "BKE_node.h" #include "BKE_object.h" #include "BKE_paint.h" #include "BKE_particle.h" -#include "BKE_lightprobe.h" -#include "BKE_speaker.h" -#include "BKE_sound.h" -#include "BKE_screen.h" #include "BKE_scene.h" +#include "BKE_screen.h" +#include "BKE_sound.h" +#include "BKE_speaker.h" #include "BKE_text.h" #include "BKE_texture.h" #include "BKE_workspace.h" diff --git a/source/blender/blenkernel/intern/lib_override.c b/source/blender/blenkernel/intern/lib_override.c index 81f7e158b40..42d1806a41a 100644 --- a/source/blender/blenkernel/intern/lib_override.c +++ b/source/blender/blenkernel/intern/lib_override.c @@ -37,10 +37,10 @@ #include "BKE_lib_remap.h" #include "BKE_main.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "RNA_access.h" #include "RNA_types.h" diff --git a/source/blender/blenkernel/intern/lib_query.c b/source/blender/blenkernel/intern/lib_query.c index 67065a1d715..886fb4241a4 100644 --- a/source/blender/blenkernel/intern/lib_query.c +++ b/source/blender/blenkernel/intern/lib_query.c @@ -32,26 +32,26 @@ #include "DNA_gpencil_types.h" #include "DNA_hair_types.h" #include "DNA_key_types.h" -#include "DNA_light_types.h" #include "DNA_lattice_types.h" +#include "DNA_light_types.h" +#include "DNA_lightprobe_types.h" #include "DNA_linestyle_types.h" +#include "DNA_mask_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" #include "DNA_movieclip_types.h" -#include "DNA_mask_types.h" #include "DNA_node_types.h" #include "DNA_object_force_types.h" #include "DNA_outliner_types.h" -#include "DNA_lightprobe_types.h" #include "DNA_pointcloud_types.h" #include "DNA_rigidbody_types.h" #include "DNA_scene_types.h" -#include "DNA_sequence_types.h" #include "DNA_screen_types.h" +#include "DNA_sequence_types.h" +#include "DNA_sound_types.h" #include "DNA_space_types.h" #include "DNA_speaker_types.h" -#include "DNA_sound_types.h" #include "DNA_text_types.h" #include "DNA_vfont_types.h" #include "DNA_volume_types.h" @@ -59,9 +59,9 @@ #include "DNA_workspace_types.h" #include "DNA_world_types.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_linklist_stack.h" +#include "BLI_utildefines.h" #include "BKE_animsys.h" #include "BKE_collection.h" diff --git a/source/blender/blenkernel/intern/lib_remap.c b/source/blender/blenkernel/intern/lib_remap.c index 578d4be44d3..72ae4629dba 100644 --- a/source/blender/blenkernel/intern/lib_remap.c +++ b/source/blender/blenkernel/intern/lib_remap.c @@ -33,8 +33,8 @@ #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_lib_remap.h" -#include "BKE_material.h" #include "BKE_main.h" +#include "BKE_material.h" #include "BKE_mball.h" #include "BKE_modifier.h" #include "BKE_multires.h" diff --git a/source/blender/blenkernel/intern/light.c b/source/blender/blenkernel/intern/light.c index 5f14352a1b0..aec0f808f64 100644 --- a/source/blender/blenkernel/intern/light.c +++ b/source/blender/blenkernel/intern/light.c @@ -26,13 +26,13 @@ #include "MEM_guardedalloc.h" #include "DNA_anim_types.h" +#include "DNA_defaults.h" #include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_texture_types.h" -#include "DNA_defaults.h" #include "BLI_math.h" #include "BLI_utildefines.h" @@ -41,8 +41,8 @@ #include "BKE_colortools.h" #include "BKE_icons.h" #include "BKE_idtype.h" -#include "BKE_light.h" #include "BKE_lib_id.h" +#include "BKE_light.h" #include "BKE_main.h" #include "BKE_node.h" diff --git a/source/blender/blenkernel/intern/lightprobe.c b/source/blender/blenkernel/intern/lightprobe.c index 5848444a0d7..4675897cb0e 100644 --- a/source/blender/blenkernel/intern/lightprobe.c +++ b/source/blender/blenkernel/intern/lightprobe.c @@ -23,9 +23,9 @@ #include -#include "DNA_object_types.h" -#include "DNA_lightprobe_types.h" #include "DNA_defaults.h" +#include "DNA_lightprobe_types.h" +#include "DNA_object_types.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/linestyle.c b/source/blender/blenkernel/intern/linestyle.c index c5767e8bbcc..db39931a9d2 100644 --- a/source/blender/blenkernel/intern/linestyle.c +++ b/source/blender/blenkernel/intern/linestyle.c @@ -27,10 +27,10 @@ #include "MEM_guardedalloc.h" -#include "DNA_object_types.h" -#include "DNA_material_types.h" /* for ramp blend */ -#include "DNA_texture_types.h" #include "DNA_defaults.h" +#include "DNA_material_types.h" /* for ramp blend */ +#include "DNA_object_types.h" +#include "DNA_texture_types.h" #include "BLI_blenlib.h" #include "BLI_math.h" @@ -39,7 +39,9 @@ #include "BLT_translation.h" +#include "BKE_animsys.h" #include "BKE_colorband.h" +#include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_freestyle.h" #include "BKE_idtype.h" @@ -47,8 +49,6 @@ #include "BKE_linestyle.h" #include "BKE_main.h" #include "BKE_node.h" -#include "BKE_colortools.h" -#include "BKE_animsys.h" static void linestyle_init_data(ID *id) { diff --git a/source/blender/blenkernel/intern/main_idmap.c b/source/blender/blenkernel/intern/main_idmap.c index 8b83482d685..0936e1f399f 100644 --- a/source/blender/blenkernel/intern/main_idmap.c +++ b/source/blender/blenkernel/intern/main_idmap.c @@ -14,14 +14,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include #include +#include #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "DNA_ID.h" diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c index 5a212bfef37..aafbcf0d360 100644 --- a/source/blender/blenkernel/intern/mask.c +++ b/source/blender/blenkernel/intern/mask.c @@ -28,33 +28,33 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" -#include "BLI_string.h" -#include "BLI_string_utils.h" #include "BLI_listbase.h" #include "BLI_math.h" +#include "BLI_string.h" +#include "BLI_string_utils.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" #include "DNA_mask_types.h" #include "DNA_node_types.h" #include "DNA_screen_types.h" -#include "DNA_space_types.h" #include "DNA_sequence_types.h" +#include "DNA_space_types.h" #include "BKE_animsys.h" #include "BKE_curve.h" #include "BKE_idtype.h" +#include "BKE_image.h" #include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_mask.h" +#include "BKE_movieclip.h" #include "BKE_node.h" #include "BKE_sequencer.h" #include "BKE_tracking.h" -#include "BKE_movieclip.h" -#include "BKE_image.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/blenkernel/intern/mask_evaluate.c b/source/blender/blenkernel/intern/mask_evaluate.c index cb8b3b5ecc9..9b281103a0f 100644 --- a/source/blender/blenkernel/intern/mask_evaluate.c +++ b/source/blender/blenkernel/intern/mask_evaluate.c @@ -28,8 +28,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "DNA_mask_types.h" #include "DNA_object_types.h" diff --git a/source/blender/blenkernel/intern/mask_rasterize.c b/source/blender/blenkernel/intern/mask_rasterize.c index e6cfea6fb03..412ccd3ab39 100644 --- a/source/blender/blenkernel/intern/mask_rasterize.c +++ b/source/blender/blenkernel/intern/mask_rasterize.c @@ -69,19 +69,19 @@ #include "MEM_guardedalloc.h" -#include "DNA_vec_types.h" #include "DNA_mask_types.h" #include "DNA_scene_types.h" +#include "DNA_vec_types.h" -#include "BLI_utildefines.h" -#include "BLI_scanfill.h" #include "BLI_memarena.h" +#include "BLI_scanfill.h" +#include "BLI_utildefines.h" +#include "BLI_linklist.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_rect.h" #include "BLI_task.h" -#include "BLI_listbase.h" -#include "BLI_linklist.h" #include "BKE_mask.h" diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 15f18eef7c8..31fe93f64ed 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -21,42 +21,45 @@ * \ingroup bke */ -#include #include #include +#include #include "CLG_log.h" #include "MEM_guardedalloc.h" +#include "DNA_ID.h" #include "DNA_anim_types.h" #include "DNA_collection_types.h" #include "DNA_curve_types.h" +#include "DNA_customdata_types.h" +#include "DNA_defaults.h" +#include "DNA_gpencil_types.h" +#include "DNA_hair_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_customdata_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_hair_types.h" -#include "DNA_ID.h" #include "DNA_meta_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" #include "DNA_pointcloud_types.h" #include "DNA_scene_types.h" #include "DNA_volume_types.h" -#include "DNA_defaults.h" -#include "BLI_math.h" -#include "BLI_listbase.h" -#include "BLI_utildefines.h" #include "BLI_array_utils.h" +#include "BLI_listbase.h" +#include "BLI_math.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" #include "BKE_animsys.h" #include "BKE_brush.h" +#include "BKE_curve.h" #include "BKE_displist.h" +#include "BKE_editmesh.h" +#include "BKE_font.h" #include "BKE_gpencil.h" #include "BKE_icons.h" #include "BKE_idtype.h" @@ -65,11 +68,8 @@ #include "BKE_main.h" #include "BKE_material.h" #include "BKE_mesh.h" -#include "BKE_scene.h" #include "BKE_node.h" -#include "BKE_curve.h" -#include "BKE_editmesh.h" -#include "BKE_font.h" +#include "BKE_scene.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index 624911a9792..b708c030152 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -26,20 +26,20 @@ * \ingroup bke */ -#include -#include -#include -#include #include #include +#include +#include +#include +#include #include "MEM_guardedalloc.h" -#include "DNA_material_types.h" -#include "DNA_object_types.h" -#include "DNA_meta_types.h" -#include "DNA_scene_types.h" #include "DNA_defaults.h" +#include "DNA_material_types.h" +#include "DNA_meta_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BLI_blenlib.h" #include "BLI_math.h" @@ -52,13 +52,13 @@ #include "BKE_animsys.h" #include "BKE_curve.h" -#include "BKE_idtype.h" -#include "BKE_scene.h" -#include "BKE_lib_id.h" #include "BKE_displist.h" +#include "BKE_idtype.h" +#include "BKE_lib_id.h" +#include "BKE_material.h" #include "BKE_mball.h" #include "BKE_object.h" -#include "BKE_material.h" +#include "BKE_scene.h" #include "DEG_depsgraph.h" diff --git a/source/blender/blenkernel/intern/mball_tessellate.c b/source/blender/blenkernel/intern/mball_tessellate.c index ca1ca2618d8..cd629c888a4 100644 --- a/source/blender/blenkernel/intern/mball_tessellate.c +++ b/source/blender/blenkernel/intern/mball_tessellate.c @@ -21,24 +21,24 @@ * \ingroup bke */ -#include -#include -#include -#include #include #include +#include +#include +#include +#include #include "MEM_guardedalloc.h" -#include "DNA_object_types.h" #include "DNA_meta_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "BLI_listbase.h" #include "BLI_math.h" +#include "BLI_memarena.h" #include "BLI_string_utils.h" #include "BLI_utildefines.h" -#include "BLI_memarena.h" #include "BKE_global.h" diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 3a9a38288a7..68d10bd02a8 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -23,38 +23,38 @@ #include "MEM_guardedalloc.h" -#include "DNA_object_types.h" +#include "DNA_defaults.h" #include "DNA_key_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_defaults.h" +#include "DNA_object_types.h" -#include "BLI_utildefines.h" #include "BLI_bitmap.h" +#include "BLI_edgehash.h" #include "BLI_ghash.h" #include "BLI_hash.h" -#include "BLI_math.h" #include "BLI_linklist.h" +#include "BLI_math.h" #include "BLI_memarena.h" -#include "BLI_edgehash.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" #include "BKE_animsys.h" -#include "BKE_idcode.h" -#include "BKE_main.h" +#include "BKE_editmesh.h" #include "BKE_global.h" +#include "BKE_idcode.h" #include "BKE_idtype.h" #include "BKE_key.h" +#include "BKE_lib_id.h" +#include "BKE_main.h" +#include "BKE_material.h" #include "BKE_mesh.h" #include "BKE_mesh_runtime.h" -#include "BKE_lib_id.h" -#include "BKE_material.h" #include "BKE_modifier.h" #include "BKE_multires.h" #include "BKE_object.h" -#include "BKE_editmesh.h" #include "PIL_time.h" diff --git a/source/blender/blenkernel/intern/mesh_convert.c b/source/blender/blenkernel/intern/mesh_convert.c index ce8fcc4eeb9..955f1aca110 100644 --- a/source/blender/blenkernel/intern/mesh_convert.c +++ b/source/blender/blenkernel/intern/mesh_convert.c @@ -22,32 +22,32 @@ #include "MEM_guardedalloc.h" -#include "DNA_scene_types.h" +#include "DNA_curve_types.h" #include "DNA_key_types.h" #include "DNA_material_types.h" +#include "DNA_mesh_types.h" #include "DNA_meta_types.h" #include "DNA_object_types.h" -#include "DNA_mesh_types.h" -#include "DNA_curve_types.h" +#include "DNA_scene_types.h" -#include "BLI_utildefines.h" -#include "BLI_math.h" -#include "BLI_listbase.h" #include "BLI_edgehash.h" +#include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_string.h" +#include "BLI_utildefines.h" -#include "BKE_main.h" #include "BKE_DerivedMesh.h" +#include "BKE_displist.h" #include "BKE_editmesh.h" #include "BKE_key.h" +#include "BKE_lib_id.h" #include "BKE_lib_query.h" +#include "BKE_main.h" +#include "BKE_material.h" +#include "BKE_mball.h" #include "BKE_mesh.h" #include "BKE_mesh_runtime.h" #include "BKE_modifier.h" -#include "BKE_displist.h" -#include "BKE_lib_id.h" -#include "BKE_material.h" -#include "BKE_mball.h" /* these 2 are only used by conversion functions */ #include "BKE_curve.h" /* -- */ diff --git a/source/blender/blenkernel/intern/mesh_evaluate.c b/source/blender/blenkernel/intern/mesh_evaluate.c index e14803e4193..ac5a68b7764 100644 --- a/source/blender/blenkernel/intern/mesh_evaluate.c +++ b/source/blender/blenkernel/intern/mesh_evaluate.c @@ -29,21 +29,21 @@ #include "MEM_guardedalloc.h" -#include "DNA_object_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" -#include "BLI_utildefines.h" -#include "BLI_memarena.h" -#include "BLI_math.h" -#include "BLI_edgehash.h" +#include "BLI_alloca.h" #include "BLI_bitmap.h" -#include "BLI_polyfill_2d.h" +#include "BLI_edgehash.h" #include "BLI_linklist.h" #include "BLI_linklist_stack.h" -#include "BLI_alloca.h" +#include "BLI_math.h" +#include "BLI_memarena.h" +#include "BLI_polyfill_2d.h" #include "BLI_stack.h" #include "BLI_task.h" +#include "BLI_utildefines.h" #include "BKE_customdata.h" #include "BKE_global.h" diff --git a/source/blender/blenkernel/intern/mesh_mapping.c b/source/blender/blenkernel/intern/mesh_mapping.c index d908a248a28..4ed9b31dbb5 100644 --- a/source/blender/blenkernel/intern/mesh_mapping.c +++ b/source/blender/blenkernel/intern/mesh_mapping.c @@ -26,13 +26,13 @@ #include "DNA_meshdata_types.h" #include "DNA_vec_types.h" -#include "BLI_buffer.h" -#include "BLI_utildefines.h" #include "BLI_bitmap.h" +#include "BLI_buffer.h" #include "BLI_math.h" +#include "BLI_utildefines.h" -#include "BKE_mesh_mapping.h" #include "BKE_customdata.h" +#include "BKE_mesh_mapping.h" #include "BLI_memarena.h" #include "BLI_strict_flags.h" diff --git a/source/blender/blenkernel/intern/mesh_merge.c b/source/blender/blenkernel/intern/mesh_merge.c index d646e988c60..1b9b8ea6572 100644 --- a/source/blender/blenkernel/intern/mesh_merge.c +++ b/source/blender/blenkernel/intern/mesh_merge.c @@ -27,10 +27,10 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "BLI_utildefines.h" -#include "BLI_utildefines_stack.h" #include "BLI_edgehash.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" +#include "BLI_utildefines_stack.h" #include "BKE_customdata.h" #include "BKE_lib_id.h" diff --git a/source/blender/blenkernel/intern/mesh_mirror.c b/source/blender/blenkernel/intern/mesh_mirror.c index e2f298a3fb1..9799d97d1cc 100644 --- a/source/blender/blenkernel/intern/mesh_mirror.c +++ b/source/blender/blenkernel/intern/mesh_mirror.c @@ -27,12 +27,12 @@ #include "DNA_meshdata_types.h" #include "DNA_object_types.h" +#include "BKE_deform.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_mesh.h" #include "BKE_mesh_mirror.h" #include "BKE_modifier.h" -#include "BKE_deform.h" #include "bmesh.h" #include "bmesh_tools.h" diff --git a/source/blender/blenkernel/intern/mesh_remap.c b/source/blender/blenkernel/intern/mesh_remap.c index 834008ca1ac..d09205b5744 100644 --- a/source/blender/blenkernel/intern/mesh_remap.c +++ b/source/blender/blenkernel/intern/mesh_remap.c @@ -29,7 +29,6 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "BLI_utildefines.h" #include "BLI_alloca.h" #include "BLI_astar.h" #include "BLI_bitmap.h" @@ -37,6 +36,7 @@ #include "BLI_memarena.h" #include "BLI_polyfill_2d.h" #include "BLI_rand.h" +#include "BLI_utildefines.h" #include "BKE_bvhutils.h" #include "BKE_customdata.h" diff --git a/source/blender/blenkernel/intern/mesh_remesh_voxel.c b/source/blender/blenkernel/intern/mesh_remesh_voxel.c index 983c19857dd..3daf9f2752e 100644 --- a/source/blender/blenkernel/intern/mesh_remesh_voxel.c +++ b/source/blender/blenkernel/intern/mesh_remesh_voxel.c @@ -21,12 +21,12 @@ * \ingroup bke */ +#include +#include +#include #include #include -#include #include -#include -#include #include "MEM_guardedalloc.h" @@ -34,17 +34,17 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "DNA_object_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" -#include "BKE_editmesh.h" -#include "BKE_mesh.h" -#include "BKE_mesh_runtime.h" -#include "BKE_lib_id.h" -#include "BKE_customdata.h" #include "BKE_bvhutils.h" +#include "BKE_customdata.h" +#include "BKE_editmesh.h" +#include "BKE_lib_id.h" +#include "BKE_mesh.h" #include "BKE_mesh_remesh_voxel.h" /* own include */ +#include "BKE_mesh_runtime.h" #include "bmesh_tools.h" diff --git a/source/blender/blenkernel/intern/mesh_runtime.c b/source/blender/blenkernel/intern/mesh_runtime.c index 3e21e044a02..aa3586d1e3d 100644 --- a/source/blender/blenkernel/intern/mesh_runtime.c +++ b/source/blender/blenkernel/intern/mesh_runtime.c @@ -36,8 +36,8 @@ #include "BKE_lib_id.h" #include "BKE_mesh.h" #include "BKE_mesh_runtime.h" -#include "BKE_subdiv_ccg.h" #include "BKE_shrinkwrap.h" +#include "BKE_subdiv_ccg.h" /* -------------------------------------------------------------------- */ /** \name Mesh Runtime Struct Utils diff --git a/source/blender/blenkernel/intern/mesh_tangent.c b/source/blender/blenkernel/intern/mesh_tangent.c index 19d94be9b6e..ebc3e9c490a 100644 --- a/source/blender/blenkernel/intern/mesh_tangent.c +++ b/source/blender/blenkernel/intern/mesh_tangent.c @@ -30,14 +30,14 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" #include "BLI_task.h" +#include "BLI_utildefines.h" #include "BKE_customdata.h" #include "BKE_mesh.h" -#include "BKE_mesh_tangent.h" #include "BKE_mesh_runtime.h" +#include "BKE_mesh_tangent.h" #include "BKE_report.h" #include "BLI_strict_flags.h" diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c index 1c9fc644341..3343d41b13c 100644 --- a/source/blender/blenkernel/intern/mesh_validate.c +++ b/source/blender/blenkernel/intern/mesh_validate.c @@ -21,10 +21,10 @@ * \ingroup bke */ +#include #include #include #include -#include #include "CLG_log.h" @@ -34,10 +34,10 @@ #include "BLI_sys_types.h" -#include "BLI_utildefines.h" #include "BLI_edgehash.h" #include "BLI_math_base.h" #include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "BKE_customdata.h" #include "BKE_deform.h" diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 381e43241ea..92cfc90ec3d 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -24,12 +24,12 @@ * \ingroup bke */ -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include #include "MEM_guardedalloc.h" @@ -38,15 +38,16 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_utildefines.h" -#include "BLI_listbase.h" #include "BLI_linklist.h" +#include "BLI_listbase.h" #include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_string_utils.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" +#include "BKE_DerivedMesh.h" #include "BKE_appdir.h" #include "BKE_editmesh.h" #include "BKE_global.h" @@ -57,7 +58,6 @@ #include "BKE_mesh.h" #include "BKE_multires.h" #include "BKE_object.h" -#include "BKE_DerivedMesh.h" /* may move these, only for modifier_path_relbase */ #include "BKE_main.h" diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c index f91047f1cd4..1935dc0cf6f 100644 --- a/source/blender/blenkernel/intern/movieclip.c +++ b/source/blender/blenkernel/intern/movieclip.c @@ -21,9 +21,9 @@ * \ingroup bke */ +#include #include #include -#include #ifndef WIN32 # include @@ -36,12 +36,12 @@ #include "MEM_guardedalloc.h" #include "DNA_constraint_types.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" #include "DNA_movieclip_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" +#include "DNA_space_types.h" #include "DNA_view3d_types.h" #include "BLI_utildefines.h" @@ -57,15 +57,15 @@ #include "BKE_colortools.h" #include "BKE_global.h" #include "BKE_idtype.h" +#include "BKE_image.h" /* openanim */ #include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_movieclip.h" #include "BKE_node.h" -#include "BKE_image.h" /* openanim */ #include "BKE_tracking.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_moviecache.h" #include "DEG_depsgraph.h" diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index 234273b5158..f7a3489f02e 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -34,22 +34,22 @@ #include "BLI_bitmap.h" #include "BLI_blenlib.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_task.h" +#include "BLI_utildefines.h" -#include "BKE_pbvh.h" #include "BKE_ccg.h" #include "BKE_cdderivedmesh.h" +#include "BKE_editmesh.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" #include "BKE_mesh_runtime.h" #include "BKE_modifier.h" #include "BKE_multires.h" #include "BKE_paint.h" +#include "BKE_pbvh.h" #include "BKE_scene.h" #include "BKE_subdiv_ccg.h" #include "BKE_subsurf.h" -#include "BKE_editmesh.h" #include "BKE_object.h" diff --git a/source/blender/blenkernel/intern/multires_reshape_apply_base.c b/source/blender/blenkernel/intern/multires_reshape_apply_base.c index 62418150ff1..d480c46f2d0 100644 --- a/source/blender/blenkernel/intern/multires_reshape_apply_base.c +++ b/source/blender/blenkernel/intern/multires_reshape_apply_base.c @@ -30,14 +30,14 @@ #include "DNA_modifier_types.h" #include "DNA_object_types.h" -#include "BLI_math_vector.h" #include "BLI_listbase.h" +#include "BLI_math_vector.h" #include "BKE_customdata.h" #include "BKE_lib_id.h" #include "BKE_mesh.h" -#include "BKE_mesh_runtime.h" #include "BKE_mesh_mapping.h" +#include "BKE_mesh_runtime.h" #include "BKE_multires.h" #include "BKE_subdiv_eval.h" diff --git a/source/blender/blenkernel/intern/multires_reshape_smooth.c b/source/blender/blenkernel/intern/multires_reshape_smooth.c index 0a9a17d7bd8..eb06a0e9dec 100644 --- a/source/blender/blenkernel/intern/multires_reshape_smooth.c +++ b/source/blender/blenkernel/intern/multires_reshape_smooth.c @@ -28,9 +28,9 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "BLI_utildefines.h" #include "BLI_math_vector.h" #include "BLI_task.h" +#include "BLI_utildefines.h" #include "BKE_multires.h" #include "BKE_subdiv.h" diff --git a/source/blender/blenkernel/intern/multires_reshape_util.c b/source/blender/blenkernel/intern/multires_reshape_util.c index 5401fe2dcda..495b60c1238 100644 --- a/source/blender/blenkernel/intern/multires_reshape_util.c +++ b/source/blender/blenkernel/intern/multires_reshape_util.c @@ -26,9 +26,9 @@ #include "MEM_guardedalloc.h" #include "DNA_mesh_types.h" -#include "DNA_scene_types.h" #include "DNA_modifier_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BLI_task.h" @@ -36,8 +36,8 @@ #include "BKE_mesh_runtime.h" #include "BKE_multires.h" #include "BKE_subdiv.h" -#include "BKE_subdiv_eval.h" #include "BKE_subdiv_ccg.h" +#include "BKE_subdiv_eval.h" #include "BKE_subdiv_foreach.h" #include "BKE_subdiv_mesh.h" diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c index 2a29644f0d7..6edccbccc76 100644 --- a/source/blender/blenkernel/intern/nla.c +++ b/source/blender/blenkernel/intern/nla.c @@ -21,22 +21,22 @@ * \ingroup bke */ -#include +#include +#include #include #include +#include #include -#include -#include #include "CLG_log.h" #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" +#include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_string.h" #include "BLI_string_utils.h" -#include "BLI_ghash.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 8ddb78bcc17..06ddf4a8582 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -25,23 +25,23 @@ #include "MEM_guardedalloc.h" -#include -#include -#include #include +#include +#include +#include #include "DNA_action_types.h" #include "DNA_anim_types.h" #include "DNA_light_types.h" +#include "DNA_linestyle_types.h" #include "DNA_material_types.h" #include "DNA_node_types.h" #include "DNA_scene_types.h" #include "DNA_texture_types.h" #include "DNA_world_types.h" -#include "DNA_linestyle_types.h" -#include "BLI_listbase.h" #include "BLI_ghash.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_path_util.h" #include "BLI_string.h" @@ -63,10 +63,10 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "NOD_socket.h" #include "NOD_common.h" #include "NOD_composite.h" #include "NOD_shader.h" +#include "NOD_socket.h" #include "NOD_texture.h" #include "DEG_depsgraph.h" diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 4e8ae3d57d5..7e1b21717b4 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -21,9 +21,9 @@ * \ingroup bke */ -#include #include #include +#include #include "CLG_log.h" @@ -34,17 +34,21 @@ #include "DNA_camera_types.h" #include "DNA_collection_types.h" #include "DNA_constraint_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_gpencil_modifier_types.h" -#include "DNA_key_types.h" -#include "DNA_light_types.h" -#include "DNA_lattice_types.h" +#include "DNA_defaults.h" #include "DNA_fluid_types.h" +#include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_key_types.h" +#include "DNA_lattice_types.h" +#include "DNA_light_types.h" +#include "DNA_lightprobe_types.h" #include "DNA_material_types.h" -#include "DNA_meta_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "DNA_meta_types.h" #include "DNA_movieclip_types.h" +#include "DNA_object_types.h" +#include "DNA_rigidbody_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_sequence_types.h" @@ -52,51 +56,52 @@ #include "DNA_space_types.h" #include "DNA_view3d_types.h" #include "DNA_world_types.h" -#include "DNA_object_types.h" -#include "DNA_lightprobe_types.h" -#include "DNA_rigidbody_types.h" -#include "DNA_defaults.h" #include "BLI_blenlib.h" +#include "BLI_kdtree.h" +#include "BLI_linklist.h" #include "BLI_math.h" #include "BLI_threads.h" #include "BLI_utildefines.h" -#include "BLI_linklist.h" -#include "BLI_kdtree.h" #include "BLT_translation.h" -#include "BKE_pbvh.h" -#include "BKE_main.h" -#include "BKE_global.h" -#include "BKE_idprop.h" -#include "BKE_armature.h" -#include "BKE_action.h" -#include "BKE_deform.h" #include "BKE_DerivedMesh.h" -#include "BKE_animsys.h" +#include "BKE_action.h" #include "BKE_anim.h" +#include "BKE_animsys.h" +#include "BKE_armature.h" +#include "BKE_camera.h" #include "BKE_collection.h" #include "BKE_constraint.h" #include "BKE_curve.h" +#include "BKE_deform.h" #include "BKE_displist.h" +#include "BKE_editmesh.h" #include "BKE_effect.h" -#include "BKE_font.h" #include "BKE_fcurve.h" +#include "BKE_font.h" +#include "BKE_global.h" +#include "BKE_gpencil.h" #include "BKE_gpencil_modifier.h" +#include "BKE_hair.h" #include "BKE_icons.h" +#include "BKE_idprop.h" #include "BKE_idtype.h" +#include "BKE_image.h" #include "BKE_key.h" -#include "BKE_light.h" -#include "BKE_layer.h" #include "BKE_lattice.h" +#include "BKE_layer.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_lib_remap.h" +#include "BKE_light.h" +#include "BKE_lightprobe.h" #include "BKE_linestyle.h" -#include "BKE_mesh.h" -#include "BKE_editmesh.h" +#include "BKE_main.h" +#include "BKE_material.h" #include "BKE_mball.h" +#include "BKE_mesh.h" #include "BKE_modifier.h" #include "BKE_multires.h" #include "BKE_node.h" @@ -104,22 +109,17 @@ #include "BKE_object_facemap.h" #include "BKE_paint.h" #include "BKE_particle.h" +#include "BKE_pbvh.h" #include "BKE_pointcache.h" -#include "BKE_lightprobe.h" +#include "BKE_pointcloud.h" #include "BKE_rigidbody.h" #include "BKE_scene.h" #include "BKE_sequencer.h" #include "BKE_shader_fx.h" -#include "BKE_speaker.h" #include "BKE_softbody.h" -#include "BKE_subsurf.h" +#include "BKE_speaker.h" #include "BKE_subdiv_ccg.h" -#include "BKE_material.h" -#include "BKE_camera.h" -#include "BKE_image.h" -#include "BKE_gpencil.h" -#include "BKE_hair.h" -#include "BKE_pointcloud.h" +#include "BKE_subsurf.h" #include "BKE_volume.h" #include "DEG_depsgraph.h" diff --git a/source/blender/blenkernel/intern/object_deform.c b/source/blender/blenkernel/intern/object_deform.c index 32b63313853..a75180867cb 100644 --- a/source/blender/blenkernel/intern/object_deform.c +++ b/source/blender/blenkernel/intern/object_deform.c @@ -25,31 +25,31 @@ #include "BLT_translation.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_string_utils.h" +#include "BLI_utildefines.h" #include "DNA_armature_types.h" #include "DNA_cloth_types.h" #include "DNA_curve_types.h" #include "DNA_lattice_types.h" -#include "DNA_meshdata_types.h" #include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" -#include "DNA_object_types.h" #include "DNA_object_force_types.h" +#include "DNA_object_types.h" #include "DNA_particle_types.h" #include "DNA_scene_types.h" #include "BKE_action.h" #include "BKE_deform.h" #include "BKE_editmesh.h" -#include "BKE_object_deform.h" /* own include */ -#include "BKE_object.h" +#include "BKE_gpencil.h" #include "BKE_mesh.h" #include "BKE_modifier.h" -#include "BKE_gpencil.h" +#include "BKE_object.h" +#include "BKE_object_deform.h" /* own include */ /** \name Misc helpers * \{ */ diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c index 28b6e0d4e02..1217d230d0d 100644 --- a/source/blender/blenkernel/intern/object_dupli.c +++ b/source/blender/blenkernel/intern/object_dupli.c @@ -22,8 +22,8 @@ */ #include -#include #include +#include #include "MEM_guardedalloc.h" @@ -40,8 +40,10 @@ #include "DNA_scene_types.h" #include "DNA_vfont_types.h" +#include "BKE_anim.h" #include "BKE_animsys.h" #include "BKE_collection.h" +#include "BKE_editmesh.h" #include "BKE_font.h" #include "BKE_global.h" #include "BKE_idprop.h" @@ -53,14 +55,12 @@ #include "BKE_object.h" #include "BKE_particle.h" #include "BKE_scene.h" -#include "BKE_editmesh.h" -#include "BKE_anim.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "BLI_strict_flags.h" #include "BLI_hash.h" +#include "BLI_strict_flags.h" /* Dupli-Geometry */ diff --git a/source/blender/blenkernel/intern/object_facemap.c b/source/blender/blenkernel/intern/object_facemap.c index be96927ed63..10a3e35e382 100644 --- a/source/blender/blenkernel/intern/object_facemap.c +++ b/source/blender/blenkernel/intern/object_facemap.c @@ -23,26 +23,26 @@ #include -#include "DNA_object_types.h" #include "DNA_mesh_types.h" +#include "DNA_object_types.h" -#include "BLI_utildefines.h" +#include "BLI_listbase.h" #include "BLI_string.h" #include "BLI_string_utils.h" -#include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "BKE_customdata.h" #include "BKE_editmesh.h" #include "BKE_object.h" -#include "BKE_object_facemap.h" /* own include */ #include "BKE_object_deform.h" +#include "BKE_object_facemap.h" /* own include */ #include "BLT_translation.h" #include "MEM_guardedalloc.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" static bool fmap_unique_check(void *arg, const char *name) { diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c index 66c3b2ea26e..dd06e4f1753 100644 --- a/source/blender/blenkernel/intern/object_update.c +++ b/source/blender/blenkernel/intern/object_update.c @@ -31,26 +31,27 @@ #include "DNA_scene_types.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" -#include "BLI_threads.h" #include "BLI_math.h" +#include "BLI_threads.h" +#include "BLI_utildefines.h" +#include "BKE_DerivedMesh.h" +#include "BKE_action.h" #include "BKE_animsys.h" #include "BKE_armature.h" -#include "BKE_action.h" #include "BKE_constraint.h" #include "BKE_curve.h" -#include "BKE_DerivedMesh.h" #include "BKE_displist.h" #include "BKE_editmesh.h" #include "BKE_effect.h" +#include "BKE_gpencil.h" #include "BKE_gpencil_modifier.h" #include "BKE_hair.h" #include "BKE_image.h" #include "BKE_key.h" +#include "BKE_lattice.h" #include "BKE_layer.h" #include "BKE_light.h" -#include "BKE_lattice.h" #include "BKE_material.h" #include "BKE_mball.h" #include "BKE_mesh.h" @@ -59,7 +60,6 @@ #include "BKE_pointcache.h" #include "BKE_pointcloud.h" #include "BKE_scene.h" -#include "BKE_gpencil.h" #include "BKE_volume.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/blenkernel/intern/ocean_spectrum.c b/source/blender/blenkernel/intern/ocean_spectrum.c index 93018f4a5b0..1f7cc56f1a9 100644 --- a/source/blender/blenkernel/intern/ocean_spectrum.c +++ b/source/blender/blenkernel/intern/ocean_spectrum.c @@ -18,8 +18,8 @@ * \ingroup bke */ -#include "BLI_math.h" #include "BKE_ocean.h" +#include "BLI_math.h" #include "ocean_intern.h" #ifdef WITH_OCEANSIM diff --git a/source/blender/blenkernel/intern/outliner_treehash.c b/source/blender/blenkernel/intern/outliner_treehash.c index a58dfb59dd8..39618c95a68 100644 --- a/source/blender/blenkernel/intern/outliner_treehash.c +++ b/source/blender/blenkernel/intern/outliner_treehash.c @@ -23,9 +23,9 @@ #include #include -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_mempool.h" +#include "BLI_utildefines.h" #include "DNA_outliner_types.h" diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c index 34e86b29540..ff6aa09ec89 100644 --- a/source/blender/blenkernel/intern/packedFile.c +++ b/source/blender/blenkernel/intern/packedFile.c @@ -21,8 +21,8 @@ * \ingroup bke */ -#include #include +#include #include #ifndef WIN32 @@ -30,15 +30,15 @@ #else # include #endif -#include #include "MEM_guardedalloc.h" +#include -#include "DNA_image_types.h" #include "DNA_ID.h" +#include "DNA_image_types.h" #include "DNA_packedFile_types.h" #include "DNA_sound_types.h" -#include "DNA_volume_types.h" #include "DNA_vfont_types.h" +#include "DNA_volume_types.h" #include "BLI_blenlib.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index eb21883f0dd..719336f7351 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -26,21 +26,21 @@ #include "MEM_guardedalloc.h" -#include "DNA_object_types.h" +#include "DNA_brush_types.h" +#include "DNA_gpencil_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_brush_types.h" #include "DNA_space_types.h" -#include "DNA_gpencil_types.h" #include "DNA_view3d_types.h" #include "DNA_workspace_types.h" #include "BLI_bitmap.h" -#include "BLI_utildefines.h" -#include "BLI_math_vector.h" #include "BLI_listbase.h" +#include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -48,15 +48,15 @@ #include "BKE_brush.h" #include "BKE_ccg.h" #include "BKE_colortools.h" -#include "BKE_deform.h" -#include "BKE_main.h" #include "BKE_context.h" #include "BKE_crazyspace.h" +#include "BKE_deform.h" #include "BKE_gpencil.h" #include "BKE_idtype.h" #include "BKE_image.h" #include "BKE_key.h" #include "BKE_lib_id.h" +#include "BKE_main.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" #include "BKE_mesh_runtime.h" diff --git a/source/blender/blenkernel/intern/paint_toolslots.c b/source/blender/blenkernel/intern/paint_toolslots.c index 7e58bf1eb8b..ea5cb168b12 100644 --- a/source/blender/blenkernel/intern/paint_toolslots.c +++ b/source/blender/blenkernel/intern/paint_toolslots.c @@ -22,15 +22,15 @@ #include "MEM_guardedalloc.h" +#include "DNA_brush_types.h" #include "DNA_modifier_types.h" #include "DNA_scene_types.h" -#include "DNA_brush_types.h" #include "BLI_utildefines.h" -#include "BKE_main.h" -#include "BKE_lib_id.h" #include "BKE_brush.h" +#include "BKE_lib_id.h" +#include "BKE_main.h" #include "BKE_paint.h" void BKE_paint_toolslots_len_ensure(Paint *paint, int len) diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index e5d0e2a4f21..f110a2bd3ae 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -21,32 +21,32 @@ * \ingroup bke */ -#include #include +#include #include #include "MEM_guardedalloc.h" #include "DNA_collection_types.h" #include "DNA_curve_types.h" +#include "DNA_dynamicpaint_types.h" +#include "DNA_fluid_types.h" #include "DNA_key_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_particle_types.h" -#include "DNA_fluid_types.h" #include "DNA_scene_types.h" -#include "DNA_dynamicpaint_types.h" #include "BLI_blenlib.h" -#include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_kdopbvh.h" #include "BLI_kdtree.h" +#include "BLI_linklist.h" +#include "BLI_math.h" #include "BLI_rand.h" #include "BLI_task.h" #include "BLI_threads.h" -#include "BLI_linklist.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -59,19 +59,19 @@ #include "BKE_colortools.h" #include "BKE_effect.h" #include "BKE_idtype.h" -#include "BKE_main.h" #include "BKE_lattice.h" +#include "BKE_main.h" +#include "BKE_deform.h" #include "BKE_displist.h" -#include "BKE_particle.h" -#include "BKE_material.h" #include "BKE_key.h" #include "BKE_lib_id.h" -#include "BKE_modifier.h" +#include "BKE_material.h" #include "BKE_mesh.h" +#include "BKE_modifier.h" +#include "BKE_particle.h" #include "BKE_pointcache.h" #include "BKE_scene.h" -#include "BKE_deform.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/blenkernel/intern/particle_distribute.c b/source/blender/blenkernel/intern/particle_distribute.c index 7a0998a1ee7..9069f549e61 100644 --- a/source/blender/blenkernel/intern/particle_distribute.c +++ b/source/blender/blenkernel/intern/particle_distribute.c @@ -25,7 +25,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_jitter_2d.h" #include "BLI_kdtree.h" #include "BLI_math.h" @@ -33,6 +32,7 @@ #include "BLI_rand.h" #include "BLI_sort.h" #include "BLI_task.h" +#include "BLI_utildefines.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 2f6ffdfe607..cc49f500a5f 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -26,36 +26,36 @@ #include -#include #include +#include #include #include "MEM_guardedalloc.h" #include "DNA_anim_types.h" #include "DNA_boid_types.h" -#include "DNA_particle_types.h" +#include "DNA_curve_types.h" +#include "DNA_listBase.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_object_force_types.h" #include "DNA_object_types.h" -#include "DNA_curve_types.h" +#include "DNA_particle_types.h" #include "DNA_scene_types.h" #include "DNA_texture_types.h" -#include "DNA_listBase.h" -#include "BLI_utildefines.h" -#include "BLI_edgehash.h" -#include "BLI_rand.h" -#include "BLI_math.h" #include "BLI_blenlib.h" -#include "BLI_kdtree.h" +#include "BLI_edgehash.h" #include "BLI_kdopbvh.h" +#include "BLI_kdtree.h" +#include "BLI_linklist.h" +#include "BLI_math.h" +#include "BLI_rand.h" +#include "BLI_string_utils.h" #include "BLI_task.h" #include "BLI_threads.h" -#include "BLI_linklist.h" -#include "BLI_string_utils.h" +#include "BLI_utildefines.h" #include "BKE_animsys.h" #include "BKE_boids.h" @@ -66,16 +66,16 @@ #include "BKE_lib_query.h" #include "BKE_particle.h" -#include "BKE_collection.h" -#include "BKE_object.h" -#include "BKE_material.h" +#include "BKE_bvhutils.h" #include "BKE_cloth.h" +#include "BKE_collection.h" #include "BKE_lattice.h" -#include "BKE_pointcache.h" +#include "BKE_material.h" #include "BKE_mesh.h" #include "BKE_modifier.h" +#include "BKE_object.h" +#include "BKE_pointcache.h" #include "BKE_scene.h" -#include "BKE_bvhutils.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_physics.h" diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c index ae20e5d023d..9a4ce8acb11 100644 --- a/source/blender/blenkernel/intern/pbvh.c +++ b/source/blender/blenkernel/intern/pbvh.c @@ -23,19 +23,19 @@ #include "BLI_utildefines.h" #include "BLI_bitmap.h" -#include "BLI_math.h" #include "BLI_ghash.h" -#include "BLI_task.h" +#include "BLI_math.h" #include "BLI_rand.h" +#include "BLI_task.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "BKE_pbvh.h" #include "BKE_ccg.h" -#include "BKE_subdiv_ccg.h" #include "BKE_mesh.h" /* for BKE_mesh_calc_normals */ #include "BKE_paint.h" +#include "BKE_pbvh.h" +#include "BKE_subdiv_ccg.h" #include "PIL_time.h" diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c index e30cf9a4a80..65820566fd5 100644 --- a/source/blender/blenkernel/intern/pbvh_bmesh.c +++ b/source/blender/blenkernel/intern/pbvh_bmesh.c @@ -20,15 +20,15 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_buffer.h" #include "BLI_ghash.h" #include "BLI_heap_simple.h" #include "BLI_math.h" #include "BLI_memarena.h" +#include "BLI_utildefines.h" -#include "BKE_ccg.h" #include "BKE_DerivedMesh.h" +#include "BKE_ccg.h" #include "BKE_pbvh.h" #include "GPU_buffers.h" diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 19d77fcd6db..76088867997 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -21,8 +21,8 @@ * \ingroup bke */ -#include #include +#include #include #include #include @@ -34,13 +34,13 @@ #include "DNA_ID.h" #include "DNA_collection_types.h" #include "DNA_dynamicpaint_types.h" +#include "DNA_fluid_types.h" #include "DNA_modifier_types.h" -#include "DNA_object_types.h" #include "DNA_object_force_types.h" +#include "DNA_object_types.h" #include "DNA_particle_types.h" #include "DNA_rigidbody_types.h" #include "DNA_scene_types.h" -#include "DNA_fluid_types.h" #include "BLI_blenlib.h" #include "BLI_math.h" @@ -51,11 +51,12 @@ #include "PIL_time.h" -#include "BKE_appdir.h" #include "BKE_anim.h" +#include "BKE_appdir.h" #include "BKE_cloth.h" #include "BKE_collection.h" #include "BKE_dynamicpaint.h" +#include "BKE_fluid.h" #include "BKE_global.h" #include "BKE_lib_id.h" #include "BKE_main.h" @@ -64,7 +65,6 @@ #include "BKE_particle.h" #include "BKE_pointcache.h" #include "BKE_scene.h" -#include "BKE_fluid.h" #include "BKE_softbody.h" #include "BIK_api.h" diff --git a/source/blender/blenkernel/intern/pointcloud.c b/source/blender/blenkernel/intern/pointcloud.c index cc68e93a116..2f346183873 100644 --- a/source/blender/blenkernel/intern/pointcloud.c +++ b/source/blender/blenkernel/intern/pointcloud.c @@ -36,8 +36,8 @@ #include "BKE_animsys.h" #include "BKE_customdata.h" -#include "BKE_idtype.h" #include "BKE_global.h" +#include "BKE_idtype.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_lib_remap.h" diff --git a/source/blender/blenkernel/intern/report.c b/source/blender/blenkernel/intern/report.c index 9719fda11cc..43ab1a71647 100644 --- a/source/blender/blenkernel/intern/report.c +++ b/source/blender/blenkernel/intern/report.c @@ -21,10 +21,10 @@ * \ingroup bke */ +#include #include #include #include -#include #include "MEM_guardedalloc.h" @@ -34,8 +34,8 @@ #include "BLT_translation.h" -#include "BKE_report.h" #include "BKE_global.h" /* G.background only */ +#include "BKE_report.h" const char *BKE_report_type_str(ReportType type) { diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c index 494c5e21613..f08de835a9d 100644 --- a/source/blender/blenkernel/intern/rigidbody.c +++ b/source/blender/blenkernel/intern/rigidbody.c @@ -22,19 +22,19 @@ * \brief Blender-side interface and methods for dealing with Rigid Body simulations */ +#include +#include +#include +#include #include #include -#include -#include -#include -#include #include "CLG_log.h" #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" #ifdef WITH_BULLET # include "RBI_api.h" @@ -44,8 +44,8 @@ #include "DNA_collection_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_object_types.h" #include "DNA_object_force_types.h" +#include "DNA_object_types.h" #include "DNA_rigidbody_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index ff0232ed9aa..23bd7ae3c8c 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -30,6 +30,8 @@ #include "DNA_anim_types.h" #include "DNA_collection_types.h" #include "DNA_curveprofile_types.h" +#include "DNA_defaults.h" +#include "DNA_gpencil_types.h" #include "DNA_linestyle_types.h" #include "DNA_mesh_types.h" #include "DNA_node_types.h" @@ -43,28 +45,27 @@ #include "DNA_view3d_types.h" #include "DNA_windowmanager_types.h" #include "DNA_workspace_types.h" -#include "DNA_gpencil_types.h" #include "DNA_world_types.h" -#include "DNA_defaults.h" -#include "BLI_math.h" -#include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BKE_callbacks.h" +#include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_string.h" #include "BLI_string_utils.h" -#include "BLI_threads.h" #include "BLI_task.h" +#include "BLI_threads.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" +#include "BKE_action.h" #include "BKE_anim.h" #include "BKE_animsys.h" -#include "BKE_action.h" #include "BKE_armature.h" #include "BKE_cachefile.h" #include "BKE_collection.h" #include "BKE_colortools.h" +#include "BKE_curveprofile.h" #include "BKE_editmesh.h" #include "BKE_fcurve.h" #include "BKE_freestyle.h" @@ -82,7 +83,6 @@ #include "BKE_node.h" #include "BKE_object.h" #include "BKE_paint.h" -#include "BKE_curveprofile.h" #include "BKE_rigidbody.h" #include "BKE_scene.h" #include "BKE_screen.h" diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c index 3815cb9f59a..dbf460fdea2 100644 --- a/source/blender/blenkernel/intern/screen.c +++ b/source/blender/blenkernel/intern/screen.c @@ -25,21 +25,21 @@ # include "BLI_winstuff.h" #endif -#include -#include #include +#include +#include #include "MEM_guardedalloc.h" +#include "DNA_defaults.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" #include "DNA_view3d_types.h" #include "DNA_workspace_types.h" -#include "DNA_defaults.h" -#include "BLI_math_vector.h" #include "BLI_listbase.h" +#include "BLI_math_vector.h" #include "BLI_rect.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/seqcache.c b/source/blender/blenkernel/intern/seqcache.c index 6b1538655d3..d48930e5665 100644 --- a/source/blender/blenkernel/intern/seqcache.c +++ b/source/blender/blenkernel/intern/seqcache.c @@ -20,34 +20,34 @@ * \ingroup bke */ -#include #include +#include #include #include "MEM_guardedalloc.h" -#include "DNA_sequence_types.h" #include "DNA_scene_types.h" +#include "DNA_sequence_types.h" #include "DNA_space_types.h" /* for FILE_MAX. */ +#include "IMB_colormanagement.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "IMB_colormanagement.h" -#include "BLI_mempool.h" -#include "BLI_threads.h" -#include "BLI_listbase.h" -#include "BLI_ghash.h" #include "BLI_blenlib.h" #include "BLI_endian_switch.h" #include "BLI_fileops.h" #include "BLI_fileops_types.h" +#include "BLI_ghash.h" +#include "BLI_listbase.h" +#include "BLI_mempool.h" #include "BLI_path_util.h" +#include "BLI_threads.h" #include "BKE_global.h" -#include "BKE_sequencer.h" -#include "BKE_scene.h" #include "BKE_main.h" +#include "BKE_scene.h" +#include "BKE_sequencer.h" /** * Sequencer Cache Design Notes diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c index 3f9cba4cfbc..70f92c6d6bd 100644 --- a/source/blender/blenkernel/intern/seqeffects.c +++ b/source/blender/blenkernel/intern/seqeffects.c @@ -24,22 +24,22 @@ * \ingroup bke */ -#include #include #include +#include #include "MEM_guardedalloc.h" #include "BLI_math.h" /* windows needs for M_PI */ +#include "BLI_path_util.h" +#include "BLI_rect.h" +#include "BLI_string.h" #include "BLI_threads.h" #include "BLI_utildefines.h" -#include "BLI_rect.h" -#include "BLI_path_util.h" -#include "BLI_string.h" +#include "DNA_anim_types.h" #include "DNA_scene_types.h" #include "DNA_sequence_types.h" -#include "DNA_anim_types.h" #include "DNA_space_types.h" #include "BKE_fcurve.h" @@ -47,9 +47,9 @@ #include "BKE_main.h" #include "BKE_sequencer.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_colormanagement.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_metadata.h" #include "BLI_math_color_blend.h" diff --git a/source/blender/blenkernel/intern/seqmodifier.c b/source/blender/blenkernel/intern/seqmodifier.c index 23ca6c95ffb..80ad8561333 100644 --- a/source/blender/blenkernel/intern/seqmodifier.c +++ b/source/blender/blenkernel/intern/seqmodifier.c @@ -27,23 +27,23 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_string.h" #include "BLI_string_utils.h" #include "BLI_utildefines.h" -#include "BLI_math.h" #include "BLT_translation.h" #include "DNA_mask_types.h" -#include "DNA_sequence_types.h" #include "DNA_scene_types.h" +#include "DNA_sequence_types.h" #include "BKE_colortools.h" #include "BKE_sequencer.h" +#include "IMB_colormanagement.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "IMB_colormanagement.h" static SequenceModifierTypeInfo *modifiersTypes[NUM_SEQUENCE_MODIFIER_TYPES]; static bool modifierTypesInit = false; diff --git a/source/blender/blenkernel/intern/seqprefetch.c b/source/blender/blenkernel/intern/seqprefetch.c index 915935addcd..8c7d119857a 100644 --- a/source/blender/blenkernel/intern/seqprefetch.c +++ b/source/blender/blenkernel/intern/seqprefetch.c @@ -27,11 +27,11 @@ #include "MEM_guardedalloc.h" -#include "DNA_sequence_types.h" +#include "DNA_anim_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" +#include "DNA_sequence_types.h" #include "DNA_windowmanager_types.h" -#include "DNA_anim_types.h" #include "BLI_listbase.h" #include "BLI_threads.h" @@ -40,12 +40,12 @@ #include "IMB_imbuf_types.h" #include "BKE_animsys.h" -#include "BKE_lib_id.h" -#include "BKE_scene.h" -#include "BKE_main.h" #include "BKE_context.h" -#include "BKE_sequencer.h" #include "BKE_layer.h" +#include "BKE_lib_id.h" +#include "BKE_main.h" +#include "BKE_scene.h" +#include "BKE_sequencer.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index b5e2b96d239..9fb28fe250a 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -31,19 +31,19 @@ #include "MEM_guardedalloc.h" -#include "DNA_sequence_types.h" -#include "DNA_movieclip_types.h" -#include "DNA_mask_types.h" -#include "DNA_scene_types.h" #include "DNA_anim_types.h" +#include "DNA_mask_types.h" +#include "DNA_movieclip_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" +#include "DNA_sequence_types.h" #include "DNA_sound_types.h" #include "DNA_space_types.h" -#include "BLI_math.h" #include "BLI_fileops.h" -#include "BLI_listbase.h" #include "BLI_linklist.h" +#include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_string_utf8.h" @@ -59,18 +59,18 @@ #include "BLT_translation.h" #include "BKE_animsys.h" +#include "BKE_fcurve.h" #include "BKE_global.h" +#include "BKE_idprop.h" #include "BKE_image.h" #include "BKE_layer.h" +#include "BKE_lib_id.h" #include "BKE_main.h" +#include "BKE_mask.h" +#include "BKE_movieclip.h" +#include "BKE_scene.h" #include "BKE_sequencer.h" #include "BKE_sequencer_offscreen.h" -#include "BKE_movieclip.h" -#include "BKE_fcurve.h" -#include "BKE_scene.h" -#include "BKE_mask.h" -#include "BKE_lib_id.h" -#include "BKE_idprop.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" @@ -81,9 +81,9 @@ #include +#include "IMB_colormanagement.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "IMB_colormanagement.h" #include "IMB_metadata.h" #include "BKE_context.h" diff --git a/source/blender/blenkernel/intern/shader_fx.c b/source/blender/blenkernel/intern/shader_fx.c index 49799aff1d6..8d692782413 100644 --- a/source/blender/blenkernel/intern/shader_fx.c +++ b/source/blender/blenkernel/intern/shader_fx.c @@ -26,23 +26,23 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math_vector.h" #include "BLI_string_utils.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" -#include "DNA_meshdata_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" #include "DNA_gpencil_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "DNA_shader_fx_types.h" +#include "BKE_gpencil.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" -#include "BKE_gpencil.h" -#include "BKE_shader_fx.h" #include "BKE_object.h" +#include "BKE_shader_fx.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index 59f576e27ff..06086cdf56a 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -21,37 +21,37 @@ * \ingroup bke */ -#include +#include #include #include #include #include +#include #include -#include -#include "DNA_object_types.h" -#include "DNA_modifier_types.h" -#include "DNA_meshdata_types.h" #include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_modifier_types.h" +#include "DNA_object_types.h" #include "BLI_math.h" -#include "BLI_utildefines.h" -#include "BLI_task.h" #include "BLI_math_solvers.h" +#include "BLI_task.h" +#include "BLI_utildefines.h" -#include "BKE_context.h" -#include "BKE_shrinkwrap.h" -#include "BKE_cdderivedmesh.h" #include "BKE_DerivedMesh.h" +#include "BKE_cdderivedmesh.h" +#include "BKE_context.h" #include "BKE_lattice.h" #include "BKE_lib_id.h" #include "BKE_modifier.h" +#include "BKE_shrinkwrap.h" #include "BKE_deform.h" #include "BKE_editmesh.h" #include "BKE_mesh.h" /* for OMP limits. */ -#include "BKE_subsurf.h" #include "BKE_mesh_runtime.h" +#include "BKE_subsurf.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 4eec5ac3605..c358dde449f 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -50,29 +50,29 @@ #include "DNA_collection_types.h" #include "DNA_curve_types.h" #include "DNA_lattice_types.h" -#include "DNA_meshdata_types.h" #include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_math.h" -#include "BLI_utildefines.h" -#include "BLI_listbase.h" #include "BLI_ghash.h" +#include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include "BKE_collection.h" #include "BKE_collision.h" #include "BKE_curve.h" +#include "BKE_deform.h" #include "BKE_effect.h" #include "BKE_global.h" #include "BKE_layer.h" -#include "BKE_modifier.h" -#include "BKE_softbody.h" -#include "BKE_pointcache.h" -#include "BKE_deform.h" #include "BKE_mesh.h" +#include "BKE_modifier.h" +#include "BKE_pointcache.h" #include "BKE_scene.h" +#include "BKE_softbody.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index 47b02654104..5aa445c2146 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -21,8 +21,8 @@ * \ingroup bke */ -#include #include +#include #include "MEM_guardedalloc.h" @@ -35,30 +35,30 @@ #include "DNA_anim_types.h" #include "DNA_object_types.h" -#include "DNA_scene_types.h" -#include "DNA_sequence_types.h" #include "DNA_packedFile_types.h" +#include "DNA_scene_types.h" #include "DNA_screen_types.h" +#include "DNA_sequence_types.h" #include "DNA_sound_types.h" #include "DNA_speaker_types.h" #include "DNA_windowmanager_types.h" #ifdef WITH_AUDASPACE -# include -# include -# include -# include # include "../../../intern/audaspace/intern/AUD_Set.h" +# include +# include +# include +# include #endif #include "BKE_global.h" #include "BKE_idtype.h" -#include "BKE_main.h" -#include "BKE_sound.h" #include "BKE_lib_id.h" +#include "BKE_main.h" #include "BKE_packedFile.h" -#include "BKE_sequencer.h" #include "BKE_scene.h" +#include "BKE_sequencer.h" +#include "BKE_sound.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/blenkernel/intern/speaker.c b/source/blender/blenkernel/intern/speaker.c index 64a9e8a42ee..d81ebe0fb64 100644 --- a/source/blender/blenkernel/intern/speaker.c +++ b/source/blender/blenkernel/intern/speaker.c @@ -18,10 +18,10 @@ * \ingroup bke */ +#include "DNA_defaults.h" #include "DNA_object_types.h" #include "DNA_sound_types.h" #include "DNA_speaker_types.h" -#include "DNA_defaults.h" #include "BLI_math.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/studiolight.c b/source/blender/blenkernel/intern/studiolight.c index 18d11e4d4c6..5cb4703bc46 100644 --- a/source/blender/blenkernel/intern/studiolight.c +++ b/source/blender/blenkernel/intern/studiolight.c @@ -29,8 +29,8 @@ #include "BLI_dynstr.h" #include "BLI_fileops.h" #include "BLI_fileops_types.h" -#include "BLI_listbase.h" #include "BLI_linklist.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_math_color.h" #include "BLI_path_util.h" diff --git a/source/blender/blenkernel/intern/subdiv_converter_mesh.c b/source/blender/blenkernel/intern/subdiv_converter_mesh.c index 60f80628f5a..a078648e68b 100644 --- a/source/blender/blenkernel/intern/subdiv_converter_mesh.c +++ b/source/blender/blenkernel/intern/subdiv_converter_mesh.c @@ -28,8 +28,8 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "BLI_utildefines.h" #include "BLI_bitmap.h" +#include "BLI_utildefines.h" #include "BKE_customdata.h" #include "BKE_mesh_mapping.h" diff --git a/source/blender/blenkernel/intern/subdiv_deform.c b/source/blender/blenkernel/intern/subdiv_deform.c index a686c44bf13..b5fd3ae63eb 100644 --- a/source/blender/blenkernel/intern/subdiv_deform.c +++ b/source/blender/blenkernel/intern/subdiv_deform.c @@ -28,8 +28,8 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "BLI_utildefines.h" #include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "BKE_customdata.h" #include "BKE_subdiv.h" diff --git a/source/blender/blenkernel/intern/subdiv_displacement_multires.c b/source/blender/blenkernel/intern/subdiv_displacement_multires.c index 50b2b3c7c46..617f37834f9 100644 --- a/source/blender/blenkernel/intern/subdiv_displacement_multires.c +++ b/source/blender/blenkernel/intern/subdiv_displacement_multires.c @@ -28,8 +28,8 @@ #include "DNA_modifier_types.h" #include "DNA_object_types.h" -#include "BLI_utildefines.h" #include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "BKE_customdata.h" #include "BKE_multires.h" diff --git a/source/blender/blenkernel/intern/subdiv_eval.c b/source/blender/blenkernel/intern/subdiv_eval.c index 726fde3e6bd..78e0e42753a 100644 --- a/source/blender/blenkernel/intern/subdiv_eval.c +++ b/source/blender/blenkernel/intern/subdiv_eval.c @@ -26,9 +26,9 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "BLI_utildefines.h" #include "BLI_bitmap.h" #include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "BKE_customdata.h" #include "BKE_subdiv.h" diff --git a/source/blender/blenkernel/intern/subdiv_foreach.c b/source/blender/blenkernel/intern/subdiv_foreach.c index 347e2843423..533279f4425 100644 --- a/source/blender/blenkernel/intern/subdiv_foreach.c +++ b/source/blender/blenkernel/intern/subdiv_foreach.c @@ -25,16 +25,16 @@ #include "atomic_ops.h" +#include "DNA_key_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_key_types.h" #include "BLI_bitmap.h" #include "BLI_task.h" #include "BKE_customdata.h" -#include "BKE_mesh.h" #include "BKE_key.h" +#include "BKE_mesh.h" #include "BKE_subdiv.h" #include "BKE_subdiv_mesh.h" diff --git a/source/blender/blenkernel/intern/subdiv_mesh.c b/source/blender/blenkernel/intern/subdiv_mesh.c index 6c9cd72363a..0bd6fc259c6 100644 --- a/source/blender/blenkernel/intern/subdiv_mesh.c +++ b/source/blender/blenkernel/intern/subdiv_mesh.c @@ -25,16 +25,16 @@ #include "atomic_ops.h" +#include "DNA_key_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_key_types.h" #include "BLI_alloca.h" #include "BLI_math_vector.h" #include "BKE_customdata.h" -#include "BKE_mesh.h" #include "BKE_key.h" +#include "BKE_mesh.h" #include "BKE_subdiv.h" #include "BKE_subdiv_eval.h" #include "BKE_subdiv_foreach.h" diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index da3c03cf705..c21d640a4c1 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -28,11 +28,11 @@ # define USE_DYNSIZE #endif +#include +#include +#include #include #include -#include -#include -#include #include "atomic_ops.h" @@ -44,7 +44,6 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_utildefines.h" #include "BLI_bitmap.h" #include "BLI_blenlib.h" #include "BLI_edgehash.h" @@ -52,8 +51,8 @@ #include "BLI_memarena.h" #include "BLI_task.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" -#include "BKE_pbvh.h" #include "BKE_ccg.h" #include "BKE_cdderivedmesh.h" #include "BKE_mesh.h" @@ -62,6 +61,7 @@ #include "BKE_multires.h" #include "BKE_object.h" #include "BKE_paint.h" +#include "BKE_pbvh.h" #include "BKE_scene.h" #include "BKE_subsurf.h" diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index 847cd6841fe..94c41777cea 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -23,37 +23,37 @@ #include /* abort */ #include /* strstr */ -#include #include +#include #include #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" +#include "BLI_fileops.h" +#include "BLI_listbase.h" #include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_string_cursor_utf8.h" #include "BLI_string_utf8.h" -#include "BLI_listbase.h" -#include "BLI_fileops.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" #include "DNA_constraint_types.h" +#include "DNA_material_types.h" +#include "DNA_node_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" #include "DNA_text_types.h" #include "DNA_userdef_types.h" -#include "DNA_object_types.h" -#include "DNA_node_types.h" -#include "DNA_material_types.h" #include "BKE_idtype.h" #include "BKE_lib_id.h" #include "BKE_main.h" -#include "BKE_text.h" #include "BKE_node.h" +#include "BKE_text.h" #ifdef WITH_PYTHON # include "BPY_extern.h" diff --git a/source/blender/blenkernel/intern/text_suggestions.c b/source/blender/blenkernel/intern/text_suggestions.c index 64087369173..6df1aff722b 100644 --- a/source/blender/blenkernel/intern/text_suggestions.c +++ b/source/blender/blenkernel/intern/text_suggestions.c @@ -21,16 +21,16 @@ * \ingroup bke */ +#include #include #include -#include #include "MEM_guardedalloc.h" #include "BLI_string.h" -#include "DNA_text_types.h" #include "BKE_text_suggestions.h" /* Own include. */ +#include "DNA_text_types.h" /**********************/ /* Static definitions */ diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index 6c4e19cb068..67f9bcf008c 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -21,46 +21,46 @@ * \ingroup bke */ +#include #include #include #include -#include #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_kdopbvh.h" -#include "BLI_utildefines.h" +#include "BLI_math.h" #include "BLI_math_color.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" -#include "DNA_key_types.h" -#include "DNA_object_types.h" -#include "DNA_material_types.h" #include "DNA_brush_types.h" -#include "DNA_node_types.h" #include "DNA_color_types.h" -#include "DNA_particle_types.h" -#include "DNA_linestyle_types.h" #include "DNA_defaults.h" +#include "DNA_key_types.h" +#include "DNA_linestyle_types.h" +#include "DNA_material_types.h" +#include "DNA_node_types.h" +#include "DNA_object_types.h" +#include "DNA_particle_types.h" #include "IMB_imbuf.h" #include "BKE_main.h" -#include "BKE_colorband.h" -#include "BKE_idtype.h" -#include "BKE_lib_id.h" -#include "BKE_image.h" -#include "BKE_material.h" -#include "BKE_texture.h" -#include "BKE_key.h" -#include "BKE_icons.h" -#include "BKE_node.h" #include "BKE_animsys.h" +#include "BKE_colorband.h" #include "BKE_colortools.h" +#include "BKE_icons.h" +#include "BKE_idtype.h" +#include "BKE_image.h" +#include "BKE_key.h" +#include "BKE_lib_id.h" +#include "BKE_material.h" +#include "BKE_node.h" #include "BKE_scene.h" +#include "BKE_texture.h" #include "RE_shader_ext.h" diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index a9bd1d17567..0204667b3bd 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -21,42 +21,42 @@ * \ingroup bke */ -#include #include #include #include +#include #include "MEM_guardedalloc.h" #include "DNA_anim_types.h" -#include "DNA_gpencil_types.h" #include "DNA_camera_types.h" +#include "DNA_gpencil_types.h" #include "DNA_movieclip_types.h" #include "DNA_object_types.h" /* SELECT */ #include "DNA_scene_types.h" -#include "BLI_utildefines.h" #include "BLI_bitmap_draw_2d.h" #include "BLI_ghash.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_math_base.h" -#include "BLI_listbase.h" #include "BLI_string.h" #include "BLI_string_utils.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" #include "BKE_fcurve.h" -#include "BKE_tracking.h" +#include "BKE_layer.h" #include "BKE_lib_id.h" #include "BKE_movieclip.h" #include "BKE_object.h" #include "BKE_scene.h" -#include "BKE_layer.h" +#include "BKE_tracking.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "RNA_access.h" diff --git a/source/blender/blenkernel/intern/tracking_auto.c b/source/blender/blenkernel/intern/tracking_auto.c index 9d8395defcd..e7a98ba1c3f 100644 --- a/source/blender/blenkernel/intern/tracking_auto.c +++ b/source/blender/blenkernel/intern/tracking_auto.c @@ -21,19 +21,19 @@ * \ingroup bke */ -#include #include "atomic_ops.h" +#include #include "MEM_guardedalloc.h" #include "DNA_movieclip_types.h" #include "DNA_object_types.h" /* SELECT */ -#include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_task.h" #include "BLI_threads.h" -#include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_movieclip.h" #include "BKE_tracking.h" diff --git a/source/blender/blenkernel/intern/tracking_plane_tracker.c b/source/blender/blenkernel/intern/tracking_plane_tracker.c index e0e8a68bb1e..b787cd366c5 100644 --- a/source/blender/blenkernel/intern/tracking_plane_tracker.c +++ b/source/blender/blenkernel/intern/tracking_plane_tracker.c @@ -27,8 +27,8 @@ #include "DNA_movieclip_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_tracking.h" diff --git a/source/blender/blenkernel/intern/tracking_region_tracker.c b/source/blender/blenkernel/intern/tracking_region_tracker.c index 967642c03a8..6e8d4146d12 100644 --- a/source/blender/blenkernel/intern/tracking_region_tracker.c +++ b/source/blender/blenkernel/intern/tracking_region_tracker.c @@ -28,14 +28,14 @@ #include "DNA_movieclip_types.h" -#include "BLI_utildefines.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" -#include "BKE_tracking.h" #include "BKE_movieclip.h" +#include "BKE_tracking.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "libmv-capi.h" #include "tracking_private.h" diff --git a/source/blender/blenkernel/intern/tracking_solver.c b/source/blender/blenkernel/intern/tracking_solver.c index 3a82e375b0b..5c1f6caad9d 100644 --- a/source/blender/blenkernel/intern/tracking_solver.c +++ b/source/blender/blenkernel/intern/tracking_solver.c @@ -30,16 +30,16 @@ #include "DNA_anim_types.h" #include "DNA_movieclip_types.h" -#include "BLI_utildefines.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" #include "BKE_fcurve.h" -#include "BKE_tracking.h" #include "BKE_movieclip.h" +#include "BKE_tracking.h" #include "RNA_access.h" diff --git a/source/blender/blenkernel/intern/tracking_stabilize.c b/source/blender/blenkernel/intern/tracking_stabilize.c index 32e7233060c..dffc703c943 100644 --- a/source/blender/blenkernel/intern/tracking_stabilize.c +++ b/source/blender/blenkernel/intern/tracking_stabilize.c @@ -25,26 +25,26 @@ #include +#include "DNA_anim_types.h" #include "DNA_movieclip_types.h" #include "DNA_scene_types.h" -#include "DNA_anim_types.h" #include "RNA_access.h" -#include "BLI_utildefines.h" -#include "BLI_sort_utils.h" #include "BLI_ghash.h" -#include "BLI_math_vector.h" #include "BLI_listbase.h" #include "BLI_math.h" +#include "BLI_math_vector.h" +#include "BLI_sort_utils.h" #include "BLI_task.h" +#include "BLI_utildefines.h" -#include "BKE_tracking.h" -#include "BKE_movieclip.h" #include "BKE_fcurve.h" +#include "BKE_movieclip.h" +#include "BKE_tracking.h" -#include "MEM_guardedalloc.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" +#include "MEM_guardedalloc.h" /* == Parameterization constants == */ diff --git a/source/blender/blenkernel/intern/tracking_util.c b/source/blender/blenkernel/intern/tracking_util.c index ada6ce96d58..51758abdf3f 100644 --- a/source/blender/blenkernel/intern/tracking_util.c +++ b/source/blender/blenkernel/intern/tracking_util.c @@ -30,20 +30,20 @@ #include "DNA_movieclip_types.h" -#include "BLI_utildefines.h" -#include "BLI_math.h" -#include "BLI_listbase.h" #include "BLI_ghash.h" +#include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_string.h" #include "BLI_string_utils.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" #include "BKE_movieclip.h" #include "BKE_tracking.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_moviecache.h" #include "tracking_private.h" diff --git a/source/blender/blenkernel/intern/undo_system.c b/source/blender/blenkernel/intern/undo_system.c index 30867cc15e9..6d484a7b702 100644 --- a/source/blender/blenkernel/intern/undo_system.c +++ b/source/blender/blenkernel/intern/undo_system.c @@ -24,10 +24,10 @@ #include "CLG_log.h" -#include "BLI_utildefines.h" -#include "BLI_sys_types.h" #include "BLI_listbase.h" #include "BLI_string.h" +#include "BLI_sys_types.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c index ac1b5e4ab0b..3f44c13ba19 100644 --- a/source/blender/blenkernel/intern/unit.c +++ b/source/blender/blenkernel/intern/unit.c @@ -18,16 +18,16 @@ * \ingroup bke */ -#include -#include -#include -#include #include +#include +#include +#include +#include -#include "BLI_sys_types.h" #include "BLI_math.h" #include "BLI_string.h" #include "BLI_string_utf8.h" +#include "BLI_sys_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc index 6fb44e91388..b16fe3b7524 100644 --- a/source/blender/blenkernel/intern/volume.cc +++ b/source/blender/blenkernel/intern/volume.cc @@ -38,8 +38,8 @@ #include "BLI_utildefines.h" #include "BKE_animsys.h" -#include "BKE_idtype.h" #include "BKE_global.h" +#include "BKE_idtype.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_lib_remap.h" diff --git a/source/blender/blenkernel/intern/workspace.c b/source/blender/blenkernel/intern/workspace.c index 8fff2e60594..66a3c2cdced 100644 --- a/source/blender/blenkernel/intern/workspace.c +++ b/source/blender/blenkernel/intern/workspace.c @@ -21,10 +21,10 @@ #include #include -#include "BLI_utildefines.h" +#include "BLI_listbase.h" #include "BLI_string.h" #include "BLI_string_utils.h" -#include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -33,8 +33,8 @@ #include "BKE_idtype.h" #include "BKE_lib_id.h" #include "BKE_main.h" -#include "BKE_scene.h" #include "BKE_object.h" +#include "BKE_scene.h" #include "BKE_workspace.h" #include "DNA_object_types.h" diff --git a/source/blender/blenkernel/intern/world.c b/source/blender/blenkernel/intern/world.c index a3505869308..3492a35b242 100644 --- a/source/blender/blenkernel/intern/world.c +++ b/source/blender/blenkernel/intern/world.c @@ -21,19 +21,19 @@ * \ingroup bke */ -#include -#include #include +#include +#include #include "MEM_guardedalloc.h" -#include "DNA_world_types.h" +#include "DNA_defaults.h" #include "DNA_scene_types.h" #include "DNA_texture_types.h" -#include "DNA_defaults.h" +#include "DNA_world_types.h" -#include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "BKE_animsys.h" #include "BKE_icons.h" diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index 7e5d99617e4..16e56200131 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -20,8 +20,8 @@ */ #ifdef WITH_FFMPEG -# include # include +# include # include @@ -52,8 +52,8 @@ /* This needs to be included after BLI_math_base.h otherwise it will redefine some math defines * like M_SQRT1_2 leading to warnings with MSVC */ -# include # include +# include # include # include # include diff --git a/source/blender/blenkernel/nla_private.h b/source/blender/blenkernel/nla_private.h index 9a9dae5576b..c72747a8c51 100644 --- a/source/blender/blenkernel/nla_private.h +++ b/source/blender/blenkernel/nla_private.h @@ -24,9 +24,9 @@ #ifndef __NLA_PRIVATE_H__ #define __NLA_PRIVATE_H__ -#include "RNA_types.h" #include "BLI_bitmap.h" #include "BLI_ghash.h" +#include "RNA_types.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/blenlib/BLI_allocator.h b/source/blender/blenlib/BLI_allocator.h index 075c181833c..e2d39c4e897 100644 --- a/source/blender/blenlib/BLI_allocator.h +++ b/source/blender/blenlib/BLI_allocator.h @@ -29,13 +29,13 @@ * job good enough. */ -#include #include +#include #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_math_base.h" +#include "BLI_utildefines.h" namespace BLI { diff --git a/source/blender/blenlib/BLI_array_cxx.h b/source/blender/blenlib/BLI_array_cxx.h index adb00c95f28..8fc2aec6698 100644 --- a/source/blender/blenlib/BLI_array_cxx.h +++ b/source/blender/blenlib/BLI_array_cxx.h @@ -23,11 +23,11 @@ * a template argument. Instead it can be specified at the construction time. */ -#include "BLI_utildefines.h" #include "BLI_allocator.h" #include "BLI_array_ref.h" -#include "BLI_memory_utils_cxx.h" #include "BLI_index_range.h" +#include "BLI_memory_utils_cxx.h" +#include "BLI_utildefines.h" namespace BLI { diff --git a/source/blender/blenlib/BLI_array_ref.h b/source/blender/blenlib/BLI_array_ref.h index 6cc96cedc83..2c2e441a47d 100644 --- a/source/blender/blenlib/BLI_array_ref.h +++ b/source/blender/blenlib/BLI_array_ref.h @@ -35,15 +35,15 @@ * Since array references do not own any memory, it is generally not save to store them. */ -#include -#include #include +#include #include #include +#include -#include "BLI_utildefines.h" -#include "BLI_memory_utils_cxx.h" #include "BLI_index_range.h" +#include "BLI_memory_utils_cxx.h" +#include "BLI_utildefines.h" namespace BLI { diff --git a/source/blender/blenlib/BLI_hash_cxx.h b/source/blender/blenlib/BLI_hash_cxx.h index a369774a471..22941a792ba 100644 --- a/source/blender/blenlib/BLI_hash_cxx.h +++ b/source/blender/blenlib/BLI_hash_cxx.h @@ -25,12 +25,12 @@ */ #include +#include #include #include -#include -#include "BLI_utildefines.h" #include "BLI_math_base.h" +#include "BLI_utildefines.h" namespace BLI { diff --git a/source/blender/blenlib/BLI_index_range.h b/source/blender/blenlib/BLI_index_range.h index f67cc259227..4553c996454 100644 --- a/source/blender/blenlib/BLI_index_range.h +++ b/source/blender/blenlib/BLI_index_range.h @@ -25,8 +25,8 @@ * cases, a separate data structure should be used. */ -#include #include +#include #include #include "BLI_utildefines.h" diff --git a/source/blender/blenlib/BLI_map.h b/source/blender/blenlib/BLI_map.h index 6971f9d362e..4b7ac0791d9 100644 --- a/source/blender/blenlib/BLI_map.h +++ b/source/blender/blenlib/BLI_map.h @@ -26,8 +26,8 @@ * lookups. Keys and values are stored in groups of four to avoid wasting memory due to padding. */ -#include "BLI_hash_cxx.h" #include "BLI_array_ref.h" +#include "BLI_hash_cxx.h" #include "BLI_open_addressing.h" namespace BLI { diff --git a/source/blender/blenlib/BLI_math.h b/source/blender/blenlib/BLI_math.h index c19fb7e0e85..f8de8b7ed53 100644 --- a/source/blender/blenlib/BLI_math.h +++ b/source/blender/blenlib/BLI_math.h @@ -66,12 +66,12 @@ #include "BLI_math_base.h" #include "BLI_math_color.h" -#include "BLI_math_matrix.h" -#include "BLI_math_rotation.h" -#include "BLI_math_vector.h" #include "BLI_math_geom.h" #include "BLI_math_interp.h" +#include "BLI_math_matrix.h" +#include "BLI_math_rotation.h" #include "BLI_math_solvers.h" #include "BLI_math_statistics.h" +#include "BLI_math_vector.h" #endif /* __BLI_MATH_H__ */ diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h index ef76958f269..7a9d17d2b05 100644 --- a/source/blender/blenlib/BLI_math_base.h +++ b/source/blender/blenlib/BLI_math_base.h @@ -31,9 +31,9 @@ # define _USE_MATH_DEFINES #endif -#include #include "BLI_assert.h" #include "BLI_math_inline.h" +#include #ifndef M_PI # define M_PI 3.14159265358979323846 /* pi */ diff --git a/source/blender/blenlib/BLI_memiter.h b/source/blender/blenlib/BLI_memiter.h index 9f5be292dd8..fb4a79a491b 100644 --- a/source/blender/blenlib/BLI_memiter.h +++ b/source/blender/blenlib/BLI_memiter.h @@ -25,9 +25,9 @@ extern "C" { #endif -#include "BLI_sys_types.h" #include "BLI_compiler_attrs.h" #include "BLI_compiler_compat.h" +#include "BLI_sys_types.h" /* 512kb, good default for small elems. */ #define BLI_MEMITER_DEFAULT_SIZE (1 << 19) diff --git a/source/blender/blenlib/BLI_memory_utils_cxx.h b/source/blender/blenlib/BLI_memory_utils_cxx.h index 35b08f804cb..6534138315d 100644 --- a/source/blender/blenlib/BLI_memory_utils_cxx.h +++ b/source/blender/blenlib/BLI_memory_utils_cxx.h @@ -21,8 +21,8 @@ * \ingroup bli */ -#include #include +#include #include "BLI_utildefines.h" diff --git a/source/blender/blenlib/BLI_open_addressing.h b/source/blender/blenlib/BLI_open_addressing.h index a238902c631..6a0acd418eb 100644 --- a/source/blender/blenlib/BLI_open_addressing.h +++ b/source/blender/blenlib/BLI_open_addressing.h @@ -33,10 +33,10 @@ #include -#include "BLI_utildefines.h" -#include "BLI_memory_utils_cxx.h" -#include "BLI_math_base.h" #include "BLI_allocator.h" +#include "BLI_math_base.h" +#include "BLI_memory_utils_cxx.h" +#include "BLI_utildefines.h" namespace BLI { diff --git a/source/blender/blenlib/BLI_optional.h b/source/blender/blenlib/BLI_optional.h index 90bded604ea..267c858e0f2 100644 --- a/source/blender/blenlib/BLI_optional.h +++ b/source/blender/blenlib/BLI_optional.h @@ -23,8 +23,8 @@ #ifndef __BLI_OPTIONAL_H__ #define __BLI_OPTIONAL_H__ -#include "BLI_utildefines.h" #include "BLI_memory_utils_cxx.h" +#include "BLI_utildefines.h" #include #include diff --git a/source/blender/blenlib/BLI_rect.h b/source/blender/blenlib/BLI_rect.h index 2b11213d351..b1faae03583 100644 --- a/source/blender/blenlib/BLI_rect.h +++ b/source/blender/blenlib/BLI_rect.h @@ -24,9 +24,9 @@ * \ingroup bli */ -#include "DNA_vec_types.h" -#include "BLI_sys_types.h" /* bool */ #include "BLI_compiler_compat.h" +#include "BLI_sys_types.h" /* bool */ +#include "DNA_vec_types.h" struct rctf; struct rcti; diff --git a/source/blender/blenlib/BLI_string.h b/source/blender/blenlib/BLI_string.h index 7c8290439c6..6d3f38c7a52 100644 --- a/source/blender/blenlib/BLI_string.h +++ b/source/blender/blenlib/BLI_string.h @@ -24,8 +24,8 @@ * \ingroup bli */ -#include #include +#include #ifdef __cplusplus extern "C" { diff --git a/source/blender/blenlib/BLI_string_map.h b/source/blender/blenlib/BLI_string_map.h index 2f09e489a7a..ed97a6ae349 100644 --- a/source/blender/blenlib/BLI_string_map.h +++ b/source/blender/blenlib/BLI_string_map.h @@ -28,9 +28,9 @@ * a special map with string keys can be quite handy. */ #include "BLI_map.h" +#include "BLI_optional.h" #include "BLI_string_ref.h" #include "BLI_vector.h" -#include "BLI_optional.h" namespace BLI { diff --git a/source/blender/blenlib/BLI_string_ref.h b/source/blender/blenlib/BLI_string_ref.h index 54c2f0e7209..2389542bcea 100644 --- a/source/blender/blenlib/BLI_string_ref.h +++ b/source/blender/blenlib/BLI_string_ref.h @@ -29,11 +29,11 @@ */ #include -#include #include +#include -#include "BLI_utildefines.h" #include "BLI_array_ref.h" +#include "BLI_utildefines.h" namespace BLI { diff --git a/source/blender/blenlib/BLI_sys_types.h b/source/blender/blenlib/BLI_sys_types.h index 354d27385a2..b9e799aa2a9 100644 --- a/source/blender/blenlib/BLI_sys_types.h +++ b/source/blender/blenlib/BLI_sys_types.h @@ -64,13 +64,13 @@ typedef uint64_t u_int64_t; #else /* FreeBSD, Solaris */ -# include # include +# include #endif /* ifdef platform for types */ -#include /* size_t define */ #include +#include /* size_t define */ #ifndef __cplusplus # if defined(__APPLE__) diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h index 3565b6fb26b..fb5dbf66819 100644 --- a/source/blender/blenlib/BLI_utildefines.h +++ b/source/blender/blenlib/BLI_utildefines.h @@ -29,8 +29,8 @@ extern "C" { #endif /* avoid many includes for now */ -#include "BLI_sys_types.h" #include "BLI_compiler_compat.h" +#include "BLI_sys_types.h" #include "BLI_utildefines_variadic.h" /* We could remove in future. */ diff --git a/source/blender/blenlib/BLI_vector.h b/source/blender/blenlib/BLI_vector.h index 60251347795..6a708759d0e 100644 --- a/source/blender/blenlib/BLI_vector.h +++ b/source/blender/blenlib/BLI_vector.h @@ -31,13 +31,13 @@ #include #include -#include "BLI_utildefines.h" -#include "BLI_memory_utils_cxx.h" +#include "BLI_allocator.h" #include "BLI_array_ref.h" +#include "BLI_index_range.h" #include "BLI_listbase_wrapper.h" #include "BLI_math_base.h" -#include "BLI_allocator.h" -#include "BLI_index_range.h" +#include "BLI_memory_utils_cxx.h" +#include "BLI_utildefines.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/blenlib/PIL_time_utildefines.h b/source/blender/blenlib/PIL_time_utildefines.h index 198b6d1bb21..ffe753badf8 100644 --- a/source/blender/blenlib/PIL_time_utildefines.h +++ b/source/blender/blenlib/PIL_time_utildefines.h @@ -25,8 +25,8 @@ #ifndef __PIL_TIME_UTILDEFINES_H__ #define __PIL_TIME_UTILDEFINES_H__ -#include "PIL_time.h" /* for PIL_check_seconds_timer */ #include "BLI_utildefines.h" /* for AT */ +#include "PIL_time.h" /* for PIL_check_seconds_timer */ #define TIMEIT_START(var) \ { \ diff --git a/source/blender/blenlib/intern/BLI_args.c b/source/blender/blenlib/intern/BLI_args.c index 8f282373cf5..2b078b3bae5 100644 --- a/source/blender/blenlib/intern/BLI_args.c +++ b/source/blender/blenlib/intern/BLI_args.c @@ -27,11 +27,11 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_listbase.h" -#include "BLI_string.h" #include "BLI_args.h" #include "BLI_ghash.h" +#include "BLI_listbase.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" static char NO_DOCS[] = "NO DOCUMENTATION SPECIFIED"; diff --git a/source/blender/blenlib/intern/BLI_dynstr.c b/source/blender/blenlib/intern/BLI_dynstr.c index c325c010330..3e80f791fa5 100644 --- a/source/blender/blenlib/intern/BLI_dynstr.c +++ b/source/blender/blenlib/intern/BLI_dynstr.c @@ -25,11 +25,11 @@ #include /* malloc */ #include -#include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" +#include "BLI_dynstr.h" #include "BLI_memarena.h" #include "BLI_string.h" -#include "BLI_dynstr.h" +#include "BLI_utildefines.h" +#include "MEM_guardedalloc.h" #ifdef _WIN32 # ifndef vsnprintf diff --git a/source/blender/blenlib/intern/BLI_filelist.c b/source/blender/blenlib/intern/BLI_filelist.c index a3b745fd63e..2e402f0c063 100644 --- a/source/blender/blenlib/intern/BLI_filelist.c +++ b/source/blender/blenlib/intern/BLI_filelist.c @@ -18,27 +18,27 @@ * \ingroup bli */ -#include #include #include +#include #ifndef WIN32 # include #endif -#include -#include #include /* strcpy etc.. */ +#include +#include #ifdef WIN32 -# include -# include # include "BLI_winstuff.h" # include "utfconv.h" +# include +# include #else +# include # include # include -# include #endif /* lib includes */ @@ -46,11 +46,11 @@ #include "DNA_listBase.h" -#include "BLI_listbase.h" -#include "BLI_string.h" #include "BLI_fileops.h" #include "BLI_fileops_types.h" +#include "BLI_listbase.h" #include "BLI_path_util.h" +#include "BLI_string.h" #include "../imbuf/IMB_imbuf.h" diff --git a/source/blender/blenlib/intern/BLI_ghash.c b/source/blender/blenlib/intern/BLI_ghash.c index 64863cac15f..0800027e520 100644 --- a/source/blender/blenlib/intern/BLI_ghash.c +++ b/source/blender/blenlib/intern/BLI_ghash.c @@ -24,16 +24,16 @@ * for 'Abstract Data Types' (known as an ADT Hash Table). */ -#include -#include -#include #include +#include +#include +#include #include "MEM_guardedalloc.h" +#include "BLI_mempool.h" #include "BLI_sys_types.h" /* for intptr_t support */ #include "BLI_utildefines.h" -#include "BLI_mempool.h" #define GHASH_INTERNAL_API #include "BLI_ghash.h" /* own include */ diff --git a/source/blender/blenlib/intern/BLI_ghash_utils.c b/source/blender/blenlib/intern/BLI_ghash_utils.c index abe5970b9a6..83bf0373ae7 100644 --- a/source/blender/blenlib/intern/BLI_ghash_utils.c +++ b/source/blender/blenlib/intern/BLI_ghash_utils.c @@ -28,9 +28,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_hash_mm2a.h" #include "BLI_ghash.h" /* own include */ +#include "BLI_hash_mm2a.h" +#include "BLI_utildefines.h" /* keep last */ #include "BLI_strict_flags.h" diff --git a/source/blender/blenlib/intern/BLI_heap.c b/source/blender/blenlib/intern/BLI_heap.c index 88b7f83385c..f8d78213980 100644 --- a/source/blender/blenlib/intern/BLI_heap.c +++ b/source/blender/blenlib/intern/BLI_heap.c @@ -25,9 +25,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_heap.h" #include "BLI_strict_flags.h" +#include "BLI_utildefines.h" /***/ diff --git a/source/blender/blenlib/intern/BLI_heap_simple.c b/source/blender/blenlib/intern/BLI_heap_simple.c index 6b27799b808..a7a71512875 100644 --- a/source/blender/blenlib/intern/BLI_heap_simple.c +++ b/source/blender/blenlib/intern/BLI_heap_simple.c @@ -29,9 +29,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_heap_simple.h" #include "BLI_strict_flags.h" +#include "BLI_utildefines.h" #define HEAP_PARENT(i) (((i)-1) >> 1) diff --git a/source/blender/blenlib/intern/BLI_index_range.cc b/source/blender/blenlib/intern/BLI_index_range.cc index 6421eb0794b..90eb4e4a89c 100644 --- a/source/blender/blenlib/intern/BLI_index_range.cc +++ b/source/blender/blenlib/intern/BLI_index_range.cc @@ -17,9 +17,9 @@ #include #include -#include "BLI_index_range.h" -#include "BLI_array_ref.h" #include "BLI_array_cxx.h" +#include "BLI_array_ref.h" +#include "BLI_index_range.h" #include "BLI_vector.h" namespace BLI { diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c index 50381f2fb18..3a07cef7cac 100644 --- a/source/blender/blenlib/intern/BLI_kdopbvh.c +++ b/source/blender/blenlib/intern/BLI_kdopbvh.c @@ -42,13 +42,13 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_alloca.h" -#include "BLI_stack.h" +#include "BLI_heap_simple.h" #include "BLI_kdopbvh.h" #include "BLI_math.h" +#include "BLI_stack.h" #include "BLI_task.h" -#include "BLI_heap_simple.h" +#include "BLI_utildefines.h" #include "BLI_strict_flags.h" diff --git a/source/blender/blenlib/intern/BLI_linklist.c b/source/blender/blenlib/intern/BLI_linklist.c index 0fe9fd62198..5020e06d0b3 100644 --- a/source/blender/blenlib/intern/BLI_linklist.c +++ b/source/blender/blenlib/intern/BLI_linklist.c @@ -30,10 +30,10 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_linklist.h" #include "BLI_memarena.h" #include "BLI_mempool.h" +#include "BLI_utildefines.h" #include "BLI_strict_flags.h" diff --git a/source/blender/blenlib/intern/BLI_memarena.c b/source/blender/blenlib/intern/BLI_memarena.c index b20a0eafd74..fd2367aa992 100644 --- a/source/blender/blenlib/intern/BLI_memarena.c +++ b/source/blender/blenlib/intern/BLI_memarena.c @@ -34,9 +34,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_memarena.h" #include "BLI_strict_flags.h" +#include "BLI_utildefines.h" #ifdef WITH_MEM_VALGRIND # include "valgrind/memcheck.h" diff --git a/source/blender/blenlib/intern/BLI_memblock.c b/source/blender/blenlib/intern/BLI_memblock.c index b532202ebaa..2fbdfbe8a95 100644 --- a/source/blender/blenlib/intern/BLI_memblock.c +++ b/source/blender/blenlib/intern/BLI_memblock.c @@ -24,8 +24,8 @@ * */ -#include #include +#include #include "atomic_ops.h" diff --git a/source/blender/blenlib/intern/BLI_memiter.c b/source/blender/blenlib/intern/BLI_memiter.c index 4027a62bbcc..017f08f8d35 100644 --- a/source/blender/blenlib/intern/BLI_memiter.c +++ b/source/blender/blenlib/intern/BLI_memiter.c @@ -37,8 +37,8 @@ * but tests show this doesn't give noticeable speedup. */ -#include #include +#include #include "BLI_utildefines.h" diff --git a/source/blender/blenlib/intern/BLI_mempool.c b/source/blender/blenlib/intern/BLI_mempool.c index 4182aab2190..e5868abbe2c 100644 --- a/source/blender/blenlib/intern/BLI_mempool.c +++ b/source/blender/blenlib/intern/BLI_mempool.c @@ -29,8 +29,8 @@ * (optionally when using the #BLI_MEMPOOL_ALLOW_ITER flag). */ -#include #include +#include #include "atomic_ops.h" diff --git a/source/blender/blenlib/intern/DLRB_tree.c b/source/blender/blenlib/intern/DLRB_tree.c index 7917730cd6a..6810601d527 100644 --- a/source/blender/blenlib/intern/DLRB_tree.c +++ b/source/blender/blenlib/intern/DLRB_tree.c @@ -23,8 +23,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_listbase.h" #include "BLI_dlrbTree.h" +#include "BLI_listbase.h" /* *********************************************** */ /* Tree API */ diff --git a/source/blender/blenlib/intern/array_utils.c b/source/blender/blenlib/intern/array_utils.c index 25bcf7136f7..5dec10a5756 100644 --- a/source/blender/blenlib/intern/array_utils.c +++ b/source/blender/blenlib/intern/array_utils.c @@ -22,16 +22,16 @@ * and only included for the cases where the performance is acceptable. * Use with care. */ -#include #include +#include #include "MEM_guardedalloc.h" #include "BLI_array_utils.h" +#include "BLI_alloca.h" #include "BLI_sys_types.h" #include "BLI_utildefines.h" -#include "BLI_alloca.h" #include "BLI_strict_flags.h" diff --git a/source/blender/blenlib/intern/astar.c b/source/blender/blenlib/intern/astar.c index c8f2160f0b6..1f71a62d191 100644 --- a/source/blender/blenlib/intern/astar.c +++ b/source/blender/blenlib/intern/astar.c @@ -43,8 +43,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_sys_types.h" #include "BLI_compiler_attrs.h" +#include "BLI_sys_types.h" #include "BLI_heap_simple.h" #include "BLI_listbase.h" diff --git a/source/blender/blenlib/intern/bitmap.c b/source/blender/blenlib/intern/bitmap.c index 4e26ae23774..d24047397fb 100644 --- a/source/blender/blenlib/intern/bitmap.c +++ b/source/blender/blenlib/intern/bitmap.c @@ -23,11 +23,11 @@ * Utility functions for variable size bitmasks. */ -#include #include +#include -#include "BLI_utildefines.h" #include "BLI_bitmap.h" +#include "BLI_utildefines.h" /** Set or clear all bits in the bitmap. */ void BLI_bitmap_set_all(BLI_bitmap *bitmap, bool set, size_t bits) diff --git a/source/blender/blenlib/intern/boxpack_2d.c b/source/blender/blenlib/intern/boxpack_2d.c index c0c4613daf4..6ecadeecec5 100644 --- a/source/blender/blenlib/intern/boxpack_2d.c +++ b/source/blender/blenlib/intern/boxpack_2d.c @@ -18,14 +18,14 @@ * \ingroup bli */ -#include /* for qsort */ #include /* for fabsf */ +#include /* for qsort */ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_listbase.h" #include "BLI_boxpack_2d.h" /* own include */ +#include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "BLI_sort.h" /* qsort_r */ #define qsort_r BLI_qsort_r diff --git a/source/blender/blenlib/intern/dynlib.c b/source/blender/blenlib/intern/dynlib.c index 2aceff45b3e..a555098698b 100644 --- a/source/blender/blenlib/intern/dynlib.c +++ b/source/blender/blenlib/intern/dynlib.c @@ -35,9 +35,9 @@ struct DynamicLibrary { #ifdef WIN32 # define WIN32_LEAN_AND_MEAN -# include # include "utf_winfunc.h" # include "utfconv.h" +# include DynamicLibrary *BLI_dynlib_open(const char *name) { diff --git a/source/blender/blenlib/intern/edgehash.c b/source/blender/blenlib/intern/edgehash.c index 9b846dfa08d..556c0a65fc5 100644 --- a/source/blender/blenlib/intern/edgehash.c +++ b/source/blender/blenlib/intern/edgehash.c @@ -23,15 +23,15 @@ * \note The API matches BLI_ghash.c, but the implementation is different. */ +#include #include #include -#include #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_edgehash.h" #include "BLI_strict_flags.h" +#include "BLI_utildefines.h" typedef struct _EdgeHash_Edge Edge; typedef struct _EdgeHash_Entry EdgeHashEntry; diff --git a/source/blender/blenlib/intern/endian_switch.c b/source/blender/blenlib/intern/endian_switch.c index 09d1d3d0774..7e316d930a0 100644 --- a/source/blender/blenlib/intern/endian_switch.c +++ b/source/blender/blenlib/intern/endian_switch.c @@ -18,9 +18,9 @@ * \ingroup bli */ +#include "BLI_endian_switch.h" #include "BLI_sys_types.h" #include "BLI_utildefines.h" -#include "BLI_endian_switch.h" void BLI_endian_switch_int16_array(short *val, const int size) { diff --git a/source/blender/blenlib/intern/expr_pylike_eval.c b/source/blender/blenlib/intern/expr_pylike_eval.c index 6020dc41a62..d1d84dab3f7 100644 --- a/source/blender/blenlib/intern/expr_pylike_eval.c +++ b/source/blender/blenlib/intern/expr_pylike_eval.c @@ -41,21 +41,21 @@ * The implementation has no global state and can be used multi-threaded. */ -#include -#include -#include -#include -#include #include -#include #include +#include +#include +#include +#include +#include +#include #include "MEM_guardedalloc.h" -#include "BLI_expr_pylike_eval.h" -#include "BLI_utildefines.h" -#include "BLI_math_base.h" #include "BLI_alloca.h" +#include "BLI_expr_pylike_eval.h" +#include "BLI_math_base.h" +#include "BLI_utildefines.h" #ifdef _MSC_VER # pragma fenv_access(on) diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c index afb46dd8d82..da77046547c 100644 --- a/source/blender/blenlib/intern/fileops.c +++ b/source/blender/blenlib/intern/fileops.c @@ -24,42 +24,42 @@ #include /* malloc */ #include -#include -#include #include +#include +#include #include #include "zlib.h" #ifdef WIN32 -# include -# include -# include -# include -# include "BLI_winstuff.h" # include "BLI_fileops_types.h" +# include "BLI_winstuff.h" # include "utf_winfunc.h" # include "utfconv.h" +# include +# include +# include +# include #else # if defined(__APPLE__) # include -# include # include +# include # endif -# include # include -# include +# include # include +# include #endif #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_string.h" -#include "BLI_path_util.h" #include "BLI_fileops.h" +#include "BLI_path_util.h" +#include "BLI_string.h" #include "BLI_sys_types.h" // for intptr_t support +#include "BLI_utildefines.h" #if 0 /* UNUSED */ /* gzip the file in from and write it to "to". diff --git a/source/blender/blenlib/intern/freetypefont.c b/source/blender/blenlib/intern/freetypefont.c index b5a950d6851..34886054cb0 100644 --- a/source/blender/blenlib/intern/freetypefont.c +++ b/source/blender/blenlib/intern/freetypefont.c @@ -35,16 +35,16 @@ #include "MEM_guardedalloc.h" +#include "BLI_ghash.h" +#include "BLI_listbase.h" +#include "BLI_math.h" +#include "BLI_string.h" #include "BLI_utildefines.h" #include "BLI_vfontdata.h" -#include "BLI_listbase.h" -#include "BLI_ghash.h" -#include "BLI_string.h" -#include "BLI_math.h" -#include "DNA_vfont_types.h" -#include "DNA_packedFile_types.h" #include "DNA_curve_types.h" +#include "DNA_packedFile_types.h" +#include "DNA_vfont_types.h" /* local variables */ static FT_Library library; diff --git a/source/blender/blenlib/intern/gsqueue.c b/source/blender/blenlib/intern/gsqueue.c index 5e1fbf6eade..36040536cac 100644 --- a/source/blender/blenlib/intern/gsqueue.c +++ b/source/blender/blenlib/intern/gsqueue.c @@ -25,9 +25,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_gsqueue.h" #include "BLI_strict_flags.h" +#include "BLI_utildefines.h" /* target chunk size: 64kb */ #define CHUNK_SIZE_DEFAULT (1 << 16) diff --git a/source/blender/blenlib/intern/hash_md5.c b/source/blender/blenlib/intern/hash_md5.c index 5ec1c91a735..8c869ce28c3 100644 --- a/source/blender/blenlib/intern/hash_md5.c +++ b/source/blender/blenlib/intern/hash_md5.c @@ -24,9 +24,9 @@ * according to the definition of MD5 in RFC 1321 from April 1992. */ +#include #include #include -#include #include #include "BLI_hash_md5.h" /* own include */ diff --git a/source/blender/blenlib/intern/hash_mm3.c b/source/blender/blenlib/intern/hash_mm3.c index 0dfb7ff414c..e557789a5fd 100644 --- a/source/blender/blenlib/intern/hash_mm3.c +++ b/source/blender/blenlib/intern/hash_mm3.c @@ -26,8 +26,8 @@ * domain. The author hereby disclaims copyright to this source code. */ -#include "BLI_compiler_compat.h" #include "BLI_compiler_attrs.h" +#include "BLI_compiler_compat.h" #include "BLI_hash_mm3.h" /* own include */ #if defined(_MSC_VER) diff --git a/source/blender/blenlib/intern/jitter_2d.c b/source/blender/blenlib/intern/jitter_2d.c index aed43657b3f..a5b13caf985 100644 --- a/source/blender/blenlib/intern/jitter_2d.c +++ b/source/blender/blenlib/intern/jitter_2d.c @@ -22,12 +22,12 @@ * \brief Jitter offset table */ +#include "MEM_guardedalloc.h" #include #include -#include "MEM_guardedalloc.h" -#include "BLI_rand.h" #include "BLI_jitter_2d.h" +#include "BLI_rand.h" #include "BLI_strict_flags.h" diff --git a/source/blender/blenlib/intern/kdtree_impl.h b/source/blender/blenlib/intern/kdtree_impl.h index 9e11ea903c2..58261e4f6aa 100644 --- a/source/blender/blenlib/intern/kdtree_impl.h +++ b/source/blender/blenlib/intern/kdtree_impl.h @@ -20,10 +20,10 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_kdtree_impl.h" -#include "BLI_utildefines.h" +#include "BLI_math.h" #include "BLI_strict_flags.h" +#include "BLI_utildefines.h" #define _CONCAT_AUX(MACRO_ARG1, MACRO_ARG2) MACRO_ARG1##MACRO_ARG2 #define _CONCAT(MACRO_ARG1, MACRO_ARG2) _CONCAT_AUX(MACRO_ARG1, MACRO_ARG2) diff --git a/source/blender/blenlib/intern/listbase.c b/source/blender/blenlib/intern/listbase.c index e43c4b07a87..892eca768b3 100644 --- a/source/blender/blenlib/intern/listbase.c +++ b/source/blender/blenlib/intern/listbase.c @@ -25,8 +25,8 @@ * For single linked lists see 'BLI_linklist.h' */ -#include #include +#include #include "MEM_guardedalloc.h" diff --git a/source/blender/blenlib/intern/math_base_inline.c b/source/blender/blenlib/intern/math_base_inline.c index a293695154a..c4b68e9164c 100644 --- a/source/blender/blenlib/intern/math_base_inline.c +++ b/source/blender/blenlib/intern/math_base_inline.c @@ -28,9 +28,9 @@ #define __MATH_BASE_INLINE_C__ #include +#include #include #include -#include #ifdef __SSE2__ # include diff --git a/source/blender/blenlib/intern/math_matrix.c b/source/blender/blenlib/intern/math_matrix.c index d5f4a793ad0..9e398239bc7 100644 --- a/source/blender/blenlib/intern/math_matrix.c +++ b/source/blender/blenlib/intern/math_matrix.c @@ -23,8 +23,8 @@ * \ingroup bli */ -#include #include "BLI_math.h" +#include #include "BLI_strict_flags.h" diff --git a/source/blender/blenlib/intern/math_rotation.c b/source/blender/blenlib/intern/math_rotation.c index cc8042316f8..a91cdabe3ab 100644 --- a/source/blender/blenlib/intern/math_rotation.c +++ b/source/blender/blenlib/intern/math_rotation.c @@ -23,8 +23,8 @@ * \ingroup bli */ -#include #include "BLI_math.h" +#include #include "BLI_strict_flags.h" diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index 4a1f2ac2a8f..0bb2ba5859b 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -22,18 +22,18 @@ * \ingroup bli */ -#include -#include -#include #include +#include +#include +#include #include "DNA_listBase.h" -#include "BLI_utildefines.h" #include "BLI_fileops.h" +#include "BLI_fnmatch.h" #include "BLI_path_util.h" #include "BLI_string.h" -#include "BLI_fnmatch.h" +#include "BLI_utildefines.h" #ifdef WIN32 # include "utf_winfunc.h" @@ -43,10 +43,10 @@ # undef _WIN32_IE # endif # define _WIN32_IE 0x0501 -# include -# include -# include "BLI_winstuff.h" # include "BLI_alloca.h" +# include "BLI_winstuff.h" +# include +# include #else # include "unistd.h" #endif /* WIN32 */ diff --git a/source/blender/blenlib/intern/polyfill_2d.c b/source/blender/blenlib/intern/polyfill_2d.c index 31b18079c73..90a4a4f4c2d 100644 --- a/source/blender/blenlib/intern/polyfill_2d.c +++ b/source/blender/blenlib/intern/polyfill_2d.c @@ -43,11 +43,11 @@ * No globals - keep threadsafe. */ -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" -#include "BLI_memarena.h" #include "BLI_alloca.h" +#include "BLI_memarena.h" #include "BLI_polyfill_2d.h" /* own include */ diff --git a/source/blender/blenlib/intern/polyfill_2d_beautify.c b/source/blender/blenlib/intern/polyfill_2d_beautify.c index ab397b86b1a..41364c5a3a9 100644 --- a/source/blender/blenlib/intern/polyfill_2d_beautify.c +++ b/source/blender/blenlib/intern/polyfill_2d_beautify.c @@ -34,11 +34,11 @@ * No globals - keep threadsafe. */ -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" -#include "BLI_memarena.h" #include "BLI_heap.h" +#include "BLI_memarena.h" #include "BLI_polyfill_2d_beautify.h" /* own include */ diff --git a/source/blender/blenlib/intern/rand.c b/source/blender/blenlib/intern/rand.c index 9f47ada47d1..ab7a972e010 100644 --- a/source/blender/blenlib/intern/rand.c +++ b/source/blender/blenlib/intern/rand.c @@ -21,22 +21,22 @@ * \ingroup bli */ +#include #include #include -#include #include #include "MEM_guardedalloc.h" -#include "BLI_threads.h" -#include "BLI_rand.h" #include "BLI_math.h" +#include "BLI_rand.h" +#include "BLI_threads.h" /* defines BLI_INLINE */ #include "BLI_compiler_compat.h" -#include "BLI_sys_types.h" #include "BLI_strict_flags.h" +#include "BLI_sys_types.h" #define MULTIPLIER 0x5DEECE66Dll #define MASK 0x0000FFFFFFFFFFFFll diff --git a/source/blender/blenlib/intern/rct.c b/source/blender/blenlib/intern/rct.c index 2ed7d7d7345..ad8443683f8 100644 --- a/source/blender/blenlib/intern/rct.c +++ b/source/blender/blenlib/intern/rct.c @@ -23,12 +23,12 @@ * A minimalist lib for functions doing stuff with rectangle structs. */ -#include -#include #include +#include +#include -#include #include +#include #include "BLI_rect.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenlib/intern/scanfill.c b/source/blender/blenlib/intern/scanfill.c index c9b0eb3ed5e..4723a3532ac 100644 --- a/source/blender/blenlib/intern/scanfill.c +++ b/source/blender/blenlib/intern/scanfill.c @@ -31,11 +31,11 @@ * which uses ear clipping, but has no hole support. */ -#include +#include #include +#include #include #include -#include #include "MEM_guardedalloc.h" diff --git a/source/blender/blenlib/intern/scanfill_utils.c b/source/blender/blenlib/intern/scanfill_utils.c index 0c4151e6575..31b2bf85142 100644 --- a/source/blender/blenlib/intern/scanfill_utils.c +++ b/source/blender/blenlib/intern/scanfill_utils.c @@ -18,18 +18,18 @@ * \ingroup bli */ -#include +#include #include +#include #include #include -#include #include "MEM_guardedalloc.h" +#include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BLI_ghash.h" #include "BLI_scanfill.h" /* own include */ diff --git a/source/blender/blenlib/intern/smallhash.c b/source/blender/blenlib/intern/smallhash.c index d5fdf003aef..6d1ce3c84cd 100644 --- a/source/blender/blenlib/intern/smallhash.c +++ b/source/blender/blenlib/intern/smallhash.c @@ -44,8 +44,8 @@ * use the maximum values to avoid real pointers colliding with magic numbers. */ -#include #include +#include #include "BLI_sys_types.h" diff --git a/source/blender/blenlib/intern/stack.c b/source/blender/blenlib/intern/stack.c index 301675c026e..e75d944c764 100644 --- a/source/blender/blenlib/intern/stack.c +++ b/source/blender/blenlib/intern/stack.c @@ -18,8 +18,8 @@ * \ingroup bli */ -#include #include /* abort() */ +#include #include "BLI_utildefines.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c index de16960eb85..da80777e6d6 100644 --- a/source/blender/blenlib/intern/storage.c +++ b/source/blender/blenlib/intern/storage.c @@ -23,9 +23,9 @@ * Some really low-level file operations. */ -#include #include #include +#include #include @@ -38,8 +38,8 @@ #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || \ defined(__DragonFly__) /* For statfs */ -# include # include +# include #endif #if defined(__linux__) || defined(__hpux) || defined(__GNU__) || defined(__GLIBC__) @@ -50,26 +50,26 @@ #include /* strcpy etc.. */ #ifdef WIN32 -# include -# include -# include -# include "BLI_winstuff.h" # include "BLI_string_utf8.h" +# include "BLI_winstuff.h" # include "utfconv.h" +# include +# include +# include #else +# include # include # include -# include #endif /* lib includes */ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_linklist.h" -#include "BLI_string.h" #include "BLI_fileops.h" +#include "BLI_linklist.h" #include "BLI_path_util.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" /** * Copies the current working directory into *dir (max size maxncpy), and diff --git a/source/blender/blenlib/intern/string.c b/source/blender/blenlib/intern/string.c index db97cd3b065..ef137c4459e 100644 --- a/source/blender/blenlib/intern/string.c +++ b/source/blender/blenlib/intern/string.c @@ -21,12 +21,12 @@ * \ingroup bli */ -#include -#include -#include #include -#include #include +#include +#include +#include +#include #include "MEM_guardedalloc.h" diff --git a/source/blender/blenlib/intern/string_cursor_utf8.c b/source/blender/blenlib/intern/string_cursor_utf8.c index ee4c11b1c04..90fde02b11f 100644 --- a/source/blender/blenlib/intern/string_cursor_utf8.c +++ b/source/blender/blenlib/intern/string_cursor_utf8.c @@ -24,8 +24,8 @@ #include #include -#include "BLI_utildefines.h" #include "BLI_string_utf8.h" +#include "BLI_utildefines.h" #include "BLI_string_cursor_utf8.h" /* own include */ diff --git a/source/blender/blenlib/intern/string_utf8.c b/source/blender/blenlib/intern/string_utf8.c index bf08ad6975b..e9fdce83710 100644 --- a/source/blender/blenlib/intern/string_utf8.c +++ b/source/blender/blenlib/intern/string_utf8.c @@ -23,12 +23,12 @@ * \ingroup bli */ +#include +#include #include #include #include #include -#include -#include #include "BLI_utildefines.h" diff --git a/source/blender/blenlib/intern/string_utils.c b/source/blender/blenlib/intern/string_utils.c index a579327c73e..fb9530b5cb5 100644 --- a/source/blender/blenlib/intern/string_utils.c +++ b/source/blender/blenlib/intern/string_utils.c @@ -22,8 +22,8 @@ */ #include -#include #include +#include #include "MEM_guardedalloc.h" diff --git a/source/blender/blenlib/intern/system.c b/source/blender/blenlib/intern/system.c index 941c2b608e6..7d9ed2598a6 100644 --- a/source/blender/blenlib/intern/system.c +++ b/source/blender/blenlib/intern/system.c @@ -22,10 +22,10 @@ #include #include -#include "BLI_utildefines.h" #include "BLI_math_base.h" -#include "BLI_system.h" #include "BLI_string.h" +#include "BLI_system.h" +#include "BLI_utildefines.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/blenlib/intern/threads.c b/source/blender/blenlib/intern/threads.c index 3c87df55b2b..95a63ae5c4e 100644 --- a/source/blender/blenlib/intern/threads.c +++ b/source/blender/blenlib/intern/threads.c @@ -21,14 +21,14 @@ * \ingroup bli */ -#include #include +#include #include #include "MEM_guardedalloc.h" -#include "BLI_listbase.h" #include "BLI_gsqueue.h" +#include "BLI_listbase.h" #include "BLI_system.h" #include "BLI_task.h" #include "BLI_threads.h" @@ -37,14 +37,14 @@ /* for checking system threads - BLI_system_thread_count */ #ifdef WIN32 -# include # include +# include #elif defined(__APPLE__) -# include # include +# include #else -# include # include +# include #endif #include "atomic_ops.h" diff --git a/source/blender/blenlib/intern/time.c b/source/blender/blenlib/intern/time.c index 81b079a1f77..299c40d2cc3 100644 --- a/source/blender/blenlib/intern/time.c +++ b/source/blender/blenlib/intern/time.c @@ -74,8 +74,8 @@ void PIL_sleep_ms(int ms) #else -# include # include +# include double PIL_check_seconds_timer(void) { diff --git a/source/blender/blenlib/intern/timecode.c b/source/blender/blenlib/intern/timecode.c index 228f656949c..510b9651961 100644 --- a/source/blender/blenlib/intern/timecode.c +++ b/source/blender/blenlib/intern/timecode.c @@ -25,9 +25,9 @@ #include -#include "BLI_utildefines.h" -#include "BLI_string.h" #include "BLI_math.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" #include "BLI_timecode.h" /* own include */ diff --git a/source/blender/blenlib/intern/voronoi_2d.c b/source/blender/blenlib/intern/voronoi_2d.c index 6bd9a16cd55..61052aa00f9 100644 --- a/source/blender/blenlib/intern/voronoi_2d.c +++ b/source/blender/blenlib/intern/voronoi_2d.c @@ -28,8 +28,8 @@ #include "BLI_listbase.h" #include "BLI_math.h" -#include "BLI_voronoi_2d.h" #include "BLI_utildefines.h" +#include "BLI_voronoi_2d.h" #define VORONOI_EPS 1e-2f diff --git a/source/blender/blenlib/intern/winstuff.c b/source/blender/blenlib/intern/winstuff.c index 724f27f4667..df7e7107d11 100644 --- a/source/blender/blenlib/intern/winstuff.c +++ b/source/blender/blenlib/intern/winstuff.c @@ -24,17 +24,17 @@ #ifdef WIN32 -# include -# include # include +# include +# include # include "MEM_guardedalloc.h" # define WIN32_SKIP_HKEY_PROTECTION // need to use HKEY -# include "BLI_winstuff.h" -# include "BLI_utildefines.h" # include "BLI_path_util.h" # include "BLI_string.h" +# include "BLI_utildefines.h" +# include "BLI_winstuff.h" # include "../blenkernel/BKE_global.h" /* G.background, bad level include (no function calls) */ diff --git a/source/blender/blenlib/intern/winstuff_dir.c b/source/blender/blenlib/intern/winstuff_dir.c index 1e5a0db678e..4db385bd8aa 100644 --- a/source/blender/blenlib/intern/winstuff_dir.c +++ b/source/blender/blenlib/intern/winstuff_dir.c @@ -34,8 +34,8 @@ # endif # define WIN32_SKIP_HKEY_PROTECTION // need to use HKEY -# include "BLI_winstuff.h" # include "BLI_utildefines.h" +# include "BLI_winstuff.h" # include "utfconv.h" # define PATH_SUFFIX "\\*" diff --git a/source/blender/blenloader/intern/blend_validate.c b/source/blender/blenloader/intern/blend_validate.c index cc447196507..33c5e3ac197 100644 --- a/source/blender/blenloader/intern/blend_validate.c +++ b/source/blender/blenloader/intern/blend_validate.c @@ -32,8 +32,8 @@ #include "MEM_guardedalloc.h" -#include "DNA_sdna_types.h" #include "DNA_key_types.h" +#include "DNA_sdna_types.h" #include "DNA_windowmanager_types.h" #include "BKE_key.h" diff --git a/source/blender/blenloader/intern/readblenentry.c b/source/blender/blenloader/intern/readblenentry.c index c12df2bc87d..f1ae05c3a48 100644 --- a/source/blender/blenloader/intern/readblenentry.c +++ b/source/blender/blenloader/intern/readblenentry.c @@ -24,28 +24,28 @@ #include +#include +#include #include #include -#include -#include #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_linklist.h" #include "BLI_listbase.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "DNA_genfile.h" #include "DNA_sdna_types.h" -#include "BKE_main.h" #include "BKE_idcode.h" +#include "BKE_main.h" +#include "BLO_blend_defs.h" #include "BLO_readfile.h" #include "BLO_undofile.h" -#include "BLO_blend_defs.h" #include "readfile.h" diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index f7c995d598e..82c440669aa 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -23,21 +23,21 @@ #include "zlib.h" +#include /* for isdigit. */ +#include /* for open flags (O_BINARY, O_RDONLY). */ #include -#include /* for atoi. */ -#include /* for offsetof. */ -#include /* for open flags (O_BINARY, O_RDONLY). */ #include /* for va_start/end. */ +#include /* for offsetof. */ +#include /* for atoi. */ #include /* for gmtime. */ -#include /* for isdigit. */ #include "BLI_utildefines.h" #ifndef WIN32 # include // for read close #else -# include // for open close read -# include "winsock2.h" # include "BLI_winstuff.h" +# include "winsock2.h" +# include // for open close read #endif /* allow readfile to use deprecated functionality */ @@ -46,29 +46,33 @@ #include "DNA_anim_types.h" #include "DNA_armature_types.h" #include "DNA_brush_types.h" -#include "DNA_camera_types.h" #include "DNA_cachefile_types.h" +#include "DNA_camera_types.h" #include "DNA_cloth_types.h" #include "DNA_collection_types.h" #include "DNA_constraint_types.h" +#include "DNA_curveprofile_types.h" #include "DNA_dynamicpaint_types.h" #include "DNA_effect_types.h" #include "DNA_fileglobal_types.h" +#include "DNA_fluid_types.h" #include "DNA_genfile.h" -#include "DNA_gpencil_types.h" #include "DNA_gpencil_modifier_types.h" -#include "DNA_shader_fx_types.h" +#include "DNA_gpencil_types.h" #include "DNA_hair_types.h" #include "DNA_ipo_types.h" #include "DNA_key_types.h" #include "DNA_lattice_types.h" #include "DNA_layer_types.h" #include "DNA_light_types.h" +#include "DNA_lightprobe_types.h" #include "DNA_linestyle_types.h" -#include "DNA_meta_types.h" +#include "DNA_mask_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "DNA_meta_types.h" +#include "DNA_movieclip_types.h" #include "DNA_nla_types.h" #include "DNA_node_types.h" #include "DNA_object_fluidsim_types.h" @@ -76,35 +80,31 @@ #include "DNA_packedFile_types.h" #include "DNA_particle_types.h" #include "DNA_pointcloud_types.h" -#include "DNA_curveprofile_types.h" -#include "DNA_lightprobe_types.h" #include "DNA_rigidbody_types.h" -#include "DNA_text_types.h" -#include "DNA_view3d_types.h" +#include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_sdna_types.h" -#include "DNA_scene_types.h" #include "DNA_sequence_types.h" -#include "DNA_fluid_types.h" -#include "DNA_speaker_types.h" +#include "DNA_shader_fx_types.h" #include "DNA_sound_types.h" #include "DNA_space_types.h" +#include "DNA_speaker_types.h" +#include "DNA_text_types.h" #include "DNA_vfont_types.h" +#include "DNA_view3d_types.h" #include "DNA_volume_types.h" #include "DNA_workspace_types.h" #include "DNA_world_types.h" -#include "DNA_movieclip_types.h" -#include "DNA_mask_types.h" #include "MEM_guardedalloc.h" -#include "BLI_endian_switch.h" #include "BLI_blenlib.h" +#include "BLI_endian_switch.h" +#include "BLI_ghash.h" #include "BLI_linklist.h" #include "BLI_math.h" -#include "BLI_threads.h" #include "BLI_mempool.h" -#include "BLI_ghash.h" +#include "BLI_threads.h" #include "BLT_translation.h" @@ -126,10 +126,10 @@ #include "BKE_idprop.h" #include "BKE_layer.h" #include "BKE_lib_id.h" -#include "BKE_main_idmap.h" #include "BKE_lib_override.h" #include "BKE_lib_query.h" #include "BKE_main.h" // for Main +#include "BKE_main_idmap.h" #include "BKE_material.h" #include "BKE_mesh.h" // for ME_ defines (patching) #include "BKE_mesh_runtime.h" diff --git a/source/blender/blenloader/intern/readfile.h b/source/blender/blenloader/intern/readfile.h index fce6a1d8ff7..5100cf5051b 100644 --- a/source/blender/blenloader/intern/readfile.h +++ b/source/blender/blenloader/intern/readfile.h @@ -25,10 +25,10 @@ #ifndef __READFILE_H__ #define __READFILE_H__ -#include "zlib.h" #include "DNA_sdna_types.h" #include "DNA_space_types.h" #include "DNA_windowmanager_types.h" /* for ReportType */ +#include "zlib.h" struct IDNameLib_Map; struct GSet; diff --git a/source/blender/blenloader/intern/undofile.c b/source/blender/blenloader/intern/undofile.c index 0bbd8c26fa1..06469a0c087 100644 --- a/source/blender/blenloader/intern/undofile.c +++ b/source/blender/blenloader/intern/undofile.c @@ -22,12 +22,12 @@ * \ingroup blenloader */ +#include +#include +#include +#include #include #include -#include -#include -#include -#include /* open/close */ #ifndef _WIN32 @@ -42,8 +42,8 @@ #include "BLI_blenlib.h" -#include "BLO_undofile.h" #include "BLO_readfile.h" +#include "BLO_undofile.h" #include "BKE_main.h" diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c index 6ff0f709361..fed0cbda466 100644 --- a/source/blender/blenloader/intern/versioning_250.c +++ b/source/blender/blenloader/intern/versioning_250.c @@ -21,10 +21,10 @@ #ifndef WIN32 # include /* for read close */ #else -# include /* odd include order-issue */ -# include // for open close read -# include "winsock2.h" # include "BLI_winstuff.h" +# include "winsock2.h" +# include // for open close read +# include /* odd include order-issue */ #endif /* allow readfile to use deprecated functionality */ @@ -36,6 +36,7 @@ #include "DNA_camera_types.h" #include "DNA_cloth_types.h" #include "DNA_constraint_types.h" +#include "DNA_fluid_types.h" #include "DNA_ipo_types.h" #include "DNA_key_types.h" #include "DNA_lattice_types.h" @@ -46,20 +47,19 @@ #include "DNA_node_types.h" #include "DNA_object_fluidsim_types.h" #include "DNA_object_types.h" -#include "DNA_view3d_types.h" #include "DNA_screen_types.h" #include "DNA_sdna_types.h" #include "DNA_sequence_types.h" -#include "DNA_fluid_types.h" #include "DNA_sound_types.h" #include "DNA_space_types.h" +#include "DNA_view3d_types.h" #include "DNA_world_types.h" #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_blenlib.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_anim.h" #include "BKE_armature.h" @@ -73,8 +73,8 @@ #include "BKE_pointcache.h" #include "BKE_screen.h" #include "BKE_sequencer.h" -#include "BKE_texture.h" #include "BKE_sound.h" +#include "BKE_texture.h" #include "NOD_socket.h" diff --git a/source/blender/blenloader/intern/versioning_260.c b/source/blender/blenloader/intern/versioning_260.c index 8a55ccf78b9..26de003dc17 100644 --- a/source/blender/blenloader/intern/versioning_260.c +++ b/source/blender/blenloader/intern/versioning_260.c @@ -28,21 +28,21 @@ #include "DNA_camera_types.h" #include "DNA_cloth_types.h" #include "DNA_constraint_types.h" +#include "DNA_fluid_types.h" #include "DNA_genfile.h" #include "DNA_key_types.h" +#include "DNA_light_types.h" #include "DNA_linestyle_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_fluidsim_types.h" #include "DNA_object_types.h" -#include "DNA_text_types.h" -#include "DNA_view3d_types.h" #include "DNA_screen_types.h" #include "DNA_sdna_types.h" -#include "DNA_fluid_types.h" #include "DNA_space_types.h" +#include "DNA_text_types.h" +#include "DNA_view3d_types.h" #include "DNA_world_types.h" -#include "DNA_light_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c index 4500de7bbec..80f75a7ac4a 100644 --- a/source/blender/blenloader/intern/versioning_270.c +++ b/source/blender/blenloader/intern/versioning_270.c @@ -18,8 +18,8 @@ * \ingroup blenloader */ -#include "BLI_utildefines.h" #include "BLI_compiler_attrs.h" +#include "BLI_utildefines.h" /* for MinGW32 definition of NULL, could use BLI_blenlib.h instead too */ #include @@ -33,22 +33,22 @@ #include "DNA_camera_types.h" #include "DNA_cloth_types.h" #include "DNA_constraint_types.h" +#include "DNA_fluid_types.h" #include "DNA_gpencil_types.h" -#include "DNA_sdna_types.h" -#include "DNA_sequence_types.h" -#include "DNA_space_types.h" -#include "DNA_screen_types.h" -#include "DNA_object_force_types.h" -#include "DNA_object_types.h" +#include "DNA_light_types.h" +#include "DNA_linestyle_types.h" #include "DNA_mask_types.h" #include "DNA_mesh_types.h" #include "DNA_modifier_types.h" +#include "DNA_object_force_types.h" +#include "DNA_object_types.h" #include "DNA_particle_types.h" -#include "DNA_linestyle_types.h" -#include "DNA_view3d_types.h" -#include "DNA_fluid_types.h" #include "DNA_rigidbody_types.h" -#include "DNA_light_types.h" +#include "DNA_screen_types.h" +#include "DNA_sdna_types.h" +#include "DNA_sequence_types.h" +#include "DNA_space_types.h" +#include "DNA_view3d_types.h" #include "DNA_genfile.h" @@ -60,12 +60,12 @@ #include "BKE_modifier.h" #include "BKE_node.h" #include "BKE_scene.h" -#include "BKE_sequencer.h" #include "BKE_screen.h" +#include "BKE_sequencer.h" #include "BKE_tracking.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_string.h" #include "BLI_string_utils.h" @@ -74,8 +74,8 @@ #include "BLO_readfile.h" #include "NOD_common.h" -#include "NOD_socket.h" #include "NOD_composite.h" +#include "NOD_socket.h" #include "readfile.h" diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 3535897aa66..b0fbe5c710b 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -21,8 +21,8 @@ /* allow readfile to use deprecated functionality */ #define DNA_DEPRECATED_ALLOW -#include #include +#include #include "BLI_listbase.h" #include "BLI_math.h" @@ -33,44 +33,45 @@ #include "DNA_defaults.h" #include "DNA_anim_types.h" -#include "DNA_object_types.h" +#include "DNA_armature_types.h" #include "DNA_camera_types.h" #include "DNA_cloth_types.h" #include "DNA_collection_types.h" #include "DNA_constraint_types.h" +#include "DNA_curve_types.h" #include "DNA_curveprofile_types.h" #include "DNA_freestyle_types.h" -#include "DNA_gpu_types.h" -#include "DNA_gpencil_types.h" +#include "DNA_genfile.h" #include "DNA_gpencil_modifier_types.h" -#include "DNA_light_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_gpu_types.h" +#include "DNA_key_types.h" #include "DNA_layer_types.h" +#include "DNA_light_types.h" #include "DNA_lightprobe_types.h" #include "DNA_linestyle_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_modifier_types.h" +#include "DNA_object_types.h" #include "DNA_particle_types.h" #include "DNA_rigidbody_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_shader_fx_types.h" -#include "DNA_view3d_types.h" -#include "DNA_genfile.h" -#include "DNA_workspace_types.h" -#include "DNA_key_types.h" -#include "DNA_curve_types.h" -#include "DNA_armature_types.h" #include "DNA_text_types.h" #include "DNA_texture_types.h" +#include "DNA_view3d_types.h" +#include "DNA_workspace_types.h" #include "DNA_world_types.h" #include "BKE_animsys.h" #include "BKE_brush.h" #include "BKE_cloth.h" #include "BKE_collection.h" -#include "BKE_constraint.h" #include "BKE_colortools.h" +#include "BKE_constraint.h" +#include "BKE_curveprofile.h" #include "BKE_customdata.h" #include "BKE_fcurve.h" #include "BKE_freestyle.h" @@ -79,14 +80,13 @@ #include "BKE_gpencil_modifier.h" #include "BKE_idprop.h" #include "BKE_key.h" -#include "BKE_lib_id.h" #include "BKE_layer.h" +#include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_mesh.h" #include "BKE_node.h" #include "BKE_paint.h" #include "BKE_pointcache.h" -#include "BKE_curveprofile.h" #include "BKE_report.h" #include "BKE_rigidbody.h" #include "BKE_screen.h" diff --git a/source/blender/blenloader/intern/versioning_cycles.c b/source/blender/blenloader/intern/versioning_cycles.c index ab5ce67615d..14a940b9297 100644 --- a/source/blender/blenloader/intern/versioning_cycles.c +++ b/source/blender/blenloader/intern/versioning_cycles.c @@ -24,20 +24,20 @@ #include #include +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_string.h" -#include "BLI_listbase.h" #include "BLI_utildefines.h" +#include "DNA_anim_types.h" +#include "DNA_camera_types.h" #include "DNA_color_types.h" #include "DNA_light_types.h" #include "DNA_node_types.h" #include "DNA_particle_types.h" -#include "DNA_camera_types.h" -#include "DNA_anim_types.h" -#include "BKE_colortools.h" #include "BKE_animsys.h" +#include "BKE_colortools.h" #include "BKE_idprop.h" #include "BKE_main.h" #include "BKE_node.h" diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c index 53c63ef980b..045edc8413f 100644 --- a/source/blender/blenloader/intern/versioning_defaults.c +++ b/source/blender/blenloader/intern/versioning_defaults.c @@ -20,16 +20,18 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_string.h" #include "BLI_system.h" +#include "BLI_utildefines.h" #include "DNA_camera_types.h" #include "DNA_curveprofile_types.h" #include "DNA_gpencil_types.h" +#include "DNA_light_types.h" #include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" @@ -37,24 +39,21 @@ #include "DNA_userdef_types.h" #include "DNA_windowmanager_types.h" #include "DNA_workspace_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" -#include "DNA_light_types.h" #include "BKE_appdir.h" #include "BKE_brush.h" #include "BKE_colortools.h" +#include "BKE_curveprofile.h" #include "BKE_gpencil.h" #include "BKE_layer.h" #include "BKE_lib_id.h" #include "BKE_main.h" -#include "BKE_mesh.h" #include "BKE_material.h" +#include "BKE_mesh.h" #include "BKE_node.h" #include "BKE_paint.h" #include "BKE_screen.h" #include "BKE_workspace.h" -#include "BKE_curveprofile.h" #include "BLO_readfile.h" diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c index 6c5f78edaa0..29c4a0f3c9d 100644 --- a/source/blender/blenloader/intern/versioning_legacy.c +++ b/source/blender/blenloader/intern/versioning_legacy.c @@ -26,10 +26,10 @@ #ifndef WIN32 # include // for read close #else -# include /* odd include order-issue */ -# include // for open close read -# include "winsock2.h" # include "BLI_winstuff.h" +# include "winsock2.h" +# include // for open close read +# include /* odd include order-issue */ #endif /* allow readfile to use deprecated functionality */ @@ -50,20 +50,20 @@ #include "DNA_node_types.h" #include "DNA_object_fluidsim_types.h" #include "DNA_object_types.h" -#include "DNA_view3d_types.h" #include "DNA_screen_types.h" #include "DNA_sdna_types.h" #include "DNA_sequence_types.h" #include "DNA_sound_types.h" #include "DNA_space_types.h" #include "DNA_vfont_types.h" +#include "DNA_view3d_types.h" #include "DNA_world_types.h" #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_blenlib.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_action.h" #include "BKE_armature.h" diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c index 8ed853e97c4..1e8f7a22b66 100644 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@ -25,18 +25,18 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "DNA_userdef_types.h" +#include "DNA_anim_types.h" #include "DNA_curve_types.h" -#include "DNA_windowmanager_types.h" #include "DNA_scene_types.h" #include "DNA_space_types.h" -#include "DNA_anim_types.h" +#include "DNA_userdef_types.h" +#include "DNA_windowmanager_types.h" #include "BKE_addon.h" #include "BKE_colorband.h" -#include "BKE_main.h" #include "BKE_idprop.h" #include "BKE_keyconfig.h" +#include "BKE_main.h" #include "BLO_readfile.h" /* Own include. */ diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index c948949c06e..816c11c10c5 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -72,18 +72,18 @@ * - write #USER (#UserDef struct) if filename is ``~/.config/blender/X.XX/config/startup.blend``. */ -#include #include #include +#include #include -#include #include +#include #ifdef WIN32 -# include /* odd include order-issue */ +# include "BLI_winstuff.h" # include "winsock2.h" # include -# include "BLI_winstuff.h" +# include /* odd include order-issue */ #else # include /* FreeBSD, for write() and close(). */ #endif @@ -101,53 +101,53 @@ #include "DNA_cloth_types.h" #include "DNA_collection_types.h" #include "DNA_constraint_types.h" +#include "DNA_curveprofile_types.h" #include "DNA_dynamicpaint_types.h" -#include "DNA_genfile.h" -#include "DNA_gpencil_types.h" -#include "DNA_gpencil_modifier_types.h" -#include "DNA_shader_fx_types.h" -#include "DNA_hair_types.h" #include "DNA_fileglobal_types.h" +#include "DNA_fluid_types.h" +#include "DNA_genfile.h" +#include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_hair_types.h" #include "DNA_key_types.h" #include "DNA_lattice_types.h" -#include "DNA_light_types.h" #include "DNA_layer_types.h" +#include "DNA_light_types.h" +#include "DNA_lightprobe_types.h" #include "DNA_linestyle_types.h" -#include "DNA_meta_types.h" +#include "DNA_mask_types.h" +#include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_material_types.h" +#include "DNA_meta_types.h" +#include "DNA_movieclip_types.h" #include "DNA_node_types.h" -#include "DNA_object_types.h" #include "DNA_object_force_types.h" +#include "DNA_object_types.h" #include "DNA_packedFile_types.h" #include "DNA_particle_types.h" #include "DNA_pointcloud_types.h" -#include "DNA_lightprobe_types.h" #include "DNA_rigidbody_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" #include "DNA_sdna_types.h" #include "DNA_sequence_types.h" -#include "DNA_fluid_types.h" -#include "DNA_space_types.h" -#include "DNA_screen_types.h" -#include "DNA_speaker_types.h" +#include "DNA_shader_fx_types.h" #include "DNA_sound_types.h" +#include "DNA_space_types.h" +#include "DNA_speaker_types.h" #include "DNA_text_types.h" -#include "DNA_view3d_types.h" #include "DNA_vfont_types.h" +#include "DNA_view3d_types.h" #include "DNA_volume_types.h" -#include "DNA_world_types.h" #include "DNA_windowmanager_types.h" #include "DNA_workspace_types.h" -#include "DNA_movieclip_types.h" -#include "DNA_mask_types.h" -#include "DNA_curveprofile_types.h" +#include "DNA_world_types.h" -#include "MEM_guardedalloc.h" // MEM_freeN #include "BLI_bitmap.h" #include "BLI_blenlib.h" #include "BLI_mempool.h" +#include "MEM_guardedalloc.h" // MEM_freeN #include "BKE_action.h" #include "BKE_blender_version.h" diff --git a/source/blender/blentranslation/intern/blt_lang.c b/source/blender/blentranslation/intern/blt_lang.c index 82386a17776..112c615fac2 100644 --- a/source/blender/blentranslation/intern/blt_lang.c +++ b/source/blender/blentranslation/intern/blt_lang.c @@ -33,8 +33,8 @@ #include "RNA_types.h" -#include "BLT_translation.h" #include "BLT_lang.h" /* own include */ +#include "BLT_translation.h" #include "BLI_path_util.h" #include "BLI_string.h" diff --git a/source/blender/blentranslation/msgfmt/msgfmt.c b/source/blender/blentranslation/msgfmt/msgfmt.c index 4691d791301..720be11d3b7 100644 --- a/source/blender/blentranslation/msgfmt/msgfmt.c +++ b/source/blender/blentranslation/msgfmt/msgfmt.c @@ -32,15 +32,15 @@ * Usage: msgfmt input.po output.po */ -#include #include +#include -#include "BLI_utildefines.h" #include "BLI_dynstr.h" #include "BLI_fileops.h" #include "BLI_ghash.h" #include "BLI_linklist.h" #include "BLI_memarena.h" +#include "BLI_utildefines.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/bmesh/bmesh.h b/source/blender/bmesh/bmesh.h index bdb719e0d7a..7d2100c0f65 100644 --- a/source/blender/bmesh/bmesh.h +++ b/source/blender/bmesh/bmesh.h @@ -192,22 +192,22 @@ extern "C" { #endif -#include "DNA_listBase.h" /* selection history uses */ #include "DNA_customdata_types.h" /* BMesh struct in bmesh_class.h uses */ +#include "DNA_listBase.h" /* selection history uses */ -#include -#include #include +#include +#include #include "bmesh_class.h" /* include the rest of the API */ -#include "intern/bmesh_operator_api.h" #include "intern/bmesh_error.h" +#include "intern/bmesh_operator_api.h" -#include "intern/bmesh_core.h" #include "intern/bmesh_callback_generic.h" #include "intern/bmesh_construct.h" +#include "intern/bmesh_core.h" #include "intern/bmesh_delete.h" #include "intern/bmesh_edgeloop.h" #include "intern/bmesh_interp.h" diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index f795783d161..8f55c14c681 100644 --- a/source/blender/bmesh/intern/bmesh_core.c +++ b/source/blender/bmesh/intern/bmesh_core.c @@ -22,10 +22,10 @@ #include "MEM_guardedalloc.h" -#include "BLI_math_vector.h" -#include "BLI_array.h" #include "BLI_alloca.h" +#include "BLI_array.h" #include "BLI_linklist_stack.h" +#include "BLI_math_vector.h" #include "BLI_utildefines_stack.h" #include "BLT_translation.h" diff --git a/source/blender/bmesh/intern/bmesh_edgeloop.c b/source/blender/bmesh/intern/bmesh_edgeloop.c index c07bae5e3f2..e4312877fc6 100644 --- a/source/blender/bmesh/intern/bmesh_edgeloop.c +++ b/source/blender/bmesh/intern/bmesh_edgeloop.c @@ -25,11 +25,11 @@ #include "MEM_guardedalloc.h" -#include "BLI_math_vector.h" #include "BLI_listbase.h" +#include "BLI_math_vector.h" #include "BLI_mempool.h" -#include "BLI_utildefines_iter.h" #include "BLI_stack.h" +#include "BLI_utildefines_iter.h" #include "bmesh.h" diff --git a/source/blender/bmesh/intern/bmesh_iterators.c b/source/blender/bmesh/intern/bmesh_iterators.c index b1e20dd6058..c4dd53b0497 100644 --- a/source/blender/bmesh/intern/bmesh_iterators.c +++ b/source/blender/bmesh/intern/bmesh_iterators.c @@ -24,8 +24,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_bitmap.h" +#include "BLI_utildefines.h" #include "bmesh.h" #include "intern/bmesh_private.h" diff --git a/source/blender/bmesh/intern/bmesh_log.c b/source/blender/bmesh/intern/bmesh_log.c index b4e78453226..6c0585a7759 100644 --- a/source/blender/bmesh/intern/bmesh_log.c +++ b/source/blender/bmesh/intern/bmesh_log.c @@ -31,11 +31,11 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_mempool.h" +#include "BLI_utildefines.h" #include "BKE_customdata.h" diff --git a/source/blender/bmesh/intern/bmesh_marking.c b/source/blender/bmesh/intern/bmesh_marking.c index 58a7d423d67..d33f4e0a1d6 100644 --- a/source/blender/bmesh/intern/bmesh_marking.c +++ b/source/blender/bmesh/intern/bmesh_marking.c @@ -31,8 +31,8 @@ #include "DNA_scene_types.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "bmesh.h" #include "bmesh_structure.h" diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.c b/source/blender/bmesh/intern/bmesh_mesh_conv.c index 1ecbfccab74..de32d7881b0 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_conv.c +++ b/source/blender/bmesh/intern/bmesh_mesh_conv.c @@ -70,25 +70,25 @@ * and only editing the active shape key-block. */ +#include "DNA_key_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_object_types.h" #include "DNA_modifier_types.h" -#include "DNA_key_types.h" +#include "DNA_object_types.h" #include "MEM_guardedalloc.h" -#include "BLI_listbase.h" #include "BLI_alloca.h" +#include "BLI_listbase.h" #include "BLI_math_vector.h" +#include "BKE_customdata.h" #include "BKE_mesh.h" #include "BKE_mesh_runtime.h" -#include "BKE_customdata.h" #include "BKE_multires.h" -#include "BKE_main.h" #include "BKE_key.h" +#include "BKE_main.h" #include "bmesh.h" #include "intern/bmesh_private.h" /* For element checking. */ diff --git a/source/blender/bmesh/intern/bmesh_mesh_validate.c b/source/blender/bmesh/intern/bmesh_mesh_validate.c index 83ab29940f3..f8830e1557b 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_validate.c +++ b/source/blender/bmesh/intern/bmesh_mesh_validate.c @@ -26,8 +26,8 @@ /* debug builds only */ #ifdef DEBUG -# include "BLI_utildefines.h" # include "BLI_edgehash.h" +# include "BLI_utildefines.h" # include "bmesh.h" diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c index 53f68804bd3..7b5df536192 100644 --- a/source/blender/bmesh/intern/bmesh_mods.c +++ b/source/blender/bmesh/intern/bmesh_mods.c @@ -23,8 +23,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_array.h" +#include "BLI_math.h" #include "BKE_customdata.h" diff --git a/source/blender/bmesh/intern/bmesh_operators.c b/source/blender/bmesh/intern/bmesh_operators.c index 2ec7e06a264..d3c8499477b 100644 --- a/source/blender/bmesh/intern/bmesh_operators.c +++ b/source/blender/bmesh/intern/bmesh_operators.c @@ -22,12 +22,12 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_string.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_memarena.h" #include "BLI_mempool.h" -#include "BLI_listbase.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c index 915ad6bf5c4..9ab5106cec2 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.c +++ b/source/blender/bmesh/intern/bmesh_polygon.c @@ -23,18 +23,18 @@ */ #include "DNA_listBase.h" -#include "DNA_modifier_types.h" #include "DNA_meshdata_types.h" +#include "DNA_modifier_types.h" #include "MEM_guardedalloc.h" #include "BLI_alloca.h" +#include "BLI_heap.h" +#include "BLI_linklist.h" #include "BLI_math.h" #include "BLI_memarena.h" #include "BLI_polyfill_2d.h" #include "BLI_polyfill_2d_beautify.h" -#include "BLI_linklist.h" -#include "BLI_heap.h" #include "bmesh.h" #include "bmesh_tools.h" diff --git a/source/blender/bmesh/intern/bmesh_polygon_edgenet.c b/source/blender/bmesh/intern/bmesh_polygon_edgenet.c index f6ed95d322d..284f5265b90 100644 --- a/source/blender/bmesh/intern/bmesh_polygon_edgenet.c +++ b/source/blender/bmesh/intern/bmesh_polygon_edgenet.c @@ -24,14 +24,14 @@ #include "MEM_guardedalloc.h" +#include "BLI_alloca.h" +#include "BLI_array.h" +#include "BLI_kdopbvh.h" +#include "BLI_linklist_stack.h" #include "BLI_math.h" #include "BLI_memarena.h" -#include "BLI_array.h" -#include "BLI_alloca.h" -#include "BLI_utildefines_stack.h" -#include "BLI_linklist_stack.h" #include "BLI_sort_utils.h" -#include "BLI_kdopbvh.h" +#include "BLI_utildefines_stack.h" #include "BKE_customdata.h" diff --git a/source/blender/bmesh/intern/bmesh_query.c b/source/blender/bmesh/intern/bmesh_query.c index a9b0d4d3918..e3b6e243906 100644 --- a/source/blender/bmesh/intern/bmesh_query.c +++ b/source/blender/bmesh/intern/bmesh_query.c @@ -27,9 +27,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_alloca.h" #include "BLI_linklist.h" +#include "BLI_math.h" #include "BLI_utildefines_stack.h" #include "BKE_customdata.h" diff --git a/source/blender/bmesh/intern/bmesh_walkers.c b/source/blender/bmesh/intern/bmesh_walkers.c index 05ae8c940af..860c83ec1e5 100644 --- a/source/blender/bmesh/intern/bmesh_walkers.c +++ b/source/blender/bmesh/intern/bmesh_walkers.c @@ -23,8 +23,8 @@ #include #include /* for memcpy */ -#include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "bmesh.h" diff --git a/source/blender/bmesh/operators/bmo_bevel.c b/source/blender/bmesh/operators/bmo_bevel.c index 1d5bcf8b160..18193beff58 100644 --- a/source/blender/bmesh/operators/bmo_bevel.c +++ b/source/blender/bmesh/operators/bmo_bevel.c @@ -22,10 +22,10 @@ #include "BLI_utildefines.h" -#include "bmesh.h" -#include "bmesh_tools.h" #include "BKE_curveprofile.h" #include "DNA_curveprofile_types.h" +#include "bmesh.h" +#include "bmesh_tools.h" #include "intern/bmesh_operators_private.h" /* own include */ diff --git a/source/blender/bmesh/operators/bmo_bisect_plane.c b/source/blender/bmesh/operators/bmo_bisect_plane.c index f3062cac85c..ef59ebf1f2f 100644 --- a/source/blender/bmesh/operators/bmo_bisect_plane.c +++ b/source/blender/bmesh/operators/bmo_bisect_plane.c @@ -22,9 +22,9 @@ #include "MEM_guardedalloc.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLI_utildefines_stack.h" -#include "BLI_math.h" #include "bmesh.h" #include "bmesh_tools.h" diff --git a/source/blender/bmesh/operators/bmo_bridge.c b/source/blender/bmesh/operators/bmo_bridge.c index bad5036f6cf..5713c17e146 100644 --- a/source/blender/bmesh/operators/bmo_bridge.c +++ b/source/blender/bmesh/operators/bmo_bridge.c @@ -20,9 +20,9 @@ * Connect verts across faces (splits faces) and bridge tool. */ +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BLI_listbase.h" #include "bmesh.h" diff --git a/source/blender/bmesh/operators/bmo_connect.c b/source/blender/bmesh/operators/bmo_connect.c index 2f0b21667e4..9969d31a4a5 100644 --- a/source/blender/bmesh/operators/bmo_connect.c +++ b/source/blender/bmesh/operators/bmo_connect.c @@ -20,10 +20,10 @@ * Connect verts across faces (splits faces). */ -#include "BLI_utildefines.h" -#include "BLI_utildefines_stack.h" #include "BLI_alloca.h" #include "BLI_linklist_stack.h" +#include "BLI_utildefines.h" +#include "BLI_utildefines_stack.h" #include "bmesh.h" diff --git a/source/blender/bmesh/operators/bmo_connect_concave.c b/source/blender/bmesh/operators/bmo_connect_concave.c index 0d0c21774c3..e7b86f102a2 100644 --- a/source/blender/bmesh/operators/bmo_connect_concave.c +++ b/source/blender/bmesh/operators/bmo_connect_concave.c @@ -30,14 +30,14 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_alloca.h" -#include "BLI_memarena.h" #include "BLI_heap.h" +#include "BLI_linklist.h" +#include "BLI_math.h" +#include "BLI_memarena.h" #include "BLI_polyfill_2d.h" #include "BLI_polyfill_2d_beautify.h" -#include "BLI_linklist.h" +#include "BLI_utildefines.h" #include "bmesh.h" diff --git a/source/blender/bmesh/operators/bmo_connect_nonplanar.c b/source/blender/bmesh/operators/bmo_connect_nonplanar.c index 5be4826c7d3..e0c5109430d 100644 --- a/source/blender/bmesh/operators/bmo_connect_nonplanar.c +++ b/source/blender/bmesh/operators/bmo_connect_nonplanar.c @@ -20,10 +20,10 @@ * Connect verts non-planer faces iteratively (splits faces). */ -#include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_alloca.h" #include "BLI_linklist_stack.h" +#include "BLI_math.h" +#include "BLI_utildefines.h" #include "bmesh.h" diff --git a/source/blender/bmesh/operators/bmo_connect_pair.c b/source/blender/bmesh/operators/bmo_connect_pair.c index 07ead2b8a96..ba8a93ff819 100644 --- a/source/blender/bmesh/operators/bmo_connect_pair.c +++ b/source/blender/bmesh/operators/bmo_connect_pair.c @@ -22,9 +22,9 @@ #include "MEM_guardedalloc.h" +#include "BLI_heap_simple.h" #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BLI_heap_simple.h" #include "bmesh.h" diff --git a/source/blender/bmesh/operators/bmo_dissolve.c b/source/blender/bmesh/operators/bmo_dissolve.c index 6c662323ec1..8c2e820df63 100644 --- a/source/blender/bmesh/operators/bmo_dissolve.c +++ b/source/blender/bmesh/operators/bmo_dissolve.c @@ -23,8 +23,8 @@ #include "MEM_guardedalloc.h" #include "BLI_array.h" -#include "BLI_stack.h" #include "BLI_math.h" +#include "BLI_stack.h" #include "bmesh.h" #include "bmesh_tools.h" diff --git a/source/blender/bmesh/operators/bmo_dupe.c b/source/blender/bmesh/operators/bmo_dupe.c index 65b70f62b58..6e968d58631 100644 --- a/source/blender/bmesh/operators/bmo_dupe.c +++ b/source/blender/bmesh/operators/bmo_dupe.c @@ -22,8 +22,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_alloca.h" +#include "BLI_math.h" #include "bmesh.h" diff --git a/source/blender/bmesh/operators/bmo_edgenet.c b/source/blender/bmesh/operators/bmo_edgenet.c index d38a1be7a8d..16bbbd5df88 100644 --- a/source/blender/bmesh/operators/bmo_edgenet.c +++ b/source/blender/bmesh/operators/bmo_edgenet.c @@ -22,8 +22,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_array.h" +#include "BLI_math.h" #include "bmesh.h" #include "bmesh_tools.h" diff --git a/source/blender/bmesh/operators/bmo_extrude.c b/source/blender/bmesh/operators/bmo_extrude.c index 7d557204369..7a7f4a14db3 100644 --- a/source/blender/bmesh/operators/bmo_extrude.c +++ b/source/blender/bmesh/operators/bmo_extrude.c @@ -24,8 +24,8 @@ #include "DNA_meshdata_types.h" -#include "BLI_math.h" #include "BLI_buffer.h" +#include "BLI_math.h" #include "BKE_customdata.h" diff --git a/source/blender/bmesh/operators/bmo_fill_attribute.c b/source/blender/bmesh/operators/bmo_fill_attribute.c index 1e226beffc7..782fd98c2ea 100644 --- a/source/blender/bmesh/operators/bmo_fill_attribute.c +++ b/source/blender/bmesh/operators/bmo_fill_attribute.c @@ -20,8 +20,8 @@ * Fill in geometry with the attributes of their adjacent data. */ -#include "BLI_utildefines.h" #include "BLI_linklist_stack.h" +#include "BLI_utildefines.h" #include "bmesh.h" diff --git a/source/blender/bmesh/operators/bmo_inset.c b/source/blender/bmesh/operators/bmo_inset.c index 43dacfb5100..097a7aca383 100644 --- a/source/blender/bmesh/operators/bmo_inset.c +++ b/source/blender/bmesh/operators/bmo_inset.c @@ -23,8 +23,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_alloca.h" +#include "BLI_math.h" #include "BLI_memarena.h" #include "BLI_utildefines_stack.h" diff --git a/source/blender/bmesh/operators/bmo_mesh_conv.c b/source/blender/bmesh/operators/bmo_mesh_conv.c index 2c76074ad79..e480db64f9d 100644 --- a/source/blender/bmesh/operators/bmo_mesh_conv.c +++ b/source/blender/bmesh/operators/bmo_mesh_conv.c @@ -22,9 +22,9 @@ * into a Bmesh, and back again. */ +#include "DNA_key_types.h" #include "DNA_mesh_types.h" #include "DNA_object_types.h" -#include "DNA_key_types.h" #include "BLI_math.h" diff --git a/source/blender/bmesh/operators/bmo_normals.c b/source/blender/bmesh/operators/bmo_normals.c index b24afc0f8e6..93a377ac2ca 100644 --- a/source/blender/bmesh/operators/bmo_normals.c +++ b/source/blender/bmesh/operators/bmo_normals.c @@ -22,8 +22,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_linklist_stack.h" +#include "BLI_math.h" #include "bmesh.h" diff --git a/source/blender/bmesh/operators/bmo_offset_edgeloops.c b/source/blender/bmesh/operators/bmo_offset_edgeloops.c index 37b2133e0e4..d723e128bf1 100644 --- a/source/blender/bmesh/operators/bmo_offset_edgeloops.c +++ b/source/blender/bmesh/operators/bmo_offset_edgeloops.c @@ -25,8 +25,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_alloca.h" +#include "BLI_math.h" #include "BLI_utildefines_stack.h" #include "BKE_customdata.h" diff --git a/source/blender/bmesh/operators/bmo_planar_faces.c b/source/blender/bmesh/operators/bmo_planar_faces.c index 9315d002d46..c8f9d9a38dd 100644 --- a/source/blender/bmesh/operators/bmo_planar_faces.c +++ b/source/blender/bmesh/operators/bmo_planar_faces.c @@ -22,8 +22,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_ghash.h" +#include "BLI_math.h" #include "bmesh.h" diff --git a/source/blender/bmesh/operators/bmo_removedoubles.c b/source/blender/bmesh/operators/bmo_removedoubles.c index 1d28d8223cd..02f17ea5d4a 100644 --- a/source/blender/bmesh/operators/bmo_removedoubles.c +++ b/source/blender/bmesh/operators/bmo_removedoubles.c @@ -22,12 +22,12 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_alloca.h" #include "BLI_kdtree.h" #include "BLI_listbase.h" -#include "BLI_utildefines_stack.h" +#include "BLI_math.h" #include "BLI_stack.h" +#include "BLI_utildefines_stack.h" #include "BKE_customdata.h" diff --git a/source/blender/bmesh/operators/bmo_rotate_edges.c b/source/blender/bmesh/operators/bmo_rotate_edges.c index 56eaac03970..0c7c13610e6 100644 --- a/source/blender/bmesh/operators/bmo_rotate_edges.c +++ b/source/blender/bmesh/operators/bmo_rotate_edges.c @@ -22,8 +22,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_heap.h" +#include "BLI_math.h" #include "bmesh.h" diff --git a/source/blender/bmesh/operators/bmo_subdivide.c b/source/blender/bmesh/operators/bmo_subdivide.c index 41f65dd6f5a..bf63261fd4d 100644 --- a/source/blender/bmesh/operators/bmo_subdivide.c +++ b/source/blender/bmesh/operators/bmo_subdivide.c @@ -22,17 +22,17 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" -#include "BLI_rand.h" #include "BLI_array.h" +#include "BLI_math.h" #include "BLI_noise.h" +#include "BLI_rand.h" #include "BLI_stack.h" #include "BKE_customdata.h" #include "bmesh.h" -#include "intern/bmesh_private.h" #include "intern/bmesh_operators_private.h" +#include "intern/bmesh_private.h" typedef struct SubDParams { int numcuts; diff --git a/source/blender/bmesh/operators/bmo_subdivide_edgering.c b/source/blender/bmesh/operators/bmo_subdivide_edgering.c index b9d5548f5d4..b261f018e3e 100644 --- a/source/blender/bmesh/operators/bmo_subdivide_edgering.c +++ b/source/blender/bmesh/operators/bmo_subdivide_edgering.c @@ -33,11 +33,11 @@ #include "MEM_guardedalloc.h" +#include "BLI_alloca.h" +#include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLI_utildefines_stack.h" -#include "BLI_alloca.h" -#include "BLI_math.h" -#include "BLI_listbase.h" #include "BKE_curve.h" diff --git a/source/blender/bmesh/operators/bmo_symmetrize.c b/source/blender/bmesh/operators/bmo_symmetrize.c index 31c61f28ea9..e0df1c57d98 100644 --- a/source/blender/bmesh/operators/bmo_symmetrize.c +++ b/source/blender/bmesh/operators/bmo_symmetrize.c @@ -20,8 +20,8 @@ * Makes the mesh symmetrical by splitting along an axis and duplicating the geometry. */ -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "bmesh.h" #include "intern/bmesh_operators_private.h" diff --git a/source/blender/bmesh/operators/bmo_triangulate.c b/source/blender/bmesh/operators/bmo_triangulate.c index f2a4f85acf9..b07494345ab 100644 --- a/source/blender/bmesh/operators/bmo_triangulate.c +++ b/source/blender/bmesh/operators/bmo_triangulate.c @@ -25,8 +25,8 @@ #include "DNA_listBase.h" #include "BLI_math.h" -#include "BLI_sort_utils.h" #include "BLI_scanfill.h" +#include "BLI_sort_utils.h" #include "bmesh.h" #include "bmesh_tools.h" diff --git a/source/blender/bmesh/operators/bmo_utils.c b/source/blender/bmesh/operators/bmo_utils.c index bc06d5e454b..ffb4af1fe3c 100644 --- a/source/blender/bmesh/operators/bmo_utils.c +++ b/source/blender/bmesh/operators/bmo_utils.c @@ -25,8 +25,8 @@ #include "DNA_meshdata_types.h" -#include "BLI_math.h" #include "BLI_alloca.h" +#include "BLI_math.h" #include "BKE_customdata.h" diff --git a/source/blender/bmesh/tools/bmesh_beautify.c b/source/blender/bmesh/tools/bmesh_beautify.c index dabdbc3c97a..c877c534376 100644 --- a/source/blender/bmesh/tools/bmesh_beautify.c +++ b/source/blender/bmesh/tools/bmesh_beautify.c @@ -29,8 +29,8 @@ * - Take face normals into account. */ -#include "BLI_math.h" #include "BLI_heap.h" +#include "BLI_math.h" #include "BLI_polyfill_2d_beautify.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index 1ab318a8946..4e4af05b17b 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -26,8 +26,8 @@ #include "DNA_modifier_types.h" #include "DNA_scene_types.h" -#include "BLI_array.h" #include "BLI_alloca.h" +#include "BLI_array.h" #include "BLI_math.h" #include "BLI_memarena.h" #include "BLI_utildefines.h" diff --git a/source/blender/bmesh/tools/bmesh_bisect_plane.c b/source/blender/bmesh/tools/bmesh_bisect_plane.c index 8ae0dfecf55..7b6a820ea33 100644 --- a/source/blender/bmesh/tools/bmesh_bisect_plane.c +++ b/source/blender/bmesh/tools/bmesh_bisect_plane.c @@ -31,12 +31,12 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_utildefines_stack.h" #include "BLI_alloca.h" #include "BLI_linklist.h" #include "BLI_linklist_stack.h" #include "BLI_math.h" +#include "BLI_utildefines.h" +#include "BLI_utildefines_stack.h" #include "bmesh.h" #include "bmesh_bisect_plane.h" /* own include */ diff --git a/source/blender/bmesh/tools/bmesh_decimate_collapse.c b/source/blender/bmesh/tools/bmesh_decimate_collapse.c index c183f370faa..0fc0fb130fc 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_collapse.c +++ b/source/blender/bmesh/tools/bmesh_decimate_collapse.c @@ -24,14 +24,14 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" -#include "BLI_quadric.h" +#include "BLI_alloca.h" #include "BLI_heap.h" #include "BLI_linklist.h" -#include "BLI_alloca.h" +#include "BLI_math.h" #include "BLI_memarena.h" #include "BLI_polyfill_2d.h" #include "BLI_polyfill_2d_beautify.h" +#include "BLI_quadric.h" #include "BLI_utildefines_stack.h" #include "BKE_customdata.h" diff --git a/source/blender/bmesh/tools/bmesh_decimate_dissolve.c b/source/blender/bmesh/tools/bmesh_decimate_dissolve.c index d4bce75d08b..0f23165f9af 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_dissolve.c +++ b/source/blender/bmesh/tools/bmesh_decimate_dissolve.c @@ -22,8 +22,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_heap.h" +#include "BLI_math.h" #include "BKE_customdata.h" diff --git a/source/blender/bmesh/tools/bmesh_edgenet.c b/source/blender/bmesh/tools/bmesh_edgenet.c index a3b9ce76b47..70b39393a4f 100644 --- a/source/blender/bmesh/tools/bmesh_edgenet.c +++ b/source/blender/bmesh/tools/bmesh_edgenet.c @@ -24,10 +24,10 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_alloca.h" -#include "BLI_mempool.h" #include "BLI_linklist.h" +#include "BLI_mempool.h" +#include "BLI_utildefines.h" #include "bmesh.h" #include "bmesh_edgenet.h" /* own include */ diff --git a/source/blender/bmesh/tools/bmesh_intersect.c b/source/blender/bmesh/tools/bmesh_intersect.c index 8e378a034ab..4ca8364c312 100644 --- a/source/blender/bmesh/tools/bmesh_intersect.c +++ b/source/blender/bmesh/tools/bmesh_intersect.c @@ -33,19 +33,19 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" -#include "BLI_utildefines.h" -#include "BLI_memarena.h" #include "BLI_alloca.h" +#include "BLI_math.h" +#include "BLI_memarena.h" #include "BLI_sort_utils.h" +#include "BLI_utildefines.h" #include "BLI_linklist_stack.h" #include "BLI_utildefines_stack.h" #ifndef NDEBUG #endif -#include "BLI_kdopbvh.h" #include "BLI_buffer.h" +#include "BLI_kdopbvh.h" #include "bmesh.h" #include "intern/bmesh_private.h" diff --git a/source/blender/bmesh/tools/bmesh_path.c b/source/blender/bmesh/tools/bmesh_path.c index a874965c978..0331ca476dd 100644 --- a/source/blender/bmesh/tools/bmesh_path.c +++ b/source/blender/bmesh/tools/bmesh_path.c @@ -22,9 +22,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" -#include "BLI_linklist.h" #include "BLI_heap_simple.h" +#include "BLI_linklist.h" +#include "BLI_math.h" #include "bmesh.h" #include "bmesh_path.h" /* own include */ diff --git a/source/blender/bmesh/tools/bmesh_path_region.c b/source/blender/bmesh/tools/bmesh_path_region.c index 841109a251f..f3061704884 100644 --- a/source/blender/bmesh/tools/bmesh_path_region.c +++ b/source/blender/bmesh/tools/bmesh_path_region.c @@ -23,10 +23,10 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" -#include "BLI_linklist.h" -#include "BLI_utildefines_stack.h" #include "BLI_alloca.h" +#include "BLI_linklist.h" +#include "BLI_math.h" +#include "BLI_utildefines_stack.h" #include "bmesh.h" #include "bmesh_path_region.h" /* own include */ diff --git a/source/blender/bmesh/tools/bmesh_region_match.c b/source/blender/bmesh/tools/bmesh_region_match.c index b4c2c3f091e..44761b9f37e 100644 --- a/source/blender/bmesh/tools/bmesh_region_match.c +++ b/source/blender/bmesh/tools/bmesh_region_match.c @@ -33,13 +33,13 @@ #include -#include "MEM_guardedalloc.h" -#include "BLI_listbase.h" -#include "BLI_linklist.h" #include "BLI_alloca.h" #include "BLI_ghash.h" -#include "BLI_mempool.h" +#include "BLI_linklist.h" #include "BLI_linklist_stack.h" +#include "BLI_listbase.h" +#include "BLI_mempool.h" +#include "MEM_guardedalloc.h" #include "bmesh.h" diff --git a/source/blender/bmesh/tools/bmesh_separate.c b/source/blender/bmesh/tools/bmesh_separate.c index 59c82448fa9..701c7dc7e03 100644 --- a/source/blender/bmesh/tools/bmesh_separate.c +++ b/source/blender/bmesh/tools/bmesh_separate.c @@ -25,12 +25,12 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_buffer.h" +#include "BLI_utildefines.h" #include "bmesh.h" -#include "intern/bmesh_private.h" #include "bmesh_separate.h" /* own include */ +#include "intern/bmesh_private.h" /** * Split all faces that match `filter_fn`. diff --git a/source/blender/bmesh/tools/bmesh_triangulate.c b/source/blender/bmesh/tools/bmesh_triangulate.c index 5c13292e556..08dbac95b56 100644 --- a/source/blender/bmesh/tools/bmesh_triangulate.c +++ b/source/blender/bmesh/tools/bmesh_triangulate.c @@ -24,11 +24,11 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_alloca.h" -#include "BLI_memarena.h" #include "BLI_heap.h" #include "BLI_linklist.h" +#include "BLI_memarena.h" +#include "BLI_utildefines.h" /* only for defines */ #include "BLI_polyfill_2d.h" diff --git a/source/blender/bmesh/tools/bmesh_wireframe.c b/source/blender/bmesh/tools/bmesh_wireframe.c index 1cfd608e959..2240c64807c 100644 --- a/source/blender/bmesh/tools/bmesh_wireframe.c +++ b/source/blender/bmesh/tools/bmesh_wireframe.c @@ -28,8 +28,8 @@ #include "bmesh.h" -#include "BKE_deform.h" #include "BKE_customdata.h" +#include "BKE_deform.h" #include "bmesh_wireframe.h" diff --git a/source/blender/compositor/intern/COM_CompositorContext.h b/source/blender/compositor/intern/COM_CompositorContext.h index b28d5ff0cdf..7e775b7beaf 100644 --- a/source/blender/compositor/intern/COM_CompositorContext.h +++ b/source/blender/compositor/intern/COM_CompositorContext.h @@ -19,13 +19,13 @@ #ifndef __COM_COMPOSITORCONTEXT_H__ #define __COM_COMPOSITORCONTEXT_H__ -#include -#include -#include "DNA_node_types.h" -#include "DNA_color_types.h" #include "BLI_rect.h" -#include "DNA_scene_types.h" #include "COM_defines.h" +#include "DNA_color_types.h" +#include "DNA_node_types.h" +#include "DNA_scene_types.h" +#include +#include /** * \brief Overall context of the compositor diff --git a/source/blender/compositor/intern/COM_Converter.cpp b/source/blender/compositor/intern/COM_Converter.cpp index 704833389f8..e8474ba8318 100644 --- a/source/blender/compositor/intern/COM_Converter.cpp +++ b/source/blender/compositor/intern/COM_Converter.cpp @@ -24,8 +24,8 @@ extern "C" { #include "BKE_node.h" } -#include "COM_NodeOperationBuilder.h" #include "COM_NodeOperation.h" +#include "COM_NodeOperationBuilder.h" #include "COM_AlphaOverNode.h" #include "COM_BilateralBlurNode.h" @@ -77,9 +77,9 @@ extern "C" { #include "COM_KeyingScreenNode.h" #include "COM_LensDistortionNode.h" #include "COM_LuminanceMatteNode.h" +#include "COM_MapRangeNode.h" #include "COM_MapUVNode.h" #include "COM_MapValueNode.h" -#include "COM_MapRangeNode.h" #include "COM_MaskNode.h" #include "COM_MathNode.h" #include "COM_MixNode.h" @@ -88,6 +88,8 @@ extern "C" { #include "COM_NormalNode.h" #include "COM_NormalizeNode.h" #include "COM_OutputFileNode.h" +#include "COM_PixelateNode.h" +#include "COM_PlaneTrackDeformNode.h" #include "COM_RenderLayersNode.h" #include "COM_RotateNode.h" #include "COM_ScaleNode.h" @@ -103,18 +105,16 @@ extern "C" { #include "COM_TextureNode.h" #include "COM_TimeNode.h" #include "COM_TonemapNode.h" +#include "COM_TrackPositionNode.h" #include "COM_TransformNode.h" #include "COM_TranslateNode.h" #include "COM_TranslateOperation.h" -#include "COM_TrackPositionNode.h" #include "COM_ValueNode.h" #include "COM_VectorBlurNode.h" #include "COM_VectorCurveNode.h" #include "COM_ViewLevelsNode.h" #include "COM_ViewerNode.h" #include "COM_ZCombineNode.h" -#include "COM_PixelateNode.h" -#include "COM_PlaneTrackDeformNode.h" bool Converter::is_fast_node(bNode *b_node) { diff --git a/source/blender/compositor/intern/COM_Debug.cpp b/source/blender/compositor/intern/COM_Debug.cpp index c2ef7d37a59..b49d575cade 100644 --- a/source/blender/compositor/intern/COM_Debug.cpp +++ b/source/blender/compositor/intern/COM_Debug.cpp @@ -20,24 +20,24 @@ #ifdef COM_DEBUG -# include # include +# include # include extern "C" { -# include "BLI_sys_types.h" # include "BLI_fileops.h" # include "BLI_path_util.h" # include "BLI_string.h" +# include "BLI_sys_types.h" -# include "DNA_node_types.h" # include "BKE_appdir.h" # include "BKE_node.h" +# include "DNA_node_types.h" } -# include "COM_Node.h" -# include "COM_ExecutionSystem.h" # include "COM_ExecutionGroup.h" +# include "COM_ExecutionSystem.h" +# include "COM_Node.h" # include "COM_ReadBufferOperation.h" # include "COM_ViewerOperation.h" diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.cpp b/source/blender/compositor/intern/COM_ExecutionGroup.cpp index deb60836177..e5dfee7d0cd 100644 --- a/source/blender/compositor/intern/COM_ExecutionGroup.cpp +++ b/source/blender/compositor/intern/COM_ExecutionGroup.cpp @@ -23,20 +23,20 @@ #include "atomic_ops.h" -#include "COM_ExecutionGroup.h" -#include "COM_defines.h" -#include "COM_ExecutionSystem.h" -#include "COM_ReadBufferOperation.h" -#include "COM_WriteBufferOperation.h" -#include "COM_WorkScheduler.h" -#include "COM_ViewerOperation.h" #include "COM_ChunkOrder.h" #include "COM_Debug.h" +#include "COM_ExecutionGroup.h" +#include "COM_ExecutionSystem.h" +#include "COM_ReadBufferOperation.h" +#include "COM_ViewerOperation.h" +#include "COM_WorkScheduler.h" +#include "COM_WriteBufferOperation.h" +#include "COM_defines.h" -#include "MEM_guardedalloc.h" #include "BLI_math.h" #include "BLI_string.h" #include "BLT_translation.h" +#include "MEM_guardedalloc.h" #include "PIL_time.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.h b/source/blender/compositor/intern/COM_ExecutionGroup.h index 89464030cac..1989a6f6205 100644 --- a/source/blender/compositor/intern/COM_ExecutionGroup.h +++ b/source/blender/compositor/intern/COM_ExecutionGroup.h @@ -19,13 +19,13 @@ #ifndef __COM_EXECUTIONGROUP_H__ #define __COM_EXECUTIONGROUP_H__ +#include "BLI_rect.h" +#include "COM_CompositorContext.h" +#include "COM_Device.h" +#include "COM_MemoryProxy.h" #include "COM_Node.h" #include "COM_NodeOperation.h" #include -#include "BLI_rect.h" -#include "COM_MemoryProxy.h" -#include "COM_Device.h" -#include "COM_CompositorContext.h" using std::vector; diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.cpp b/source/blender/compositor/intern/COM_ExecutionSystem.cpp index d502deb1c93..fa40f150335 100644 --- a/source/blender/compositor/intern/COM_ExecutionSystem.cpp +++ b/source/blender/compositor/intern/COM_ExecutionSystem.cpp @@ -18,8 +18,8 @@ #include "COM_ExecutionSystem.h" -#include "PIL_time.h" #include "BLI_utildefines.h" +#include "PIL_time.h" extern "C" { #include "BKE_node.h" } @@ -27,12 +27,12 @@ extern "C" { #include "BLT_translation.h" #include "COM_Converter.h" -#include "COM_NodeOperationBuilder.h" -#include "COM_NodeOperation.h" -#include "COM_ExecutionGroup.h" -#include "COM_WorkScheduler.h" -#include "COM_ReadBufferOperation.h" #include "COM_Debug.h" +#include "COM_ExecutionGroup.h" +#include "COM_NodeOperation.h" +#include "COM_NodeOperationBuilder.h" +#include "COM_ReadBufferOperation.h" +#include "COM_WorkScheduler.h" #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.h b/source/blender/compositor/intern/COM_ExecutionSystem.h index 1977a31b15b..bf65594fc4f 100644 --- a/source/blender/compositor/intern/COM_ExecutionSystem.h +++ b/source/blender/compositor/intern/COM_ExecutionSystem.h @@ -21,12 +21,12 @@ class ExecutionGroup; #ifndef __COM_EXECUTIONSYSTEM_H__ #define __COM_EXECUTIONSYSTEM_H__ -#include "DNA_color_types.h" -#include "DNA_node_types.h" -#include "COM_Node.h" #include "BKE_text.h" #include "COM_ExecutionGroup.h" +#include "COM_Node.h" #include "COM_NodeOperation.h" +#include "DNA_color_types.h" +#include "DNA_node_types.h" /** * \page execution Execution model diff --git a/source/blender/compositor/intern/COM_Node.h b/source/blender/compositor/intern/COM_Node.h index c26f6cdfb8b..a2ab1996a19 100644 --- a/source/blender/compositor/intern/COM_Node.h +++ b/source/blender/compositor/intern/COM_Node.h @@ -20,9 +20,9 @@ #define __COM_NODE_H__ #include "DNA_node_types.h" -#include -#include #include +#include +#include /* common node includes * added here so node files don't have to include themselves diff --git a/source/blender/compositor/intern/COM_NodeConverter.cpp b/source/blender/compositor/intern/COM_NodeConverter.cpp index c44721e3939..eff825b075d 100644 --- a/source/blender/compositor/intern/COM_NodeConverter.cpp +++ b/source/blender/compositor/intern/COM_NodeConverter.cpp @@ -22,11 +22,11 @@ extern "C" { #include "COM_Debug.h" -#include "COM_NodeOperationBuilder.h" #include "COM_NodeOperation.h" +#include "COM_NodeOperationBuilder.h" +#include "COM_SetColorOperation.h" #include "COM_SetValueOperation.h" #include "COM_SetVectorOperation.h" -#include "COM_SetColorOperation.h" #include "COM_SocketProxyOperation.h" #include "COM_NodeConverter.h" /* own include */ diff --git a/source/blender/compositor/intern/COM_NodeOperation.cpp b/source/blender/compositor/intern/COM_NodeOperation.cpp index 80243c10760..fa4b5a07c65 100644 --- a/source/blender/compositor/intern/COM_NodeOperation.cpp +++ b/source/blender/compositor/intern/COM_NodeOperation.cpp @@ -16,11 +16,11 @@ * Copyright 2011, Blender Foundation. */ -#include #include +#include -#include "COM_defines.h" #include "COM_ExecutionSystem.h" +#include "COM_defines.h" #include "COM_NodeOperation.h" /* own include */ diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h index 6b073452771..b2c4961ca35 100644 --- a/source/blender/compositor/intern/COM_NodeOperation.h +++ b/source/blender/compositor/intern/COM_NodeOperation.h @@ -20,8 +20,8 @@ #define __COM_NODEOPERATION_H__ #include -#include #include +#include extern "C" { #include "BLI_math_color.h" @@ -29,9 +29,9 @@ extern "C" { #include "BLI_threads.h" } -#include "COM_Node.h" #include "COM_MemoryBuffer.h" #include "COM_MemoryProxy.h" +#include "COM_Node.h" #include "COM_SocketReader.h" #include "clew.h" diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp index a00c613d1e2..9f6b91915e0 100644 --- a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp +++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp @@ -20,22 +20,22 @@ extern "C" { #include "BLI_utildefines.h" } -#include "COM_NodeConverter.h" #include "COM_Converter.h" #include "COM_Debug.h" #include "COM_ExecutionSystem.h" #include "COM_Node.h" +#include "COM_NodeConverter.h" #include "COM_SocketProxyNode.h" #include "COM_NodeOperation.h" #include "COM_PreviewOperation.h" +#include "COM_ReadBufferOperation.h" +#include "COM_SetColorOperation.h" #include "COM_SetValueOperation.h" #include "COM_SetVectorOperation.h" -#include "COM_SetColorOperation.h" #include "COM_SocketProxyOperation.h" -#include "COM_ReadBufferOperation.h" -#include "COM_WriteBufferOperation.h" #include "COM_ViewerOperation.h" +#include "COM_WriteBufferOperation.h" #include "COM_NodeOperationBuilder.h" /* own include */ diff --git a/source/blender/compositor/intern/COM_OpenCLDevice.h b/source/blender/compositor/intern/COM_OpenCLDevice.h index 45ce77acac7..3f6e0fb55ef 100644 --- a/source/blender/compositor/intern/COM_OpenCLDevice.h +++ b/source/blender/compositor/intern/COM_OpenCLDevice.h @@ -22,9 +22,9 @@ class OpenCLDevice; #define __COM_OPENCLDEVICE_H__ #include "COM_Device.h" -#include "clew.h" -#include "COM_WorkScheduler.h" #include "COM_ReadBufferOperation.h" +#include "COM_WorkScheduler.h" +#include "clew.h" using std::list; diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cpp b/source/blender/compositor/intern/COM_WorkScheduler.cpp index 5ed2af0c11d..92e64c33d4d 100644 --- a/source/blender/compositor/intern/COM_WorkScheduler.cpp +++ b/source/blender/compositor/intern/COM_WorkScheduler.cpp @@ -19,18 +19,18 @@ #include #include -#include "COM_compositor.h" -#include "COM_WorkScheduler.h" #include "COM_CPUDevice.h" #include "COM_OpenCLDevice.h" #include "COM_OpenCLKernels.cl.h" -#include "clew.h" +#include "COM_WorkScheduler.h" #include "COM_WriteBufferOperation.h" +#include "COM_compositor.h" +#include "clew.h" #include "MEM_guardedalloc.h" -#include "PIL_time.h" #include "BLI_threads.h" +#include "PIL_time.h" #include "BKE_global.h" diff --git a/source/blender/compositor/intern/COM_WorkScheduler.h b/source/blender/compositor/intern/COM_WorkScheduler.h index 390fde82b61..5e0675f1833 100644 --- a/source/blender/compositor/intern/COM_WorkScheduler.h +++ b/source/blender/compositor/intern/COM_WorkScheduler.h @@ -23,9 +23,9 @@ extern "C" { #include "BLI_threads.h" } +#include "COM_Device.h" #include "COM_WorkPackage.h" #include "COM_defines.h" -#include "COM_Device.h" /** \brief the workscheduler * \ingroup execution diff --git a/source/blender/compositor/intern/COM_compositor.cpp b/source/blender/compositor/intern/COM_compositor.cpp index 50b578a9bc7..1793abae134 100644 --- a/source/blender/compositor/intern/COM_compositor.cpp +++ b/source/blender/compositor/intern/COM_compositor.cpp @@ -25,11 +25,11 @@ extern "C" { #include "BKE_scene.h" -#include "COM_compositor.h" #include "COM_ExecutionSystem.h" -#include "COM_WorkScheduler.h" -#include "clew.h" #include "COM_MovieDistortionOperation.h" +#include "COM_WorkScheduler.h" +#include "COM_compositor.h" +#include "clew.h" static ThreadMutex s_compositorMutex; static bool is_compositorMutex_init = false; diff --git a/source/blender/compositor/nodes/COM_AlphaOverNode.cpp b/source/blender/compositor/nodes/COM_AlphaOverNode.cpp index db05043a925..e5764c5bb73 100644 --- a/source/blender/compositor/nodes/COM_AlphaOverNode.cpp +++ b/source/blender/compositor/nodes/COM_AlphaOverNode.cpp @@ -18,10 +18,10 @@ #include "COM_AlphaOverNode.h" -#include "COM_MixOperation.h" #include "COM_AlphaOverKeyOperation.h" #include "COM_AlphaOverMixedOperation.h" #include "COM_AlphaOverPremultiplyOperation.h" +#include "COM_MixOperation.h" #include "COM_SetValueOperation.h" #include "DNA_material_types.h" // the ramp types diff --git a/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp b/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp index 453b1180467..e8037f923f2 100644 --- a/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp +++ b/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp @@ -17,9 +17,9 @@ */ #include "COM_BilateralBlurNode.h" -#include "DNA_node_types.h" -#include "COM_ExecutionSystem.h" #include "COM_BilateralBlurOperation.h" +#include "COM_ExecutionSystem.h" +#include "DNA_node_types.h" BilateralBlurNode::BilateralBlurNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_BlurNode.cpp b/source/blender/compositor/nodes/COM_BlurNode.cpp index a43441a2b13..808c1b22bdb 100644 --- a/source/blender/compositor/nodes/COM_BlurNode.cpp +++ b/source/blender/compositor/nodes/COM_BlurNode.cpp @@ -17,17 +17,17 @@ */ #include "COM_BlurNode.h" -#include "DNA_node_types.h" -#include "COM_GaussianXBlurOperation.h" -#include "COM_GaussianYBlurOperation.h" +#include "COM_ExecutionSystem.h" +#include "COM_FastGaussianBlurOperation.h" +#include "COM_GammaCorrectOperation.h" #include "COM_GaussianAlphaXBlurOperation.h" #include "COM_GaussianAlphaYBlurOperation.h" -#include "COM_ExecutionSystem.h" #include "COM_GaussianBokehBlurOperation.h" -#include "COM_FastGaussianBlurOperation.h" +#include "COM_GaussianXBlurOperation.h" +#include "COM_GaussianYBlurOperation.h" #include "COM_MathBaseOperation.h" #include "COM_SetValueOperation.h" -#include "COM_GammaCorrectOperation.h" +#include "DNA_node_types.h" BlurNode::BlurNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_BokehBlurNode.cpp b/source/blender/compositor/nodes/COM_BokehBlurNode.cpp index 56b5d35cbf5..5096dbef608 100644 --- a/source/blender/compositor/nodes/COM_BokehBlurNode.cpp +++ b/source/blender/compositor/nodes/COM_BokehBlurNode.cpp @@ -17,13 +17,13 @@ */ #include "COM_BokehBlurNode.h" -#include "DNA_camera_types.h" -#include "DNA_object_types.h" -#include "DNA_node_types.h" -#include "COM_ExecutionSystem.h" #include "COM_BokehBlurOperation.h" -#include "COM_VariableSizeBokehBlurOperation.h" #include "COM_ConvertDepthToRadiusOperation.h" +#include "COM_ExecutionSystem.h" +#include "COM_VariableSizeBokehBlurOperation.h" +#include "DNA_camera_types.h" +#include "DNA_node_types.h" +#include "DNA_object_types.h" BokehBlurNode::BokehBlurNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_BoxMaskNode.cpp b/source/blender/compositor/nodes/COM_BoxMaskNode.cpp index 98b4811743f..ef62536595c 100644 --- a/source/blender/compositor/nodes/COM_BoxMaskNode.cpp +++ b/source/blender/compositor/nodes/COM_BoxMaskNode.cpp @@ -20,8 +20,8 @@ #include "COM_BoxMaskOperation.h" #include "COM_ExecutionSystem.h" -#include "COM_SetValueOperation.h" #include "COM_ScaleOperation.h" +#include "COM_SetValueOperation.h" BoxMaskNode::BoxMaskNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp b/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp index 64503ca306b..596d9631297 100644 --- a/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp +++ b/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp @@ -17,10 +17,10 @@ */ #include "COM_ColorBalanceNode.h" -#include "COM_ColorBalanceLGGOperation.h" -#include "COM_ColorBalanceASCCDLOperation.h" -#include "COM_ExecutionSystem.h" #include "BKE_node.h" +#include "COM_ColorBalanceASCCDLOperation.h" +#include "COM_ColorBalanceLGGOperation.h" +#include "COM_ExecutionSystem.h" #include "COM_MixOperation.h" ColorBalanceNode::ColorBalanceNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_ColorNode.cpp b/source/blender/compositor/nodes/COM_ColorNode.cpp index 6bc700e3aa1..e6f8bfa01fe 100644 --- a/source/blender/compositor/nodes/COM_ColorNode.cpp +++ b/source/blender/compositor/nodes/COM_ColorNode.cpp @@ -17,8 +17,8 @@ */ #include "COM_ColorNode.h" -#include "COM_SetColorOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_SetColorOperation.h" ColorNode::ColorNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_ColorRampNode.cpp b/source/blender/compositor/nodes/COM_ColorRampNode.cpp index 0745f32218d..1504a76cee7 100644 --- a/source/blender/compositor/nodes/COM_ColorRampNode.cpp +++ b/source/blender/compositor/nodes/COM_ColorRampNode.cpp @@ -17,10 +17,10 @@ */ #include "COM_ColorRampNode.h" -#include "COM_ExecutionSystem.h" #include "BKE_node.h" #include "COM_ColorRampOperation.h" #include "COM_ConvertOperation.h" +#include "COM_ExecutionSystem.h" #include "DNA_texture_types.h" ColorRampNode::ColorRampNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_CryptomatteNode.cpp b/source/blender/compositor/nodes/COM_CryptomatteNode.cpp index da80ef697c1..8cc6b933759 100644 --- a/source/blender/compositor/nodes/COM_CryptomatteNode.cpp +++ b/source/blender/compositor/nodes/COM_CryptomatteNode.cpp @@ -17,12 +17,12 @@ */ #include "COM_CryptomatteNode.h" +#include "BLI_assert.h" +#include "BLI_hash_mm3.h" +#include "BLI_string.h" +#include "COM_ConvertOperation.h" #include "COM_CryptomatteOperation.h" #include "COM_SetAlphaOperation.h" -#include "COM_ConvertOperation.h" -#include "BLI_string.h" -#include "BLI_hash_mm3.h" -#include "BLI_assert.h" #include CryptomatteNode::CryptomatteNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_DefocusNode.cpp b/source/blender/compositor/nodes/COM_DefocusNode.cpp index 8d64b629e40..0f09e5bfc91 100644 --- a/source/blender/compositor/nodes/COM_DefocusNode.cpp +++ b/source/blender/compositor/nodes/COM_DefocusNode.cpp @@ -17,18 +17,18 @@ */ #include "COM_DefocusNode.h" -#include "DNA_scene_types.h" -#include "DNA_camera_types.h" -#include "DNA_object_types.h" -#include "DNA_node_types.h" -#include "COM_ExecutionSystem.h" -#include "COM_ConvertDepthToRadiusOperation.h" -#include "COM_VariableSizeBokehBlurOperation.h" #include "COM_BokehImageOperation.h" +#include "COM_ConvertDepthToRadiusOperation.h" +#include "COM_ExecutionSystem.h" +#include "COM_FastGaussianBlurOperation.h" +#include "COM_GammaCorrectOperation.h" #include "COM_MathBaseOperation.h" #include "COM_SetValueOperation.h" -#include "COM_GammaCorrectOperation.h" -#include "COM_FastGaussianBlurOperation.h" +#include "COM_VariableSizeBokehBlurOperation.h" +#include "DNA_camera_types.h" +#include "DNA_node_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" DefocusNode::DefocusNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_DenoiseNode.cpp b/source/blender/compositor/nodes/COM_DenoiseNode.cpp index a18fc82908a..1aae81e1e7b 100644 --- a/source/blender/compositor/nodes/COM_DenoiseNode.cpp +++ b/source/blender/compositor/nodes/COM_DenoiseNode.cpp @@ -16,10 +16,10 @@ * Copyright 2019, Blender Foundation. */ #include "COM_DenoiseNode.h" -#include "DNA_node_types.h" -#include "COM_SetValueOperation.h" -#include "COM_MixOperation.h" #include "COM_DenoiseOperation.h" +#include "COM_MixOperation.h" +#include "COM_SetValueOperation.h" +#include "DNA_node_types.h" DenoiseNode::DenoiseNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_DespeckleNode.cpp b/source/blender/compositor/nodes/COM_DespeckleNode.cpp index 16de1bd29d7..58734917831 100644 --- a/source/blender/compositor/nodes/COM_DespeckleNode.cpp +++ b/source/blender/compositor/nodes/COM_DespeckleNode.cpp @@ -17,10 +17,10 @@ */ #include "COM_DespeckleNode.h" -#include "DNA_scene_types.h" -#include "COM_ExecutionSystem.h" -#include "COM_DespeckleOperation.h" #include "BLI_math.h" +#include "COM_DespeckleOperation.h" +#include "COM_ExecutionSystem.h" +#include "DNA_scene_types.h" DespeckleNode::DespeckleNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_DilateErodeNode.cpp b/source/blender/compositor/nodes/COM_DilateErodeNode.cpp index 50fbe983c91..e90707618e5 100644 --- a/source/blender/compositor/nodes/COM_DilateErodeNode.cpp +++ b/source/blender/compositor/nodes/COM_DilateErodeNode.cpp @@ -17,12 +17,12 @@ */ #include "COM_DilateErodeNode.h" -#include "COM_ExecutionSystem.h" -#include "COM_DilateErodeOperation.h" +#include "BLI_math.h" #include "COM_AntiAliasOperation.h" +#include "COM_DilateErodeOperation.h" +#include "COM_ExecutionSystem.h" #include "COM_GaussianAlphaXBlurOperation.h" #include "COM_GaussianAlphaYBlurOperation.h" -#include "BLI_math.h" DilateErodeNode::DilateErodeNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp b/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp index faae759ba0c..f8d0eaf4675 100644 --- a/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp +++ b/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp @@ -17,9 +17,9 @@ */ #include "COM_DirectionalBlurNode.h" -#include "DNA_node_types.h" -#include "COM_ExecutionSystem.h" #include "COM_DirectionalBlurOperation.h" +#include "COM_ExecutionSystem.h" +#include "DNA_node_types.h" DirectionalBlurNode::DirectionalBlurNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp b/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp index 5f001f723e8..946d55d33fc 100644 --- a/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp +++ b/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp @@ -18,10 +18,10 @@ #include "COM_DistanceMatteNode.h" #include "BKE_node.h" +#include "COM_ConvertOperation.h" #include "COM_DistanceRGBMatteOperation.h" #include "COM_DistanceYCCMatteOperation.h" #include "COM_SetAlphaOperation.h" -#include "COM_ConvertOperation.h" DistanceMatteNode::DistanceMatteNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp b/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp index 349d0908a98..30d00252b76 100644 --- a/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp +++ b/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp @@ -20,8 +20,8 @@ #include "COM_EllipseMaskOperation.h" #include "COM_ExecutionSystem.h" -#include "COM_SetValueOperation.h" #include "COM_ScaleOperation.h" +#include "COM_SetValueOperation.h" EllipseMaskNode::EllipseMaskNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_FilterNode.cpp b/source/blender/compositor/nodes/COM_FilterNode.cpp index 1972cabc7c4..8b8ff55d544 100644 --- a/source/blender/compositor/nodes/COM_FilterNode.cpp +++ b/source/blender/compositor/nodes/COM_FilterNode.cpp @@ -17,10 +17,10 @@ */ #include "COM_FilterNode.h" -#include "COM_ConvolutionFilterOperation.h" -#include "COM_ConvolutionEdgeFilterOperation.h" -#include "COM_ExecutionSystem.h" #include "BKE_node.h" +#include "COM_ConvolutionEdgeFilterOperation.h" +#include "COM_ConvolutionFilterOperation.h" +#include "COM_ExecutionSystem.h" #include "COM_MixOperation.h" FilterNode::FilterNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_FlipNode.cpp b/source/blender/compositor/nodes/COM_FlipNode.cpp index 4dfff9c8e49..47148ceb1a9 100644 --- a/source/blender/compositor/nodes/COM_FlipNode.cpp +++ b/source/blender/compositor/nodes/COM_FlipNode.cpp @@ -18,8 +18,8 @@ #include "COM_FlipNode.h" -#include "COM_FlipOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_FlipOperation.h" FlipNode::FlipNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_GammaNode.cpp b/source/blender/compositor/nodes/COM_GammaNode.cpp index 0c60c871864..1ce17faa0dc 100644 --- a/source/blender/compositor/nodes/COM_GammaNode.cpp +++ b/source/blender/compositor/nodes/COM_GammaNode.cpp @@ -17,8 +17,8 @@ */ #include "COM_GammaNode.h" -#include "COM_GammaOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_GammaOperation.h" GammaNode::GammaNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_GlareNode.cpp b/source/blender/compositor/nodes/COM_GlareNode.cpp index 6a65486a97f..1ff058ce7d4 100644 --- a/source/blender/compositor/nodes/COM_GlareNode.cpp +++ b/source/blender/compositor/nodes/COM_GlareNode.cpp @@ -17,15 +17,15 @@ */ #include "COM_GlareNode.h" -#include "DNA_node_types.h" -#include "COM_GlareThresholdOperation.h" +#include "COM_FastGaussianBlurOperation.h" +#include "COM_GlareFogGlowOperation.h" +#include "COM_GlareGhostOperation.h" #include "COM_GlareSimpleStarOperation.h" #include "COM_GlareStreaksOperation.h" -#include "COM_SetValueOperation.h" +#include "COM_GlareThresholdOperation.h" #include "COM_MixOperation.h" -#include "COM_FastGaussianBlurOperation.h" -#include "COM_GlareGhostOperation.h" -#include "COM_GlareFogGlowOperation.h" +#include "COM_SetValueOperation.h" +#include "DNA_node_types.h" GlareNode::GlareNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp b/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp index b1157242e10..00125ba2ea5 100644 --- a/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp +++ b/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp @@ -20,11 +20,11 @@ #include "COM_ConvertOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_HueSaturationValueCorrectOperation.h" #include "COM_MixOperation.h" #include "COM_SetColorOperation.h" #include "COM_SetValueOperation.h" #include "DNA_node_types.h" -#include "COM_HueSaturationValueCorrectOperation.h" HueSaturationValueCorrectNode::HueSaturationValueCorrectNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp b/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp index 8aae5f0409c..dc2e5187e8f 100644 --- a/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp +++ b/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp @@ -18,12 +18,12 @@ #include "COM_HueSaturationValueNode.h" +#include "COM_ChangeHSVOperation.h" #include "COM_ConvertOperation.h" #include "COM_ExecutionSystem.h" #include "COM_MixOperation.h" #include "COM_SetColorOperation.h" #include "COM_SetValueOperation.h" -#include "COM_ChangeHSVOperation.h" #include "DNA_node_types.h" HueSaturationValueNode::HueSaturationValueNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_IDMaskNode.cpp b/source/blender/compositor/nodes/COM_IDMaskNode.cpp index 50dd2ed93e9..5ba54d75bcd 100644 --- a/source/blender/compositor/nodes/COM_IDMaskNode.cpp +++ b/source/blender/compositor/nodes/COM_IDMaskNode.cpp @@ -17,9 +17,9 @@ */ #include "COM_IDMaskNode.h" -#include "COM_IDMaskOperation.h" -#include "COM_ExecutionSystem.h" #include "COM_AntiAliasOperation.h" +#include "COM_ExecutionSystem.h" +#include "COM_IDMaskOperation.h" IDMaskNode::IDMaskNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_ImageNode.cpp b/source/blender/compositor/nodes/COM_ImageNode.cpp index 8e2590a9d92..3dbd3773247 100644 --- a/source/blender/compositor/nodes/COM_ImageNode.cpp +++ b/source/blender/compositor/nodes/COM_ImageNode.cpp @@ -17,17 +17,17 @@ */ #include "COM_ImageNode.h" +#include "BKE_node.h" +#include "BLI_utildefines.h" +#include "COM_ConvertOperation.h" #include "COM_ExecutionSystem.h" #include "COM_ImageOperation.h" #include "COM_MultilayerImageOperation.h" -#include "COM_ConvertOperation.h" -#include "BKE_node.h" -#include "BLI_utildefines.h" +#include "COM_SeparateColorNode.h" +#include "COM_SetColorOperation.h" #include "COM_SetValueOperation.h" #include "COM_SetVectorOperation.h" -#include "COM_SetColorOperation.h" -#include "COM_SeparateColorNode.h" ImageNode::ImageNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_ImageNode.h b/source/blender/compositor/nodes/COM_ImageNode.h index cde9f997f85..6ed9acd58b8 100644 --- a/source/blender/compositor/nodes/COM_ImageNode.h +++ b/source/blender/compositor/nodes/COM_ImageNode.h @@ -19,10 +19,10 @@ #ifndef __COM_IMAGENODE_H__ #define __COM_IMAGENODE_H__ -#include "COM_defines.h" #include "COM_Node.h" -#include "DNA_node_types.h" +#include "COM_defines.h" #include "DNA_image_types.h" +#include "DNA_node_types.h" extern "C" { #include "RE_engine.h" } diff --git a/source/blender/compositor/nodes/COM_InpaintNode.cpp b/source/blender/compositor/nodes/COM_InpaintNode.cpp index 454aa3e147b..40fe63ec9f3 100644 --- a/source/blender/compositor/nodes/COM_InpaintNode.cpp +++ b/source/blender/compositor/nodes/COM_InpaintNode.cpp @@ -17,10 +17,10 @@ */ #include "COM_InpaintNode.h" -#include "DNA_scene_types.h" +#include "BLI_math.h" #include "COM_ExecutionSystem.h" #include "COM_InpaintOperation.h" -#include "BLI_math.h" +#include "DNA_scene_types.h" InpaintNode::InpaintNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_InvertNode.cpp b/source/blender/compositor/nodes/COM_InvertNode.cpp index 82dd707a817..913452c42c8 100644 --- a/source/blender/compositor/nodes/COM_InvertNode.cpp +++ b/source/blender/compositor/nodes/COM_InvertNode.cpp @@ -17,9 +17,9 @@ */ #include "COM_InvertNode.h" -#include "COM_InvertOperation.h" -#include "COM_ExecutionSystem.h" #include "BKE_node.h" +#include "COM_ExecutionSystem.h" +#include "COM_InvertOperation.h" InvertNode::InvertNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_KeyingNode.cpp b/source/blender/compositor/nodes/COM_KeyingNode.cpp index b2ce7e1988c..b75d06763b7 100644 --- a/source/blender/compositor/nodes/COM_KeyingNode.cpp +++ b/source/blender/compositor/nodes/COM_KeyingNode.cpp @@ -20,10 +20,10 @@ #include "COM_ExecutionSystem.h" -#include "COM_KeyingOperation.h" #include "COM_KeyingBlurOperation.h" -#include "COM_KeyingDespillOperation.h" #include "COM_KeyingClipOperation.h" +#include "COM_KeyingDespillOperation.h" +#include "COM_KeyingOperation.h" #include "COM_MathBaseOperation.h" diff --git a/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp b/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp index 3599372f189..e435cefeefe 100644 --- a/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp +++ b/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp @@ -18,8 +18,8 @@ #include "COM_LuminanceMatteNode.h" #include "BKE_node.h" -#include "COM_LuminanceMatteOperation.h" #include "COM_ConvertOperation.h" +#include "COM_LuminanceMatteOperation.h" #include "COM_SetAlphaOperation.h" LuminanceMatteNode::LuminanceMatteNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_MapRangeNode.cpp b/source/blender/compositor/nodes/COM_MapRangeNode.cpp index 3b6d2fe0dcb..352bc0dd48d 100644 --- a/source/blender/compositor/nodes/COM_MapRangeNode.cpp +++ b/source/blender/compositor/nodes/COM_MapRangeNode.cpp @@ -18,8 +18,8 @@ #include "COM_MapRangeNode.h" -#include "COM_MapRangeOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_MapRangeOperation.h" MapRangeNode::MapRangeNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_MapUVNode.cpp b/source/blender/compositor/nodes/COM_MapUVNode.cpp index fe4895833cf..feb9c75ec56 100644 --- a/source/blender/compositor/nodes/COM_MapUVNode.cpp +++ b/source/blender/compositor/nodes/COM_MapUVNode.cpp @@ -17,8 +17,8 @@ */ #include "COM_MapUVNode.h" -#include "COM_MapUVOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_MapUVOperation.h" MapUVNode::MapUVNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_MapValueNode.cpp b/source/blender/compositor/nodes/COM_MapValueNode.cpp index 4ed971a2fcc..e07df8ad367 100644 --- a/source/blender/compositor/nodes/COM_MapValueNode.cpp +++ b/source/blender/compositor/nodes/COM_MapValueNode.cpp @@ -18,8 +18,8 @@ #include "COM_MapValueNode.h" -#include "COM_MapValueOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_MapValueOperation.h" MapValueNode::MapValueNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_MathNode.cpp b/source/blender/compositor/nodes/COM_MathNode.cpp index 5497d4a4755..227e26af2b2 100644 --- a/source/blender/compositor/nodes/COM_MathNode.cpp +++ b/source/blender/compositor/nodes/COM_MathNode.cpp @@ -17,8 +17,8 @@ */ #include "COM_MathNode.h" -#include "COM_MathBaseOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_MathBaseOperation.h" void MathNode::convertToOperations(NodeConverter &converter, const CompositorContext & /*context*/) const diff --git a/source/blender/compositor/nodes/COM_MovieClipNode.cpp b/source/blender/compositor/nodes/COM_MovieClipNode.cpp index f5ea6b2653a..29fd47f33b3 100644 --- a/source/blender/compositor/nodes/COM_MovieClipNode.cpp +++ b/source/blender/compositor/nodes/COM_MovieClipNode.cpp @@ -17,15 +17,15 @@ */ #include "COM_MovieClipNode.h" +#include "COM_ConvertColorProfileOperation.h" #include "COM_ExecutionSystem.h" #include "COM_MovieClipOperation.h" #include "COM_SetValueOperation.h" -#include "COM_ConvertColorProfileOperation.h" extern "C" { -#include "DNA_movieclip_types.h" #include "BKE_movieclip.h" #include "BKE_tracking.h" +#include "DNA_movieclip_types.h" #include "IMB_imbuf.h" } diff --git a/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp b/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp index d0ec152fca4..ebace6d5fff 100644 --- a/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp +++ b/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp @@ -18,8 +18,8 @@ #include "COM_MovieDistortionNode.h" -#include "COM_MovieDistortionOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_MovieDistortionOperation.h" #include "DNA_movieclip_types.h" MovieDistortionNode::MovieDistortionNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_NormalNode.cpp b/source/blender/compositor/nodes/COM_NormalNode.cpp index a6f39312601..1f48a26fd75 100644 --- a/source/blender/compositor/nodes/COM_NormalNode.cpp +++ b/source/blender/compositor/nodes/COM_NormalNode.cpp @@ -17,9 +17,9 @@ */ #include "COM_NormalNode.h" -#include "COM_ExecutionSystem.h" #include "BKE_node.h" #include "COM_DotproductOperation.h" +#include "COM_ExecutionSystem.h" #include "COM_SetVectorOperation.h" NormalNode::NormalNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_NormalizeNode.cpp b/source/blender/compositor/nodes/COM_NormalizeNode.cpp index dc061279664..72459fd477c 100644 --- a/source/blender/compositor/nodes/COM_NormalizeNode.cpp +++ b/source/blender/compositor/nodes/COM_NormalizeNode.cpp @@ -17,8 +17,8 @@ */ #include "COM_NormalizeNode.h" -#include "COM_NormalizeOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_NormalizeOperation.h" NormalizeNode::NormalizeNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_OutputFileNode.cpp b/source/blender/compositor/nodes/COM_OutputFileNode.cpp index d40f822eb55..1269e0b7f77 100644 --- a/source/blender/compositor/nodes/COM_OutputFileNode.cpp +++ b/source/blender/compositor/nodes/COM_OutputFileNode.cpp @@ -17,9 +17,9 @@ */ #include "COM_OutputFileNode.h" -#include "COM_OutputFileOperation.h" -#include "COM_OutputFileMultiViewOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_OutputFileMultiViewOperation.h" +#include "COM_OutputFileOperation.h" #include "BKE_scene.h" diff --git a/source/blender/compositor/nodes/COM_PixelateNode.cpp b/source/blender/compositor/nodes/COM_PixelateNode.cpp index be7747f3f14..f238f68727e 100644 --- a/source/blender/compositor/nodes/COM_PixelateNode.cpp +++ b/source/blender/compositor/nodes/COM_PixelateNode.cpp @@ -18,8 +18,8 @@ #include "COM_PixelateNode.h" -#include "COM_PixelateOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_PixelateOperation.h" PixelateNode::PixelateNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp b/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp index 2285af01154..39616bba4f9 100644 --- a/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp +++ b/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp @@ -22,8 +22,8 @@ #include "COM_PlaneTrackOperation.h" extern "C" { -#include "BKE_node.h" #include "BKE_movieclip.h" +#include "BKE_node.h" #include "BKE_tracking.h" } diff --git a/source/blender/compositor/nodes/COM_RenderLayersNode.cpp b/source/blender/compositor/nodes/COM_RenderLayersNode.cpp index a361c57a2c2..d66dd3fd434 100644 --- a/source/blender/compositor/nodes/COM_RenderLayersNode.cpp +++ b/source/blender/compositor/nodes/COM_RenderLayersNode.cpp @@ -18,12 +18,12 @@ #include "COM_RenderLayersNode.h" #include "COM_RenderLayersProg.h" -#include "COM_TranslateOperation.h" #include "COM_RotateOperation.h" #include "COM_ScaleOperation.h" #include "COM_SetColorOperation.h" #include "COM_SetValueOperation.h" #include "COM_SetVectorOperation.h" +#include "COM_TranslateOperation.h" RenderLayersNode::RenderLayersNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_RenderLayersNode.h b/source/blender/compositor/nodes/COM_RenderLayersNode.h index f6822f98fd9..c992f60581f 100644 --- a/source/blender/compositor/nodes/COM_RenderLayersNode.h +++ b/source/blender/compositor/nodes/COM_RenderLayersNode.h @@ -20,8 +20,8 @@ #define __COM_RENDERLAYERSNODE_H__ #include "COM_Node.h" -#include "DNA_node_types.h" #include "COM_RenderLayersProg.h" +#include "DNA_node_types.h" struct Render; diff --git a/source/blender/compositor/nodes/COM_RotateNode.cpp b/source/blender/compositor/nodes/COM_RotateNode.cpp index e1c84ce3584..cbade778bcb 100644 --- a/source/blender/compositor/nodes/COM_RotateNode.cpp +++ b/source/blender/compositor/nodes/COM_RotateNode.cpp @@ -18,8 +18,8 @@ #include "COM_RotateNode.h" -#include "COM_RotateOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_RotateOperation.h" #include "COM_SetSamplerOperation.h" RotateNode::RotateNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_ScaleNode.cpp b/source/blender/compositor/nodes/COM_ScaleNode.cpp index e47f673a8be..e57c30cff29 100644 --- a/source/blender/compositor/nodes/COM_ScaleNode.cpp +++ b/source/blender/compositor/nodes/COM_ScaleNode.cpp @@ -18,11 +18,11 @@ #include "COM_ScaleNode.h" -#include "COM_ScaleOperation.h" -#include "COM_ExecutionSystem.h" #include "BKE_node.h" -#include "COM_SetValueOperation.h" +#include "COM_ExecutionSystem.h" +#include "COM_ScaleOperation.h" #include "COM_SetSamplerOperation.h" +#include "COM_SetValueOperation.h" ScaleNode::ScaleNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_SetAlphaNode.cpp b/source/blender/compositor/nodes/COM_SetAlphaNode.cpp index 53454fedfe4..7b722fe4440 100644 --- a/source/blender/compositor/nodes/COM_SetAlphaNode.cpp +++ b/source/blender/compositor/nodes/COM_SetAlphaNode.cpp @@ -17,8 +17,8 @@ */ #include "COM_SetAlphaNode.h" -#include "COM_SetAlphaOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_SetAlphaOperation.h" void SetAlphaNode::convertToOperations(NodeConverter &converter, const CompositorContext & /*context*/) const diff --git a/source/blender/compositor/nodes/COM_SocketProxyNode.cpp b/source/blender/compositor/nodes/COM_SocketProxyNode.cpp index 5476a21d2a5..a84dbf680fe 100644 --- a/source/blender/compositor/nodes/COM_SocketProxyNode.cpp +++ b/source/blender/compositor/nodes/COM_SocketProxyNode.cpp @@ -17,13 +17,13 @@ */ #include "COM_SocketProxyNode.h" -#include "COM_SocketProxyOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_ReadBufferOperation.h" +#include "COM_SetColorOperation.h" #include "COM_SetValueOperation.h" #include "COM_SetVectorOperation.h" -#include "COM_SetColorOperation.h" +#include "COM_SocketProxyOperation.h" #include "COM_WriteBufferOperation.h" -#include "COM_ReadBufferOperation.h" SocketProxyNode::SocketProxyNode(bNode *editorNode, bNodeSocket *editorInput, diff --git a/source/blender/compositor/nodes/COM_SplitViewerNode.cpp b/source/blender/compositor/nodes/COM_SplitViewerNode.cpp index f73e3d08a74..75703876d9e 100644 --- a/source/blender/compositor/nodes/COM_SplitViewerNode.cpp +++ b/source/blender/compositor/nodes/COM_SplitViewerNode.cpp @@ -21,9 +21,9 @@ #include "BKE_image.h" #include "BKE_scene.h" +#include "COM_ExecutionSystem.h" #include "COM_SplitOperation.h" #include "COM_ViewerOperation.h" -#include "COM_ExecutionSystem.h" SplitViewerNode::SplitViewerNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp b/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp index cc14d8d952f..0b6cb97b049 100644 --- a/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp +++ b/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp @@ -18,15 +18,15 @@ #include "COM_Stabilize2dNode.h" #include "COM_ExecutionSystem.h" -#include "COM_TranslateOperation.h" +#include "COM_MovieClipAttributeOperation.h" #include "COM_RotateOperation.h" #include "COM_ScaleOperation.h" -#include "COM_MovieClipAttributeOperation.h" #include "COM_SetSamplerOperation.h" +#include "COM_TranslateOperation.h" extern "C" { -#include "DNA_movieclip_types.h" #include "BKE_tracking.h" +#include "DNA_movieclip_types.h" } Stabilize2dNode::Stabilize2dNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_TimeNode.cpp b/source/blender/compositor/nodes/COM_TimeNode.cpp index 2a30ee9c574..b6927fb8373 100644 --- a/source/blender/compositor/nodes/COM_TimeNode.cpp +++ b/source/blender/compositor/nodes/COM_TimeNode.cpp @@ -17,8 +17,8 @@ */ #include "COM_TimeNode.h" -#include "COM_SetValueOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_SetValueOperation.h" extern "C" { #include "BKE_colortools.h" } diff --git a/source/blender/compositor/nodes/COM_TonemapNode.cpp b/source/blender/compositor/nodes/COM_TonemapNode.cpp index 2b13a6519e3..db329e56f9b 100644 --- a/source/blender/compositor/nodes/COM_TonemapNode.cpp +++ b/source/blender/compositor/nodes/COM_TonemapNode.cpp @@ -17,8 +17,8 @@ */ #include "COM_TonemapNode.h" -#include "COM_TonemapOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_TonemapOperation.h" TonemapNode::TonemapNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_TransformNode.cpp b/source/blender/compositor/nodes/COM_TransformNode.cpp index 738039fc255..cd5ba8ba201 100644 --- a/source/blender/compositor/nodes/COM_TransformNode.cpp +++ b/source/blender/compositor/nodes/COM_TransformNode.cpp @@ -18,11 +18,11 @@ #include "COM_TransformNode.h" #include "COM_ExecutionSystem.h" -#include "COM_TranslateOperation.h" #include "COM_RotateOperation.h" #include "COM_ScaleOperation.h" -#include "COM_SetValueOperation.h" #include "COM_SetSamplerOperation.h" +#include "COM_SetValueOperation.h" +#include "COM_TranslateOperation.h" TransformNode::TransformNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_TranslateNode.cpp b/source/blender/compositor/nodes/COM_TranslateNode.cpp index 8fed5c9b003..33f48747853 100644 --- a/source/blender/compositor/nodes/COM_TranslateNode.cpp +++ b/source/blender/compositor/nodes/COM_TranslateNode.cpp @@ -18,10 +18,10 @@ #include "COM_TranslateNode.h" +#include "COM_ExecutionSystem.h" #include "COM_TranslateOperation.h" #include "COM_WrapOperation.h" #include "COM_WriteBufferOperation.h" -#include "COM_ExecutionSystem.h" TranslateNode::TranslateNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_ValueNode.cpp b/source/blender/compositor/nodes/COM_ValueNode.cpp index f9769c3709a..4227db0d10e 100644 --- a/source/blender/compositor/nodes/COM_ValueNode.cpp +++ b/source/blender/compositor/nodes/COM_ValueNode.cpp @@ -17,8 +17,8 @@ */ #include "COM_ValueNode.h" -#include "COM_SetValueOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_SetValueOperation.h" ValueNode::ValueNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_VectorBlurNode.cpp b/source/blender/compositor/nodes/COM_VectorBlurNode.cpp index 4ff2f3ddfb1..a92991c8b49 100644 --- a/source/blender/compositor/nodes/COM_VectorBlurNode.cpp +++ b/source/blender/compositor/nodes/COM_VectorBlurNode.cpp @@ -17,8 +17,8 @@ */ #include "COM_VectorBlurNode.h" -#include "DNA_node_types.h" #include "COM_VectorBlurOperation.h" +#include "DNA_node_types.h" VectorBlurNode::VectorBlurNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_VectorCurveNode.cpp b/source/blender/compositor/nodes/COM_VectorCurveNode.cpp index 4f8485a430b..1201a9f9613 100644 --- a/source/blender/compositor/nodes/COM_VectorCurveNode.cpp +++ b/source/blender/compositor/nodes/COM_VectorCurveNode.cpp @@ -17,8 +17,8 @@ */ #include "COM_VectorCurveNode.h" -#include "COM_VectorCurveOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_VectorCurveOperation.h" VectorCurveNode::VectorCurveNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp b/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp index b6c12365ce0..7b86fb1d64d 100644 --- a/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp +++ b/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp @@ -17,9 +17,9 @@ */ #include "COM_ViewLevelsNode.h" -#include "COM_ExecutionSystem.h" #include "COM_CalculateMeanOperation.h" #include "COM_CalculateStandardDeviationOperation.h" +#include "COM_ExecutionSystem.h" #include "COM_SetValueOperation.h" ViewLevelsNode::ViewLevelsNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_ViewerNode.cpp b/source/blender/compositor/nodes/COM_ViewerNode.cpp index 6170fafcb2c..fa6c1bc3c28 100644 --- a/source/blender/compositor/nodes/COM_ViewerNode.cpp +++ b/source/blender/compositor/nodes/COM_ViewerNode.cpp @@ -19,11 +19,11 @@ #include "COM_ViewerNode.h" #include "BKE_global.h" #include "BKE_image.h" -#include "BLI_listbase.h" #include "BKE_scene.h" +#include "BLI_listbase.h" -#include "COM_ViewerOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_ViewerOperation.h" ViewerNode::ViewerNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_ZCombineNode.cpp b/source/blender/compositor/nodes/COM_ZCombineNode.cpp index 4faf828d6df..b30a603bcee 100644 --- a/source/blender/compositor/nodes/COM_ZCombineNode.cpp +++ b/source/blender/compositor/nodes/COM_ZCombineNode.cpp @@ -20,11 +20,11 @@ #include "COM_ZCombineOperation.h" -#include "COM_ExecutionSystem.h" -#include "COM_SetValueOperation.h" -#include "COM_MathBaseOperation.h" #include "COM_AntiAliasOperation.h" +#include "COM_ExecutionSystem.h" +#include "COM_MathBaseOperation.h" #include "COM_MixOperation.h" +#include "COM_SetValueOperation.h" #include "DNA_material_types.h" // the ramp types diff --git a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h index 7fb9d839d2d..377276777f0 100644 --- a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h +++ b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h @@ -18,9 +18,9 @@ #ifndef __COM_CALCULATESTANDARDDEVIATIONOPERATION_H__ #define __COM_CALCULATESTANDARDDEVIATIONOPERATION_H__ +#include "COM_CalculateMeanOperation.h" #include "COM_NodeOperation.h" #include "DNA_node_types.h" -#include "COM_CalculateMeanOperation.h" /** * \brief base class of CalculateStandardDeviation, * implementing the simple CalculateStandardDeviation. diff --git a/source/blender/compositor/operations/COM_ColorCurveOperation.h b/source/blender/compositor/operations/COM_ColorCurveOperation.h index 1d6a9185732..7869d1c4a56 100644 --- a/source/blender/compositor/operations/COM_ColorCurveOperation.h +++ b/source/blender/compositor/operations/COM_ColorCurveOperation.h @@ -18,9 +18,9 @@ #ifndef __COM_COLORCURVEOPERATION_H__ #define __COM_COLORCURVEOPERATION_H__ +#include "COM_CurveBaseOperation.h" #include "COM_NodeOperation.h" #include "DNA_color_types.h" -#include "COM_CurveBaseOperation.h" class ColorCurveOperation : public CurveBaseOperation { private: diff --git a/source/blender/compositor/operations/COM_CompositorOperation.cpp b/source/blender/compositor/operations/COM_CompositorOperation.cpp index 20ea7009105..cb41071e6f0 100644 --- a/source/blender/compositor/operations/COM_CompositorOperation.cpp +++ b/source/blender/compositor/operations/COM_CompositorOperation.cpp @@ -17,16 +17,16 @@ */ #include "COM_CompositorOperation.h" -#include "MEM_guardedalloc.h" -#include "BLI_listbase.h" #include "BKE_global.h" #include "BKE_image.h" +#include "BLI_listbase.h" +#include "MEM_guardedalloc.h" extern "C" { #include "BLI_threads.h" #include "RE_pipeline.h" -#include "RE_shader_ext.h" #include "RE_render_ext.h" +#include "RE_shader_ext.h" #include "render_types.h" } #include "PIL_time.h" diff --git a/source/blender/compositor/operations/COM_CompositorOperation.h b/source/blender/compositor/operations/COM_CompositorOperation.h index d24fc49059c..8db8fe00d3c 100644 --- a/source/blender/compositor/operations/COM_CompositorOperation.h +++ b/source/blender/compositor/operations/COM_CompositorOperation.h @@ -18,9 +18,9 @@ #ifndef __COM_COMPOSITOROPERATION_H__ #define __COM_COMPOSITOROPERATION_H__ -#include "COM_NodeOperation.h" #include "BLI_rect.h" #include "BLI_string.h" +#include "COM_NodeOperation.h" struct Scene; diff --git a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp index 704f7cfad39..66043abd951 100644 --- a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp +++ b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp @@ -17,8 +17,8 @@ */ #include "COM_ConvertDepthToRadiusOperation.h" -#include "BLI_math.h" #include "BKE_camera.h" +#include "BLI_math.h" #include "DNA_camera_types.h" ConvertDepthToRadiusOperation::ConvertDepthToRadiusOperation() : NodeOperation() diff --git a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h index f375d6efb8f..7c3e0ed9738 100644 --- a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h +++ b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h @@ -18,9 +18,9 @@ #ifndef __COM_CONVERTDEPTHTORADIUSOPERATION_H__ #define __COM_CONVERTDEPTHTORADIUSOPERATION_H__ +#include "COM_FastGaussianBlurOperation.h" #include "COM_NodeOperation.h" #include "DNA_object_types.h" -#include "COM_FastGaussianBlurOperation.h" /** * this program converts an input color to an output value. * it assumes we are in sRGB color space. diff --git a/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h b/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h index 48880fb2b59..1cb477bc05d 100644 --- a/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h +++ b/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h @@ -18,8 +18,8 @@ #ifndef __COM_DISTANCEYCCMATTEOPERATION_H__ #define __COM_DISTANCEYCCMATTEOPERATION_H__ -#include "COM_MixOperation.h" #include "COM_DistanceRGBMatteOperation.h" +#include "COM_MixOperation.h" /** * this program converts an input color to an output value. diff --git a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp index f872388e3c7..22949a8e6f1 100644 --- a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp +++ b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp @@ -18,8 +18,8 @@ #include -#include "COM_DoubleEdgeMaskOperation.h" #include "BLI_math.h" +#include "COM_DoubleEdgeMaskOperation.h" #include "DNA_node_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp index 3058a5990c6..7a6b69d12fa 100644 --- a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp @@ -18,9 +18,9 @@ #include +#include "BLI_utildefines.h" #include "COM_FastGaussianBlurOperation.h" #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" FastGaussianBlurOperation::FastGaussianBlurOperation() : BlurBaseOperation(COM_DT_COLOR) { diff --git a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h index 4d249778f53..9de75ff53a7 100644 --- a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h +++ b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h @@ -18,8 +18,8 @@ #ifndef __COM_GAUSSIANALPHAXBLUROPERATION_H__ #define __COM_GAUSSIANALPHAXBLUROPERATION_H__ -#include "COM_NodeOperation.h" #include "COM_BlurBaseOperation.h" +#include "COM_NodeOperation.h" class GaussianAlphaXBlurOperation : public BlurBaseOperation { private: diff --git a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h index d31534455bc..44689922bfc 100644 --- a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h +++ b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h @@ -18,8 +18,8 @@ #ifndef __COM_GAUSSIANALPHAYBLUROPERATION_H__ #define __COM_GAUSSIANALPHAYBLUROPERATION_H__ -#include "COM_NodeOperation.h" #include "COM_BlurBaseOperation.h" +#include "COM_NodeOperation.h" class GaussianAlphaYBlurOperation : public BlurBaseOperation { private: diff --git a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h index 99e22cf91c3..3aa380853bd 100644 --- a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h +++ b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h @@ -18,8 +18,8 @@ #ifndef __COM_GAUSSIANBOKEHBLUROPERATION_H__ #define __COM_GAUSSIANBOKEHBLUROPERATION_H__ -#include "COM_NodeOperation.h" #include "COM_BlurBaseOperation.h" +#include "COM_NodeOperation.h" #include "COM_QualityStepHelper.h" class GaussianBokehBlurOperation : public BlurBaseOperation { diff --git a/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp index 29a50f5350a..68cde0d365f 100644 --- a/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp @@ -17,8 +17,8 @@ */ #include "COM_GaussianXBlurOperation.h" -#include "COM_OpenCLDevice.h" #include "BLI_math.h" +#include "COM_OpenCLDevice.h" #include "MEM_guardedalloc.h" extern "C" { diff --git a/source/blender/compositor/operations/COM_GaussianXBlurOperation.h b/source/blender/compositor/operations/COM_GaussianXBlurOperation.h index 3ebe52cfcce..c5c08df8ce7 100644 --- a/source/blender/compositor/operations/COM_GaussianXBlurOperation.h +++ b/source/blender/compositor/operations/COM_GaussianXBlurOperation.h @@ -18,8 +18,8 @@ #ifndef __COM_GAUSSIANXBLUROPERATION_H__ #define __COM_GAUSSIANXBLUROPERATION_H__ -#include "COM_NodeOperation.h" #include "COM_BlurBaseOperation.h" +#include "COM_NodeOperation.h" class GaussianXBlurOperation : public BlurBaseOperation { private: diff --git a/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp index 500e0fbedc3..eeddd98d4a4 100644 --- a/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp @@ -17,8 +17,8 @@ */ #include "COM_GaussianYBlurOperation.h" -#include "COM_OpenCLDevice.h" #include "BLI_math.h" +#include "COM_OpenCLDevice.h" #include "MEM_guardedalloc.h" extern "C" { diff --git a/source/blender/compositor/operations/COM_GaussianYBlurOperation.h b/source/blender/compositor/operations/COM_GaussianYBlurOperation.h index ce8e0a7b781..92154aa7518 100644 --- a/source/blender/compositor/operations/COM_GaussianYBlurOperation.h +++ b/source/blender/compositor/operations/COM_GaussianYBlurOperation.h @@ -18,8 +18,8 @@ #ifndef __COM_GAUSSIANYBLUROPERATION_H__ #define __COM_GAUSSIANYBLUROPERATION_H__ -#include "COM_NodeOperation.h" #include "COM_BlurBaseOperation.h" +#include "COM_NodeOperation.h" class GaussianYBlurOperation : public BlurBaseOperation { private: diff --git a/source/blender/compositor/operations/COM_GlareFogGlowOperation.h b/source/blender/compositor/operations/COM_GlareFogGlowOperation.h index 45067457778..dae0b714e56 100644 --- a/source/blender/compositor/operations/COM_GlareFogGlowOperation.h +++ b/source/blender/compositor/operations/COM_GlareFogGlowOperation.h @@ -18,9 +18,9 @@ #ifndef __COM_GLAREFOGGLOWOPERATION_H__ #define __COM_GLAREFOGGLOWOPERATION_H__ +#include "COM_GlareBaseOperation.h" #include "COM_NodeOperation.h" #include "DNA_node_types.h" -#include "COM_GlareBaseOperation.h" class GlareFogGlowOperation : public GlareBaseOperation { public: diff --git a/source/blender/compositor/operations/COM_GlareGhostOperation.h b/source/blender/compositor/operations/COM_GlareGhostOperation.h index c89c239e4d1..c0b41762c8a 100644 --- a/source/blender/compositor/operations/COM_GlareGhostOperation.h +++ b/source/blender/compositor/operations/COM_GlareGhostOperation.h @@ -18,9 +18,9 @@ #ifndef __COM_GLAREGHOSTOPERATION_H__ #define __COM_GLAREGHOSTOPERATION_H__ +#include "COM_GlareBaseOperation.h" #include "COM_NodeOperation.h" #include "DNA_node_types.h" -#include "COM_GlareBaseOperation.h" class GlareGhostOperation : public GlareBaseOperation { public: diff --git a/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h b/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h index a40dfac86ff..b6e2e499f64 100644 --- a/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h +++ b/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h @@ -18,9 +18,9 @@ #ifndef __COM_GLARESIMPLESTAROPERATION_H__ #define __COM_GLARESIMPLESTAROPERATION_H__ +#include "COM_GlareBaseOperation.h" #include "COM_NodeOperation.h" #include "DNA_node_types.h" -#include "COM_GlareBaseOperation.h" class GlareSimpleStarOperation : public GlareBaseOperation { public: diff --git a/source/blender/compositor/operations/COM_GlareStreaksOperation.h b/source/blender/compositor/operations/COM_GlareStreaksOperation.h index 9150b5e4641..9f137f90b71 100644 --- a/source/blender/compositor/operations/COM_GlareStreaksOperation.h +++ b/source/blender/compositor/operations/COM_GlareStreaksOperation.h @@ -18,9 +18,9 @@ #ifndef __COM_GLARESTREAKSOPERATION_H__ #define __COM_GLARESTREAKSOPERATION_H__ +#include "COM_GlareBaseOperation.h" #include "COM_NodeOperation.h" #include "DNA_node_types.h" -#include "COM_GlareBaseOperation.h" class GlareStreaksOperation : public GlareBaseOperation { public: diff --git a/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h b/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h index 3e212b96521..0624a5c022f 100644 --- a/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h +++ b/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h @@ -18,8 +18,8 @@ #ifndef __COM_HUESATURATIONVALUECORRECTOPERATION_H__ #define __COM_HUESATURATIONVALUECORRECTOPERATION_H__ -#include "COM_NodeOperation.h" #include "COM_CurveBaseOperation.h" +#include "COM_NodeOperation.h" class HueSaturationValueCorrectOperation : public CurveBaseOperation { private: diff --git a/source/blender/compositor/operations/COM_ImageOperation.cpp b/source/blender/compositor/operations/COM_ImageOperation.cpp index 3a60b1c84a3..d70cab4ad2a 100644 --- a/source/blender/compositor/operations/COM_ImageOperation.cpp +++ b/source/blender/compositor/operations/COM_ImageOperation.cpp @@ -18,19 +18,19 @@ #include "COM_ImageOperation.h" -#include "BLI_listbase.h" -#include "DNA_image_types.h" #include "BKE_image.h" #include "BKE_scene.h" +#include "BLI_listbase.h" #include "BLI_math.h" +#include "DNA_image_types.h" extern "C" { -#include "RE_pipeline.h" -#include "RE_shader_ext.h" -#include "RE_render_ext.h" +#include "IMB_colormanagement.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "IMB_colormanagement.h" +#include "RE_pipeline.h" +#include "RE_render_ext.h" +#include "RE_shader_ext.h" } BaseImageOperation::BaseImageOperation() : NodeOperation() diff --git a/source/blender/compositor/operations/COM_ImageOperation.h b/source/blender/compositor/operations/COM_ImageOperation.h index 7eb2471ba67..57656d03092 100644 --- a/source/blender/compositor/operations/COM_ImageOperation.h +++ b/source/blender/compositor/operations/COM_ImageOperation.h @@ -19,15 +19,15 @@ #ifndef __COM_IMAGEOPERATION_H__ #define __COM_IMAGEOPERATION_H__ -#include "COM_NodeOperation.h" -#include "MEM_guardedalloc.h" +#include "BKE_image.h" #include "BLI_listbase.h" #include "BLI_utildefines.h" -#include "BKE_image.h" +#include "COM_NodeOperation.h" +#include "MEM_guardedalloc.h" extern "C" { #include "RE_pipeline.h" -#include "RE_shader_ext.h" #include "RE_render_ext.h" +#include "RE_shader_ext.h" } /** diff --git a/source/blender/compositor/operations/COM_MaskOperation.h b/source/blender/compositor/operations/COM_MaskOperation.h index 531d6ef1b08..45363ea5220 100644 --- a/source/blender/compositor/operations/COM_MaskOperation.h +++ b/source/blender/compositor/operations/COM_MaskOperation.h @@ -19,9 +19,9 @@ #ifndef __COM_MASKOPERATION_H__ #define __COM_MASKOPERATION_H__ +#include "BLI_listbase.h" #include "COM_NodeOperation.h" #include "DNA_mask_types.h" -#include "BLI_listbase.h" #include "IMB_imbuf_types.h" /** diff --git a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp index 967fa7ad653..4f5d7f6f00b 100644 --- a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp +++ b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp @@ -18,8 +18,8 @@ #include "COM_MovieClipAttributeOperation.h" extern "C" { -#include "BKE_tracking.h" #include "BKE_movieclip.h" +#include "BKE_tracking.h" } MovieClipAttributeOperation::MovieClipAttributeOperation() : NodeOperation() { diff --git a/source/blender/compositor/operations/COM_MovieClipOperation.h b/source/blender/compositor/operations/COM_MovieClipOperation.h index 8d2dd99afc0..7ae85eac25e 100644 --- a/source/blender/compositor/operations/COM_MovieClipOperation.h +++ b/source/blender/compositor/operations/COM_MovieClipOperation.h @@ -19,9 +19,9 @@ #ifndef __COM_MOVIECLIPOPERATION_H__ #define __COM_MOVIECLIPOPERATION_H__ +#include "BLI_listbase.h" #include "COM_NodeOperation.h" #include "DNA_movieclip_types.h" -#include "BLI_listbase.h" #include "IMB_imbuf_types.h" /** diff --git a/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp b/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp index be354ba5a12..ec858ee2c19 100644 --- a/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp +++ b/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp @@ -19,8 +19,8 @@ #include "COM_MovieDistortionOperation.h" extern "C" { -#include "BKE_tracking.h" #include "BKE_movieclip.h" +#include "BKE_tracking.h" #include "BLI_linklist.h" } diff --git a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp index 444af5c4cf7..65f4eeeb8bb 100644 --- a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp +++ b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp @@ -16,8 +16,8 @@ * Copyright 2015, Blender Foundation. */ -#include "COM_OutputFileOperation.h" #include "COM_OutputFileMultiViewOperation.h" +#include "COM_OutputFileOperation.h" #include @@ -34,8 +34,8 @@ #include "MEM_guardedalloc.h" extern "C" { -#include "IMB_imbuf.h" #include "IMB_colormanagement.h" +#include "IMB_imbuf.h" #include "IMB_imbuf_types.h" } diff --git a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h index 42457475848..609448c0bcb 100644 --- a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h +++ b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h @@ -21,8 +21,8 @@ #include "COM_NodeOperation.h" #include "COM_OutputFileOperation.h" -#include "BLI_rect.h" #include "BLI_path_util.h" +#include "BLI_rect.h" #include "DNA_color_types.h" diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.cpp b/source/blender/compositor/operations/COM_OutputFileOperation.cpp index 334eab6ef95..efe01d0b5cc 100644 --- a/source/blender/compositor/operations/COM_OutputFileOperation.cpp +++ b/source/blender/compositor/operations/COM_OutputFileOperation.cpp @@ -33,8 +33,8 @@ #include "MEM_guardedalloc.h" extern "C" { -#include "IMB_imbuf.h" #include "IMB_colormanagement.h" +#include "IMB_imbuf.h" #include "IMB_imbuf_types.h" } diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.h b/source/blender/compositor/operations/COM_OutputFileOperation.h index 3ffba6b374e..d00d1d0dc0d 100644 --- a/source/blender/compositor/operations/COM_OutputFileOperation.h +++ b/source/blender/compositor/operations/COM_OutputFileOperation.h @@ -20,8 +20,8 @@ #define __COM_OUTPUTFILEOPERATION_H__ #include "COM_NodeOperation.h" -#include "BLI_rect.h" #include "BLI_path_util.h" +#include "BLI_rect.h" #include "DNA_color_types.h" diff --git a/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cpp b/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cpp index 78a83391ed1..07053d01d43 100644 --- a/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cpp +++ b/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cpp @@ -21,10 +21,10 @@ #include "MEM_guardedalloc.h" extern "C" { +#include "BLI_jitter_2d.h" #include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_math_color.h" -#include "BLI_jitter_2d.h" #include "BKE_movieclip.h" #include "BKE_node.h" diff --git a/source/blender/compositor/operations/COM_PreviewOperation.cpp b/source/blender/compositor/operations/COM_PreviewOperation.cpp index b91c3324f87..e9e1b4a8cd9 100644 --- a/source/blender/compositor/operations/COM_PreviewOperation.cpp +++ b/source/blender/compositor/operations/COM_PreviewOperation.cpp @@ -17,21 +17,21 @@ */ #include "COM_PreviewOperation.h" -#include "BLI_listbase.h" #include "BKE_image.h" +#include "BLI_listbase.h" +#include "BLI_math.h" +#include "BLI_math_color.h" +#include "BLI_utildefines.h" +#include "COM_defines.h" +#include "MEM_guardedalloc.h" +#include "PIL_time.h" #include "WM_api.h" #include "WM_types.h" -#include "PIL_time.h" -#include "BLI_utildefines.h" -#include "BLI_math_color.h" -#include "COM_defines.h" -#include "BLI_math.h" -#include "MEM_guardedalloc.h" extern "C" { +#include "BKE_node.h" +#include "IMB_colormanagement.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "IMB_colormanagement.h" -#include "BKE_node.h" } PreviewOperation::PreviewOperation(const ColorManagedViewSettings *viewSettings, diff --git a/source/blender/compositor/operations/COM_PreviewOperation.h b/source/blender/compositor/operations/COM_PreviewOperation.h index 6560db727a8..f31bd533971 100644 --- a/source/blender/compositor/operations/COM_PreviewOperation.h +++ b/source/blender/compositor/operations/COM_PreviewOperation.h @@ -18,11 +18,11 @@ #ifndef __COM_PREVIEWOPERATION_H__ #define __COM_PREVIEWOPERATION_H__ -#include "COM_NodeOperation.h" -#include "DNA_image_types.h" -#include "DNA_color_types.h" -#include "BLI_rect.h" #include "BKE_global.h" +#include "BLI_rect.h" +#include "COM_NodeOperation.h" +#include "DNA_color_types.h" +#include "DNA_image_types.h" class PreviewOperation : public NodeOperation { protected: diff --git a/source/blender/compositor/operations/COM_ReadBufferOperation.h b/source/blender/compositor/operations/COM_ReadBufferOperation.h index fee6555c3a9..60d064a5582 100644 --- a/source/blender/compositor/operations/COM_ReadBufferOperation.h +++ b/source/blender/compositor/operations/COM_ReadBufferOperation.h @@ -19,9 +19,9 @@ #ifndef __COM_READBUFFEROPERATION_H__ #define __COM_READBUFFEROPERATION_H__ -#include "COM_NodeOperation.h" -#include "COM_MemoryProxy.h" #include "COM_MemoryBuffer.h" +#include "COM_MemoryProxy.h" +#include "COM_NodeOperation.h" class ReadBufferOperation : public NodeOperation { private: diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.cpp b/source/blender/compositor/operations/COM_RenderLayersProg.cpp index 3c0b01874aa..722aab329d7 100644 --- a/source/blender/compositor/operations/COM_RenderLayersProg.cpp +++ b/source/blender/compositor/operations/COM_RenderLayersProg.cpp @@ -18,14 +18,14 @@ #include "COM_RenderLayersProg.h" -#include "BLI_listbase.h" #include "BKE_scene.h" +#include "BLI_listbase.h" #include "DNA_scene_types.h" extern "C" { #include "RE_pipeline.h" -#include "RE_shader_ext.h" #include "RE_render_ext.h" +#include "RE_shader_ext.h" } /* ******** Render Layers Base Prog ******** */ diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.h b/source/blender/compositor/operations/COM_RenderLayersProg.h index c0b759e68ba..cb47725b749 100644 --- a/source/blender/compositor/operations/COM_RenderLayersProg.h +++ b/source/blender/compositor/operations/COM_RenderLayersProg.h @@ -19,11 +19,11 @@ #ifndef __COM_RENDERLAYERSPROG_H__ #define __COM_RENDERLAYERSPROG_H__ -#include "COM_NodeOperation.h" -#include "MEM_guardedalloc.h" -#include "DNA_scene_types.h" #include "BLI_listbase.h" #include "BLI_utildefines.h" +#include "COM_NodeOperation.h" +#include "DNA_scene_types.h" +#include "MEM_guardedalloc.h" extern "C" { #include "RE_pipeline.h" } diff --git a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp index 94224ac77a6..1afc6d9477f 100644 --- a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp +++ b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp @@ -20,8 +20,8 @@ extern "C" { #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_rand.h" +#include "BLI_utildefines.h" #include "PIL_time.h" } diff --git a/source/blender/compositor/operations/COM_SplitOperation.cpp b/source/blender/compositor/operations/COM_SplitOperation.cpp index 437b20d14d4..1862fde2d40 100644 --- a/source/blender/compositor/operations/COM_SplitOperation.cpp +++ b/source/blender/compositor/operations/COM_SplitOperation.cpp @@ -17,11 +17,11 @@ */ #include "COM_SplitOperation.h" -#include "BLI_listbase.h" #include "BKE_image.h" -#include "BLI_utildefines.h" +#include "BLI_listbase.h" #include "BLI_math_color.h" #include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "MEM_guardedalloc.h" extern "C" { diff --git a/source/blender/compositor/operations/COM_TextureOperation.cpp b/source/blender/compositor/operations/COM_TextureOperation.cpp index e09ccbb016a..0a27a6916b7 100644 --- a/source/blender/compositor/operations/COM_TextureOperation.cpp +++ b/source/blender/compositor/operations/COM_TextureOperation.cpp @@ -19,9 +19,9 @@ #include "COM_TextureOperation.h" #include "COM_WorkScheduler.h" +#include "BKE_image.h" #include "BLI_listbase.h" #include "BLI_threads.h" -#include "BKE_image.h" extern "C" { #include "BKE_node.h" diff --git a/source/blender/compositor/operations/COM_TextureOperation.h b/source/blender/compositor/operations/COM_TextureOperation.h index 6b44c11f423..0d06ac0bc27 100644 --- a/source/blender/compositor/operations/COM_TextureOperation.h +++ b/source/blender/compositor/operations/COM_TextureOperation.h @@ -19,14 +19,14 @@ #ifndef __COM_TEXTUREOPERATION_H__ #define __COM_TEXTUREOPERATION_H__ +#include "BLI_listbase.h" #include "COM_NodeOperation.h" #include "DNA_texture_types.h" -#include "BLI_listbase.h" #include "MEM_guardedalloc.h" extern "C" { #include "RE_pipeline.h" -#include "RE_shader_ext.h" #include "RE_render_ext.h" +#include "RE_shader_ext.h" } /** diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.cpp b/source/blender/compositor/operations/COM_VectorBlurOperation.cpp index 80df13966b1..83ae1a0526d 100644 --- a/source/blender/compositor/operations/COM_VectorBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_VectorBlurOperation.cpp @@ -16,9 +16,9 @@ * Copyright 2011, Blender Foundation. */ -#include -#include "MEM_guardedalloc.h" #include "BLI_math.h" +#include "MEM_guardedalloc.h" +#include extern "C" { #include "BLI_jitter_2d.h" } diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.h b/source/blender/compositor/operations/COM_VectorBlurOperation.h index aedc0d85a50..3caf5c5c8e4 100644 --- a/source/blender/compositor/operations/COM_VectorBlurOperation.h +++ b/source/blender/compositor/operations/COM_VectorBlurOperation.h @@ -19,8 +19,8 @@ #ifndef __COM_VECTORBLUROPERATION_H__ #define __COM_VECTORBLUROPERATION_H__ #include "COM_NodeOperation.h" -#include "DNA_node_types.h" #include "COM_QualityStepHelper.h" +#include "DNA_node_types.h" class VectorBlurOperation : public NodeOperation, public QualityStepHelper { private: diff --git a/source/blender/compositor/operations/COM_VectorCurveOperation.h b/source/blender/compositor/operations/COM_VectorCurveOperation.h index c8575de6aa8..65441dbdfb7 100644 --- a/source/blender/compositor/operations/COM_VectorCurveOperation.h +++ b/source/blender/compositor/operations/COM_VectorCurveOperation.h @@ -18,8 +18,8 @@ #ifndef __COM_VECTORCURVEOPERATION_H__ #define __COM_VECTORCURVEOPERATION_H__ -#include "COM_NodeOperation.h" #include "COM_CurveBaseOperation.h" +#include "COM_NodeOperation.h" class VectorCurveOperation : public CurveBaseOperation { private: diff --git a/source/blender/compositor/operations/COM_ViewerOperation.cpp b/source/blender/compositor/operations/COM_ViewerOperation.cpp index 96c6320ff01..5c32b9962f4 100644 --- a/source/blender/compositor/operations/COM_ViewerOperation.cpp +++ b/source/blender/compositor/operations/COM_ViewerOperation.cpp @@ -17,21 +17,21 @@ */ #include "COM_ViewerOperation.h" -#include "BLI_listbase.h" #include "BKE_image.h" #include "BKE_scene.h" -#include "WM_api.h" -#include "WM_types.h" -#include "PIL_time.h" -#include "BLI_utildefines.h" +#include "BLI_listbase.h" #include "BLI_math_color.h" #include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "MEM_guardedalloc.h" +#include "PIL_time.h" +#include "WM_api.h" +#include "WM_types.h" extern "C" { +#include "IMB_colormanagement.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "IMB_colormanagement.h" } ViewerOperation::ViewerOperation() : NodeOperation() diff --git a/source/blender/compositor/operations/COM_ViewerOperation.h b/source/blender/compositor/operations/COM_ViewerOperation.h index 9a6239ca32e..aae2e912804 100644 --- a/source/blender/compositor/operations/COM_ViewerOperation.h +++ b/source/blender/compositor/operations/COM_ViewerOperation.h @@ -18,10 +18,10 @@ #ifndef __COM_VIEWEROPERATION_H__ #define __COM_VIEWEROPERATION_H__ +#include "BKE_global.h" +#include "BLI_rect.h" #include "COM_NodeOperation.h" #include "DNA_image_types.h" -#include "BLI_rect.h" -#include "BKE_global.h" class ViewerOperation : public NodeOperation { private: diff --git a/source/blender/compositor/operations/COM_WriteBufferOperation.cpp b/source/blender/compositor/operations/COM_WriteBufferOperation.cpp index 6c5e45472a8..8cc53f8c6a9 100644 --- a/source/blender/compositor/operations/COM_WriteBufferOperation.cpp +++ b/source/blender/compositor/operations/COM_WriteBufferOperation.cpp @@ -17,9 +17,9 @@ */ #include "COM_WriteBufferOperation.h" +#include "COM_OpenCLDevice.h" #include "COM_defines.h" #include -#include "COM_OpenCLDevice.h" WriteBufferOperation::WriteBufferOperation(DataType datatype) : NodeOperation() { diff --git a/source/blender/compositor/operations/COM_WriteBufferOperation.h b/source/blender/compositor/operations/COM_WriteBufferOperation.h index 83f7ed1ae56..be525db4420 100644 --- a/source/blender/compositor/operations/COM_WriteBufferOperation.h +++ b/source/blender/compositor/operations/COM_WriteBufferOperation.h @@ -19,8 +19,8 @@ #ifndef __COM_WRITEBUFFEROPERATION_H__ #define __COM_WRITEBUFFEROPERATION_H__ -#include "COM_NodeOperation.h" #include "COM_MemoryProxy.h" +#include "COM_NodeOperation.h" #include "COM_SocketReader.h" /** * \brief NodeOperation to write to a tile diff --git a/source/blender/datatoc/datatoc.c b/source/blender/datatoc/datatoc.c index cf8d17e5e7e..f68d2f8ce13 100644 --- a/source/blender/datatoc/datatoc.c +++ b/source/blender/datatoc/datatoc.c @@ -22,8 +22,8 @@ */ #include -#include #include +#include /* #define VERBOSE */ diff --git a/source/blender/datatoc/datatoc_icon.c b/source/blender/datatoc/datatoc_icon.c index 82c5470943f..80a335e22b7 100644 --- a/source/blender/datatoc/datatoc_icon.c +++ b/source/blender/datatoc/datatoc_icon.c @@ -18,11 +18,11 @@ * \ingroup datatoc */ -#include -#include -#include #include #include +#include +#include +#include /* for bool */ #include "../blenlib/BLI_sys_types.h" diff --git a/source/blender/depsgraph/intern/builder/deg_builder.cc b/source/blender/depsgraph/intern/builder/deg_builder.cc index 765a6e1006a..18ab9bf7e43 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder.cc @@ -25,15 +25,15 @@ #include +#include "DNA_ID.h" #include "DNA_anim_types.h" #include "DNA_armature_types.h" #include "DNA_layer_types.h" -#include "DNA_ID.h" #include "DNA_object_types.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_stack.h" +#include "BLI_utildefines.h" #include "BKE_action.h" @@ -41,16 +41,16 @@ extern "C" { #include "BKE_animsys.h" } +#include "intern/builder/deg_builder_cache.h" +#include "intern/builder/deg_builder_remove_noop.h" #include "intern/depsgraph.h" #include "intern/depsgraph_relation.h" #include "intern/depsgraph_tag.h" #include "intern/depsgraph_type.h" -#include "intern/builder/deg_builder_cache.h" -#include "intern/builder/deg_builder_remove_noop.h" #include "intern/eval/deg_eval_copy_on_write.h" #include "intern/node/deg_node.h" -#include "intern/node/deg_node_id.h" #include "intern/node/deg_node_component.h" +#include "intern/node/deg_node_id.h" #include "intern/node/deg_node_operation.h" #include "DEG_depsgraph.h" diff --git a/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc b/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc index e0d162a49c5..6deecfde9e1 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc @@ -27,8 +27,8 @@ #include #include -#include "BLI_utildefines.h" #include "BLI_stack.h" +#include "BLI_utildefines.h" #include "intern/node/deg_node.h" #include "intern/node/deg_node_component.h" diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index ea49882fd77..672cf29ac0e 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -47,16 +47,16 @@ extern "C" { #include "DNA_gpencil_types.h" #include "DNA_key_types.h" #include "DNA_light_types.h" +#include "DNA_lightprobe_types.h" #include "DNA_linestyle_types.h" -#include "DNA_material_types.h" #include "DNA_mask_types.h" +#include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" #include "DNA_movieclip_types.h" #include "DNA_node_types.h" -#include "DNA_particle_types.h" #include "DNA_object_types.h" -#include "DNA_lightprobe_types.h" +#include "DNA_particle_types.h" #include "DNA_rigidbody_types.h" #include "DNA_scene_types.h" #include "DNA_sequence_types.h" @@ -66,8 +66,8 @@ extern "C" { #include "DNA_world_types.h" #include "BKE_action.h" -#include "BKE_armature.h" #include "BKE_animsys.h" +#include "BKE_armature.h" #include "BKE_cachefile.h" #include "BKE_collection.h" #include "BKE_constraint.h" @@ -83,8 +83,8 @@ extern "C" { #include "BKE_layer.h" #include "BKE_mask.h" #include "BKE_material.h" -#include "BKE_mesh.h" #include "BKE_mball.h" +#include "BKE_mesh.h" #include "BKE_modifier.h" #include "BKE_movieclip.h" #include "BKE_node.h" @@ -109,12 +109,12 @@ extern "C" { #include "intern/builder/deg_builder.h" #include "intern/depsgraph.h" +#include "intern/depsgraph_type.h" #include "intern/eval/deg_eval_copy_on_write.h" #include "intern/node/deg_node.h" #include "intern/node/deg_node_component.h" #include "intern/node/deg_node_id.h" #include "intern/node/deg_node_operation.h" -#include "intern/depsgraph_type.h" namespace DEG { diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc index 07010a5cbef..5383e26bbd4 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc @@ -30,9 +30,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_blenlib.h" #include "BLI_string.h" +#include "BLI_utildefines.h" extern "C" { #include "DNA_anim_types.h" @@ -50,11 +50,11 @@ extern "C" { #include "DEG_depsgraph_build.h" #include "intern/builder/deg_builder.h" +#include "intern/depsgraph_type.h" #include "intern/eval/deg_eval_copy_on_write.h" #include "intern/node/deg_node.h" #include "intern/node/deg_node_component.h" #include "intern/node/deg_node_operation.h" -#include "intern/depsgraph_type.h" namespace DEG { diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc index d5e9c024812..1aa3c5bf613 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc @@ -30,9 +30,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_blenlib.h" #include "BLI_string.h" +#include "BLI_utildefines.h" extern "C" { #include "DNA_freestyle_types.h" @@ -52,10 +52,10 @@ extern "C" { #include "intern/builder/deg_builder.h" #include "intern/depsgraph.h" +#include "intern/depsgraph_type.h" #include "intern/node/deg_node.h" #include "intern/node/deg_node_component.h" #include "intern/node/deg_node_operation.h" -#include "intern/depsgraph_type.h" namespace DEG { diff --git a/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc index 5483ff9c030..ecacfcf7ee9 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc @@ -26,8 +26,8 @@ #include #include -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" namespace DEG { diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index 4647486bafd..5c45d3e126e 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -25,22 +25,22 @@ #include "intern/builder/deg_builder_relations.h" +#include /* required for STREQ later on. */ #include #include -#include /* required for STREQ later on. */ #include #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_blenlib.h" +#include "BLI_utildefines.h" extern "C" { #include "DNA_action_types.h" #include "DNA_anim_types.h" #include "DNA_armature_types.h" -#include "DNA_camera_types.h" #include "DNA_cachefile_types.h" +#include "DNA_camera_types.h" #include "DNA_collection_types.h" #include "DNA_constraint_types.h" #include "DNA_curve_types.h" @@ -48,16 +48,17 @@ extern "C" { #include "DNA_gpencil_types.h" #include "DNA_key_types.h" #include "DNA_light_types.h" +#include "DNA_lightprobe_types.h" #include "DNA_linestyle_types.h" -#include "DNA_material_types.h" #include "DNA_mask_types.h" +#include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" #include "DNA_movieclip_types.h" #include "DNA_node_types.h" -#include "DNA_particle_types.h" -#include "DNA_lightprobe_types.h" +#include "DNA_object_force_types.h" #include "DNA_object_types.h" +#include "DNA_particle_types.h" #include "DNA_rigidbody_types.h" #include "DNA_scene_types.h" #include "DNA_sequence_types.h" @@ -66,24 +67,23 @@ extern "C" { #include "DNA_texture_types.h" #include "DNA_volume_types.h" #include "DNA_world_types.h" -#include "DNA_object_force_types.h" #include "BKE_action.h" -#include "BKE_armature.h" #include "BKE_animsys.h" +#include "BKE_armature.h" #include "BKE_collection.h" +#include "BKE_collision.h" #include "BKE_constraint.h" #include "BKE_curve.h" #include "BKE_effect.h" -#include "BKE_collision.h" #include "BKE_fcurve.h" +#include "BKE_gpencil_modifier.h" #include "BKE_image.h" #include "BKE_key.h" #include "BKE_layer.h" #include "BKE_material.h" #include "BKE_mball.h" #include "BKE_modifier.h" -#include "BKE_gpencil_modifier.h" #include "BKE_node.h" #include "BKE_object.h" #include "BKE_particle.h" @@ -106,8 +106,8 @@ extern "C" { #include "intern/builder/deg_builder.h" #include "intern/builder/deg_builder_pchanmap.h" #include "intern/debug/deg_debug.h" -#include "intern/depsgraph_tag.h" #include "intern/depsgraph_physics.h" +#include "intern/depsgraph_tag.h" #include "intern/eval/deg_eval_copy_on_write.h" #include "intern/node/deg_node.h" diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.h b/source/blender/depsgraph/intern/builder/deg_builder_relations.h index e5e2116008b..099a00d66a6 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.h @@ -33,16 +33,16 @@ #include "RNA_access.h" #include "RNA_types.h" -#include "BLI_utildefines.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "intern/builder/deg_builder.h" #include "intern/builder/deg_builder_map.h" #include "intern/builder/deg_builder_rna.h" #include "intern/depsgraph.h" #include "intern/node/deg_node.h" -#include "intern/node/deg_node_id.h" #include "intern/node/deg_node_component.h" +#include "intern/node/deg_node_id.h" #include "intern/node/deg_node_operation.h" struct Base; diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc index 12cd6936a13..6fe9a3c2a00 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc @@ -25,14 +25,14 @@ #include "intern/builder/deg_builder_relations.h" +#include /* required for STREQ later on. */ #include #include -#include /* required for STREQ later on. */ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_blenlib.h" +#include "BLI_utildefines.h" extern "C" { #include "DNA_action_types.h" @@ -57,8 +57,8 @@ extern "C" { #include "intern/node/deg_node_component.h" #include "intern/node/deg_node_operation.h" -#include "intern/depsgraph_type.h" #include "intern/depsgraph_relation.h" +#include "intern/depsgraph_type.h" namespace DEG { diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc index 41e91ba7286..d3bdaccd404 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc @@ -25,14 +25,14 @@ #include "intern/builder/deg_builder_relations.h" +#include /* required for STREQ later on. */ #include #include -#include /* required for STREQ later on. */ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_blenlib.h" +#include "BLI_utildefines.h" extern "C" { #include "DNA_linestyle_types.h" diff --git a/source/blender/depsgraph/intern/builder/deg_builder_remove_noop.cc b/source/blender/depsgraph/intern/builder/deg_builder_remove_noop.cc index aa0cb66a38f..2ce1f1f1c1d 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_remove_noop.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_remove_noop.cc @@ -28,10 +28,10 @@ #include "intern/node/deg_node.h" #include "intern/node/deg_node_operation.h" -#include "intern/depsgraph.h" -#include "intern/depsgraph_type.h" -#include "intern/depsgraph_relation.h" #include "intern/debug/deg_debug.h" +#include "intern/depsgraph.h" +#include "intern/depsgraph_relation.h" +#include "intern/depsgraph_type.h" namespace DEG { diff --git a/source/blender/depsgraph/intern/builder/deg_builder_rna.cc b/source/blender/depsgraph/intern/builder/deg_builder_rna.cc index 6ae2e4ce696..73f6730be03 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_rna.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_rna.cc @@ -27,9 +27,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" extern "C" { #include "DNA_action_types.h" @@ -44,8 +44,8 @@ extern "C" { #include "RNA_access.h" -#include "intern/depsgraph.h" #include "intern/builder/deg_builder.h" +#include "intern/depsgraph.h" #include "intern/node/deg_node.h" #include "intern/node/deg_node_component.h" #include "intern/node/deg_node_id.h" diff --git a/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc b/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc index fc7c546e294..3f828ef5bb0 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc @@ -29,9 +29,9 @@ #include "intern/node/deg_node_component.h" #include "intern/node/deg_node_operation.h" +#include "intern/debug/deg_debug.h" #include "intern/depsgraph.h" #include "intern/depsgraph_relation.h" -#include "intern/debug/deg_debug.h" namespace DEG { diff --git a/source/blender/depsgraph/intern/debug/deg_debug.cc b/source/blender/depsgraph/intern/debug/deg_debug.cc index 74a042989db..ca27cef2c56 100644 --- a/source/blender/depsgraph/intern/debug/deg_debug.cc +++ b/source/blender/depsgraph/intern/debug/deg_debug.cc @@ -23,10 +23,10 @@ #include "intern/debug/deg_debug.h" -#include "BLI_utildefines.h" #include "BLI_console.h" #include "BLI_hash.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "PIL_time_utildefines.h" diff --git a/source/blender/depsgraph/intern/debug/deg_debug.h b/source/blender/depsgraph/intern/debug/deg_debug.h index 21a802828dc..f5e2f2c4b51 100644 --- a/source/blender/depsgraph/intern/debug/deg_debug.h +++ b/source/blender/depsgraph/intern/debug/deg_debug.h @@ -23,8 +23,8 @@ #pragma once -#include "intern/depsgraph_type.h" #include "intern/debug/deg_time_average.h" +#include "intern/depsgraph_type.h" #include "BKE_global.h" diff --git a/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc b/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc index 73b99213005..7080f8a1a9b 100644 --- a/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc +++ b/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc @@ -25,8 +25,8 @@ #include -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" extern "C" { #include "DNA_listBase.h" diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc index a19a2958f28..2ce8f1aa071 100644 --- a/source/blender/depsgraph/intern/depsgraph.cc +++ b/source/blender/depsgraph/intern/depsgraph.cc @@ -30,24 +30,24 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_console.h" -#include "BLI_hash.h" #include "BLI_ghash.h" +#include "BLI_hash.h" +#include "BLI_utildefines.h" extern "C" { -#include "BKE_scene.h" #include "BKE_global.h" #include "BKE_idcode.h" +#include "BKE_scene.h" } #include "DEG_depsgraph.h" #include "DEG_depsgraph_debug.h" -#include "intern/depsgraph_update.h" #include "intern/depsgraph_physics.h" -#include "intern/depsgraph_relation.h" #include "intern/depsgraph_registry.h" +#include "intern/depsgraph_relation.h" +#include "intern/depsgraph_update.h" #include "intern/eval/deg_eval_copy_on_write.h" diff --git a/source/blender/depsgraph/intern/depsgraph_build.cc b/source/blender/depsgraph/intern/depsgraph_build.cc index 3fe585ff73c..d78bc07ac5e 100644 --- a/source/blender/depsgraph/intern/depsgraph_build.cc +++ b/source/blender/depsgraph/intern/depsgraph_build.cc @@ -25,9 +25,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "PIL_time.h" #include "PIL_time_utildefines.h" @@ -42,8 +42,8 @@ extern "C" { } /* extern "C" */ #include "DEG_depsgraph.h" -#include "DEG_depsgraph_debug.h" #include "DEG_depsgraph_build.h" +#include "DEG_depsgraph_debug.h" #include "builder/deg_builder.h" #include "builder/deg_builder_cache.h" @@ -59,8 +59,8 @@ extern "C" { #include "intern/node/deg_node_id.h" #include "intern/node/deg_node_operation.h" -#include "intern/depsgraph_relation.h" #include "intern/depsgraph_registry.h" +#include "intern/depsgraph_relation.h" #include "intern/depsgraph_type.h" /* ****************** */ diff --git a/source/blender/depsgraph/intern/depsgraph_debug.cc b/source/blender/depsgraph/intern/depsgraph_debug.cc index 25f7e9117d1..c713a4a3fb1 100644 --- a/source/blender/depsgraph/intern/depsgraph_debug.cc +++ b/source/blender/depsgraph/intern/depsgraph_debug.cc @@ -23,8 +23,8 @@ * Implementation of tools for debugging the depsgraph */ -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" extern "C" { #include "DNA_scene_types.h" @@ -33,14 +33,14 @@ extern "C" { #include "DNA_object_types.h" #include "DEG_depsgraph.h" -#include "DEG_depsgraph_debug.h" #include "DEG_depsgraph_build.h" +#include "DEG_depsgraph_debug.h" #include "DEG_depsgraph_query.h" +#include "intern/debug/deg_debug.h" #include "intern/depsgraph.h" #include "intern/depsgraph_relation.h" #include "intern/depsgraph_type.h" -#include "intern/debug/deg_debug.h" #include "intern/node/deg_node_component.h" #include "intern/node/deg_node_id.h" #include "intern/node/deg_node_time.h" diff --git a/source/blender/depsgraph/intern/depsgraph_eval.cc b/source/blender/depsgraph/intern/depsgraph_eval.cc index 665a32b886c..7e7ab07825f 100644 --- a/source/blender/depsgraph/intern/depsgraph_eval.cc +++ b/source/blender/depsgraph/intern/depsgraph_eval.cc @@ -25,9 +25,9 @@ #include "MEM_guardedalloc.h" +#include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_utildefines.h" -#include "BLI_ghash.h" extern "C" { #include "BKE_scene.h" diff --git a/source/blender/depsgraph/intern/depsgraph_physics.cc b/source/blender/depsgraph/intern/depsgraph_physics.cc index cabb95fe732..d7c09780845 100644 --- a/source/blender/depsgraph/intern/depsgraph_physics.cc +++ b/source/blender/depsgraph/intern/depsgraph_physics.cc @@ -38,8 +38,8 @@ extern "C" { } /* extern "C" */ #include "DNA_collection_types.h" -#include "DNA_object_types.h" #include "DNA_object_force_types.h" +#include "DNA_object_types.h" #include "DEG_depsgraph_build.h" #include "DEG_depsgraph_physics.h" diff --git a/source/blender/depsgraph/intern/depsgraph_query.cc b/source/blender/depsgraph/intern/depsgraph_query.cc index 4205f79b9c0..1f1e2482094 100644 --- a/source/blender/depsgraph/intern/depsgraph_query.cc +++ b/source/blender/depsgraph/intern/depsgraph_query.cc @@ -28,9 +28,9 @@ extern "C" { #include // XXX: memcpy -#include "BLI_utildefines.h" -#include "BLI_listbase.h" #include "BLI_ghash.h" +#include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "BKE_action.h" // XXX: BKE_pose_channel_find_name #include "BKE_customdata.h" diff --git a/source/blender/depsgraph/intern/depsgraph_query_foreach.cc b/source/blender/depsgraph/intern/depsgraph_query_foreach.cc index 793862bf2fd..6409f5b3cea 100644 --- a/source/blender/depsgraph/intern/depsgraph_query_foreach.cc +++ b/source/blender/depsgraph/intern/depsgraph_query_foreach.cc @@ -26,8 +26,8 @@ #include "MEM_guardedalloc.h" extern "C" { -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" } /* extern "C" */ #include "DNA_object_types.h" diff --git a/source/blender/depsgraph/intern/depsgraph_query_iter.cc b/source/blender/depsgraph/intern/depsgraph_query_iter.cc index 90ab7565f4a..427a16adfc4 100644 --- a/source/blender/depsgraph/intern/depsgraph_query_iter.cc +++ b/source/blender/depsgraph/intern/depsgraph_query_iter.cc @@ -29,13 +29,13 @@ #include "MEM_guardedalloc.h" extern "C" { -#include "BLI_utildefines.h" -#include "BLI_math.h" #include "BKE_anim.h" #include "BKE_idprop.h" #include "BKE_layer.h" #include "BKE_node.h" #include "BKE_object.h" +#include "BLI_math.h" +#include "BLI_utildefines.h" } /* extern "C" */ #include "DNA_object_types.h" diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc index a14f22350a4..2c8f89b99f9 100644 --- a/source/blender/depsgraph/intern/depsgraph_tag.cc +++ b/source/blender/depsgraph/intern/depsgraph_tag.cc @@ -25,13 +25,13 @@ #include "intern/depsgraph_tag.h" -#include #include /* required for memset */ #include +#include -#include "BLI_utildefines.h" #include "BLI_math_bits.h" #include "BLI_task.h" +#include "BLI_utildefines.h" extern "C" { #include "DNA_anim_types.h" @@ -62,8 +62,8 @@ extern "C" { #include "intern/builder/deg_builder.h" #include "intern/depsgraph.h" -#include "intern/depsgraph_update.h" #include "intern/depsgraph_registry.h" +#include "intern/depsgraph_update.h" #include "intern/eval/deg_eval_copy_on_write.h" #include "intern/eval/deg_eval_flush.h" #include "intern/node/deg_node.h" diff --git a/source/blender/depsgraph/intern/depsgraph_type.cc b/source/blender/depsgraph/intern/depsgraph_type.cc index ef1fda1df44..559bf8dfdab 100644 --- a/source/blender/depsgraph/intern/depsgraph_type.cc +++ b/source/blender/depsgraph/intern/depsgraph_type.cc @@ -25,8 +25,8 @@ #include // for BLI_assert() -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" #include "DNA_customdata_types.h" diff --git a/source/blender/depsgraph/intern/depsgraph_type.h b/source/blender/depsgraph/intern/depsgraph_type.h index 201d8b9a59e..fbf5c2fd381 100644 --- a/source/blender/depsgraph/intern/depsgraph_type.h +++ b/source/blender/depsgraph/intern/depsgraph_type.h @@ -33,13 +33,13 @@ /* TODO(sergey): Ideally we'll just use char* and statically allocated strings * to avoid any possible overhead caused by string (re)allocation/formatting. */ -#include -#include -#include #include +#include #include #include +#include #include +#include struct Depsgraph; diff --git a/source/blender/depsgraph/intern/eval/deg_eval.cc b/source/blender/depsgraph/intern/eval/deg_eval.cc index 1296c87bbb0..4540cda7e99 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval.cc @@ -28,22 +28,24 @@ #include "PIL_time.h" #include "BLI_compiler_attrs.h" -#include "BLI_utildefines.h" -#include "BLI_task.h" #include "BLI_ghash.h" #include "BLI_gsqueue.h" +#include "BLI_task.h" +#include "BLI_utildefines.h" #include "BKE_global.h" +#include "DNA_node_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_node_types.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" #include "atomic_ops.h" +#include "intern/depsgraph.h" +#include "intern/depsgraph_relation.h" #include "intern/eval/deg_eval_copy_on_write.h" #include "intern/eval/deg_eval_flush.h" #include "intern/eval/deg_eval_stats.h" @@ -52,8 +54,6 @@ #include "intern/node/deg_node_id.h" #include "intern/node/deg_node_operation.h" #include "intern/node/deg_node_time.h" -#include "intern/depsgraph.h" -#include "intern/depsgraph_relation.h" namespace DEG { diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc index d8ce590c611..f51def4caa9 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc @@ -35,15 +35,15 @@ #include -#include "BLI_utildefines.h" #include "BLI_listbase.h" -#include "BLI_threads.h" #include "BLI_string.h" +#include "BLI_threads.h" +#include "BLI_utildefines.h" #include "BKE_curve.h" #include "BKE_global.h" -#include "BKE_idprop.h" #include "BKE_gpencil.h" +#include "BKE_idprop.h" #include "BKE_layer.h" #include "BKE_lib_id.h" #include "BKE_scene.h" @@ -59,20 +59,20 @@ extern "C" { #include "DNA_armature_types.h" #include "DNA_mesh_types.h" #include "DNA_modifier_types.h" -#include "DNA_scene_types.h" -#include "DNA_sequence_types.h" -#include "DNA_sound_types.h" #include "DNA_object_types.h" #include "DNA_particle_types.h" #include "DNA_rigidbody_types.h" +#include "DNA_scene_types.h" +#include "DNA_sequence_types.h" +#include "DNA_sound_types.h" #include "DRW_engine.h" #ifdef NESTED_ID_NASTY_WORKAROUND # include "DNA_curve_types.h" # include "DNA_key_types.h" -# include "DNA_light_types.h" # include "DNA_lattice_types.h" +# include "DNA_light_types.h" # include "DNA_linestyle_types.h" # include "DNA_material_types.h" # include "DNA_meta_types.h" @@ -93,9 +93,9 @@ extern "C" { #include "BKE_sound.h" } -#include "intern/depsgraph.h" #include "intern/builder/deg_builder.h" #include "intern/builder/deg_builder_nodes.h" +#include "intern/depsgraph.h" #include "intern/eval/deg_eval_runtime_backup.h" #include "intern/node/deg_node.h" #include "intern/node/deg_node_id.h" diff --git a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc index 2b4fd50ccc4..dd72bc22a70 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc @@ -27,11 +27,11 @@ #include -#include "BLI_utildefines.h" +#include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_math_vector.h" #include "BLI_task.h" -#include "BLI_ghash.h" +#include "BLI_utildefines.h" #include "BKE_object.h" #include "BKE_scene.h" diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_scene.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_scene.cc index a1d6961cf5d..9f47402790c 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_scene.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_scene.cc @@ -23,8 +23,8 @@ #include "intern/eval/deg_eval_runtime_backup_scene.h" -#include "DNA_scene_types.h" #include "DNA_rigidbody_types.h" +#include "DNA_scene_types.h" namespace DEG { diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.h b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.h index 57b533a1b84..05f37b45dc4 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.h +++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.h @@ -23,8 +23,8 @@ #pragma once -#include "intern/eval/deg_eval_runtime_backup_sequence.h" #include "intern/depsgraph_type.h" +#include "intern/eval/deg_eval_runtime_backup_sequence.h" struct Scene; diff --git a/source/blender/depsgraph/intern/eval/deg_eval_stats.cc b/source/blender/depsgraph/intern/eval/deg_eval_stats.cc index 25c32e88021..f164560ac24 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_stats.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_stats.cc @@ -23,8 +23,8 @@ #include "intern/eval/deg_eval_stats.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" #include "intern/depsgraph.h" diff --git a/source/blender/depsgraph/intern/node/deg_node_component.cc b/source/blender/depsgraph/intern/node/deg_node_component.cc index 73f9668eb5d..54796b8965b 100644 --- a/source/blender/depsgraph/intern/node/deg_node_component.cc +++ b/source/blender/depsgraph/intern/node/deg_node_component.cc @@ -23,11 +23,11 @@ #include "intern/node/deg_node_component.h" -#include #include /* required for STREQ later on. */ +#include -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" extern "C" { #include "DNA_object_types.h" @@ -35,8 +35,8 @@ extern "C" { #include "BKE_action.h" } /* extern "C" */ -#include "intern/node/deg_node_id.h" #include "intern/node/deg_node_factory.h" +#include "intern/node/deg_node_id.h" #include "intern/node/deg_node_operation.h" namespace DEG { diff --git a/source/blender/depsgraph/intern/node/deg_node_component.h b/source/blender/depsgraph/intern/node/deg_node_component.h index 6a2157fa3b2..38ea4005a72 100644 --- a/source/blender/depsgraph/intern/node/deg_node_component.h +++ b/source/blender/depsgraph/intern/node/deg_node_component.h @@ -26,8 +26,8 @@ #include "intern/node/deg_node.h" #include "intern/node/deg_node_operation.h" -#include "BLI_utildefines.h" #include "BLI_string.h" +#include "BLI_utildefines.h" struct GHash; struct ID; diff --git a/source/blender/depsgraph/intern/node/deg_node_factory.h b/source/blender/depsgraph/intern/node/deg_node_factory.h index 38487e7f979..db2c3bb2f44 100644 --- a/source/blender/depsgraph/intern/node/deg_node_factory.h +++ b/source/blender/depsgraph/intern/node/deg_node_factory.h @@ -25,8 +25,8 @@ #include "MEM_guardedalloc.h" -#include "intern/node/deg_node.h" #include "intern/depsgraph_type.h" +#include "intern/node/deg_node.h" struct ID; diff --git a/source/blender/depsgraph/intern/node/deg_node_id.cc b/source/blender/depsgraph/intern/node/deg_node_id.cc index cd25cc14069..0bb09390b4f 100644 --- a/source/blender/depsgraph/intern/node/deg_node_id.cc +++ b/source/blender/depsgraph/intern/node/deg_node_id.cc @@ -23,12 +23,12 @@ #include "intern/node/deg_node_id.h" -#include #include /* required for STREQ later on. */ +#include -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_string.h" +#include "BLI_utildefines.h" extern "C" { #include "DNA_ID.h" @@ -41,8 +41,8 @@ extern "C" { #include "DEG_depsgraph.h" #include "intern/eval/deg_eval_copy_on_write.h" -#include "intern/node/deg_node_factory.h" #include "intern/node/deg_node_component.h" +#include "intern/node/deg_node_factory.h" #include "intern/node/deg_node_time.h" namespace DEG { diff --git a/source/blender/depsgraph/intern/node/deg_node_id.h b/source/blender/depsgraph/intern/node/deg_node_id.h index 6eea31ebff9..80bb67f182f 100644 --- a/source/blender/depsgraph/intern/node/deg_node_id.h +++ b/source/blender/depsgraph/intern/node/deg_node_id.h @@ -23,9 +23,9 @@ #pragma once -#include "intern/node/deg_node.h" #include "BLI_sys_types.h" #include "DNA_ID.h" +#include "intern/node/deg_node.h" struct GHash; diff --git a/source/blender/depsgraph/intern/node/deg_node_operation.cc b/source/blender/depsgraph/intern/node/deg_node_operation.cc index 820dd607e3f..78399d5c953 100644 --- a/source/blender/depsgraph/intern/node/deg_node_operation.cc +++ b/source/blender/depsgraph/intern/node/deg_node_operation.cc @@ -25,12 +25,12 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" #include "intern/depsgraph.h" -#include "intern/node/deg_node_factory.h" #include "intern/node/deg_node_component.h" +#include "intern/node/deg_node_factory.h" #include "intern/node/deg_node_id.h" namespace DEG { 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 #include #include -#include #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_math_bits.h" -#include "BLI_string.h" -#include "BLI_alloca.h" #include "BLI_edgehash.h" -#include "BLI_task.h" #include "BLI_jitter_2d.h" +#include "BLI_math_bits.h" +#include "BLI_math_vector.h" +#include "BLI_string.h" +#include "BLI_task.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_math_bits.h" -#include "BLI_string.h" -#include "BLI_alloca.h" #include "BLI_edgehash.h" +#include "BLI_math_bits.h" +#include "BLI_math_vector.h" +#include "BLI_string.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" diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index 949d7008820..67e899382bb 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -35,36 +35,36 @@ #include "DNA_armature_types.h" #include "DNA_cachefile_types.h" #include "DNA_camera_types.h" +#include "DNA_gpencil_types.h" #include "DNA_hair_types.h" -#include "DNA_object_types.h" -#include "DNA_particle_types.h" -#include "DNA_screen_types.h" -#include "DNA_scene_types.h" -#include "DNA_space_types.h" #include "DNA_key_types.h" -#include "DNA_light_types.h" #include "DNA_lattice_types.h" +#include "DNA_light_types.h" #include "DNA_linestyle_types.h" -#include "DNA_mesh_types.h" +#include "DNA_mask_types.h" #include "DNA_material_types.h" +#include "DNA_mesh_types.h" #include "DNA_meta_types.h" #include "DNA_node_types.h" +#include "DNA_object_types.h" +#include "DNA_particle_types.h" #include "DNA_pointcloud_types.h" +#include "DNA_scene_types.h" +#include "DNA_screen_types.h" +#include "DNA_space_types.h" +#include "DNA_speaker_types.h" #include "DNA_volume_types.h" #include "DNA_world_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_speaker_types.h" -#include "DNA_mask_types.h" #include "RNA_access.h" #include "BKE_animsys.h" +#include "BKE_context.h" #include "BKE_curve.h" #include "BKE_gpencil.h" #include "BKE_key.h" #include "BKE_main.h" #include "BKE_nla.h" -#include "BKE_context.h" #include "GPU_immediate.h" #include "GPU_state.h" diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index 791545f216a..f47ed85f5bf 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -28,34 +28,34 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "DNA_anim_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_key_types.h" +#include "DNA_mask_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_key_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_mask_types.h" #include "RNA_access.h" #include "RNA_define.h" -#include "BKE_animsys.h" #include "BKE_action.h" -#include "BKE_fcurve.h" -#include "BKE_gpencil.h" +#include "BKE_animsys.h" #include "BKE_context.h" +#include "BKE_fcurve.h" +#include "BKE_global.h" +#include "BKE_gpencil.h" #include "BKE_lib_id.h" #include "BKE_mask.h" -#include "BKE_global.h" #include "BKE_scene.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "UI_view2d.h" #include "UI_interface.h" +#include "UI_view2d.h" #include "ED_anim_api.h" #include "ED_armature.h" diff --git a/source/blender/editors/animation/anim_deps.c b/source/blender/editors/animation/anim_deps.c index 439b8071deb..6f7770d97f1 100644 --- a/source/blender/editors/animation/anim_deps.c +++ b/source/blender/editors/animation/anim_deps.c @@ -28,17 +28,17 @@ #include "DNA_anim_types.h" #include "DNA_armature_types.h" #include "DNA_gpencil_types.h" -#include "DNA_object_types.h" -#include "DNA_node_types.h" #include "DNA_mask_types.h" +#include "DNA_node_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_sequence_types.h" #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BKE_animsys.h" #include "BKE_action.h" +#include "BKE_animsys.h" #include "BKE_context.h" #include "BKE_fcurve.h" #include "BKE_gpencil.h" diff --git a/source/blender/editors/animation/anim_draw.c b/source/blender/editors/animation/anim_draw.c index abcc2fe5291..77399880b8d 100644 --- a/source/blender/editors/animation/anim_draw.c +++ b/source/blender/editors/animation/anim_draw.c @@ -24,30 +24,30 @@ #include "BLI_sys_types.h" #include "DNA_anim_types.h" -#include "DNA_scene_types.h" -#include "DNA_space_types.h" -#include "DNA_userdef_types.h" -#include "DNA_screen_types.h" -#include "DNA_object_types.h" #include "DNA_gpencil_types.h" #include "DNA_mask_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" +#include "DNA_screen_types.h" +#include "DNA_space_types.h" +#include "DNA_userdef_types.h" +#include "BLI_dlrbTree.h" #include "BLI_math.h" +#include "BLI_rect.h" #include "BLI_timecode.h" #include "BLI_utildefines.h" -#include "BLI_rect.h" -#include "BLI_dlrbTree.h" #include "BKE_context.h" #include "BKE_curve.h" #include "BKE_fcurve.h" #include "BKE_global.h" -#include "BKE_nla.h" #include "BKE_mask.h" +#include "BKE_nla.h" #include "ED_anim_api.h" -#include "ED_keyframes_edit.h" #include "ED_keyframes_draw.h" +#include "ED_keyframes_edit.h" #include "RNA_access.h" diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index 0895bd4f8a2..a09db0380e6 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -44,13 +44,16 @@ #include "DNA_anim_types.h" #include "DNA_armature_types.h" -#include "DNA_camera_types.h" +#include "DNA_brush_types.h" #include "DNA_cachefile_types.h" +#include "DNA_camera_types.h" +#include "DNA_gpencil_types.h" #include "DNA_hair_types.h" -#include "DNA_light_types.h" -#include "DNA_lattice_types.h" -#include "DNA_linestyle_types.h" #include "DNA_key_types.h" +#include "DNA_lattice_types.h" +#include "DNA_layer_types.h" +#include "DNA_light_types.h" +#include "DNA_linestyle_types.h" #include "DNA_mask_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" @@ -58,28 +61,25 @@ #include "DNA_movieclip_types.h" #include "DNA_node_types.h" #include "DNA_object_force_types.h" +#include "DNA_object_types.h" #include "DNA_particle_types.h" #include "DNA_pointcloud_types.h" -#include "DNA_space_types.h" -#include "DNA_sequence_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" +#include "DNA_sequence_types.h" +#include "DNA_space_types.h" #include "DNA_speaker_types.h" +#include "DNA_userdef_types.h" #include "DNA_volume_types.h" #include "DNA_world_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_brush_types.h" -#include "DNA_object_types.h" -#include "DNA_userdef_types.h" -#include "DNA_layer_types.h" #include "MEM_guardedalloc.h" -#include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_alloca.h" +#include "BLI_blenlib.h" #include "BLI_ghash.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BKE_action.h" #include "BKE_animsys.h" @@ -90,10 +90,10 @@ #include "BKE_key.h" #include "BKE_layer.h" #include "BKE_main.h" +#include "BKE_mask.h" #include "BKE_material.h" #include "BKE_modifier.h" #include "BKE_node.h" -#include "BKE_mask.h" #include "BKE_sequencer.h" #include "ED_anim_api.h" diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index 4e2b126e2fb..2215021ce1a 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -25,8 +25,8 @@ #include "MEM_guardedalloc.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BLI_blenlib.h" #include "BLI_math.h" @@ -56,18 +56,18 @@ #include "UI_interface.h" #include "UI_interface_icons.h" -#include "UI_view2d.h" #include "UI_resources.h" +#include "UI_view2d.h" #include "ED_anim_api.h" #include "ED_markers.h" -#include "ED_screen.h" -#include "ED_select_utils.h" -#include "ED_util.h" #include "ED_numinput.h" #include "ED_object.h" +#include "ED_screen.h" +#include "ED_select_utils.h" #include "ED_transform.h" #include "ED_types.h" +#include "ED_util.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/animation/anim_motion_paths.c b/source/blender/editors/animation/anim_motion_paths.c index e6ab3609507..7e36799ff1b 100644 --- a/source/blender/editors/animation/anim_motion_paths.c +++ b/source/blender/editors/animation/anim_motion_paths.c @@ -22,16 +22,16 @@ #include +#include "BLI_dlrbTree.h" #include "BLI_listbase.h" #include "BLI_math.h" -#include "BLI_dlrbTree.h" #include "DNA_anim_types.h" #include "DNA_armature_types.h" #include "DNA_scene_types.h" -#include "BKE_animsys.h" #include "BKE_action.h" +#include "BKE_animsys.h" #include "BKE_main.h" #include "BKE_scene.h" diff --git a/source/blender/editors/animation/anim_ops.c b/source/blender/editors/animation/anim_ops.c index a85ec8a5d14..6b0d11802f4 100644 --- a/source/blender/editors/animation/anim_ops.c +++ b/source/blender/editors/animation/anim_ops.c @@ -21,22 +21,22 @@ * \ingroup edanimation */ -#include #include +#include #include "BLI_sys_types.h" -#include "BLI_utildefines.h" #include "BLI_math_base.h" +#include "BLI_utildefines.h" #include "DNA_anim_types.h" #include "DNA_scene_types.h" #include "BKE_context.h" -#include "BKE_sequencer.h" #include "BKE_global.h" #include "BKE_main.h" #include "BKE_scene.h" +#include "BKE_sequencer.h" #include "UI_view2d.h" diff --git a/source/blender/editors/animation/drivers.c b/source/blender/editors/animation/drivers.c index 1af85e00045..ee0f403a155 100644 --- a/source/blender/editors/animation/drivers.c +++ b/source/blender/editors/animation/drivers.c @@ -21,15 +21,15 @@ * \ingroup edanimation */ +#include #include #include -#include #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "DNA_anim_types.h" #include "DNA_object_types.h" @@ -37,8 +37,8 @@ #include "DNA_texture_types.h" #include "BKE_animsys.h" -#include "BKE_fcurve.h" #include "BKE_context.h" +#include "BKE_fcurve.h" #include "BKE_report.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c index 479e7192b0e..4b3b730d0fe 100644 --- a/source/blender/editors/animation/keyframes_draw.c +++ b/source/blender/editors/animation/keyframes_draw.c @@ -23,25 +23,25 @@ /* System includes ----------------------------------------------------- */ +#include #include #include #include -#include #include "MEM_guardedalloc.h" #include "BLI_dlrbTree.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_rect.h" +#include "BLI_utildefines.h" #include "DNA_anim_types.h" +#include "DNA_brush_types.h" #include "DNA_cachefile_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_mask_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_brush_types.h" -#include "DNA_mask_types.h" #include "BKE_fcurve.h" diff --git a/source/blender/editors/animation/keyframes_edit.c b/source/blender/editors/animation/keyframes_edit.c index 7a24eb484ac..61488e7f63a 100644 --- a/source/blender/editors/animation/keyframes_edit.c +++ b/source/blender/editors/animation/keyframes_edit.c @@ -20,17 +20,17 @@ * \ingroup edanimation */ +#include +#include #include #include -#include -#include #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_lasso_2d.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "DNA_anim_types.h" #include "DNA_object_types.h" diff --git a/source/blender/editors/animation/keyframes_general.c b/source/blender/editors/animation/keyframes_general.c index ed5cb65c42e..c526c185383 100644 --- a/source/blender/editors/animation/keyframes_general.c +++ b/source/blender/editors/animation/keyframes_general.c @@ -21,17 +21,17 @@ * \ingroup edanimation */ +#include +#include #include #include -#include -#include #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" -#include "BLI_string_utils.h" #include "BLI_math.h" +#include "BLI_string_utils.h" +#include "BLI_utildefines.h" #include "DNA_anim_types.h" #include "DNA_object_types.h" @@ -39,17 +39,17 @@ #include "BKE_action.h" #include "BKE_curve.h" -#include "BKE_fcurve.h" -#include "BKE_report.h" -#include "BKE_main.h" #include "BKE_deform.h" +#include "BKE_fcurve.h" +#include "BKE_main.h" +#include "BKE_report.h" #include "RNA_access.h" #include "RNA_enum_types.h" #include "ED_anim_api.h" -#include "ED_keyframing.h" #include "ED_keyframes_edit.h" +#include "ED_keyframing.h" /* This file contains code for various keyframe-editing tools which are 'destructive' * (i.e. they will modify the order of the keyframes, and change the size of the array). diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index c290a2ac70a..a560192195f 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -21,11 +21,11 @@ * \ingroup edanimation */ -#include -#include -#include -#include #include +#include +#include +#include +#include #include "MEM_guardedalloc.h" @@ -40,9 +40,9 @@ #include "DNA_constraint_types.h" #include "DNA_key_types.h" #include "DNA_material_types.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" #include "DNA_rigidbody_types.h" +#include "DNA_scene_types.h" #include "BKE_action.h" #include "BKE_animsys.h" @@ -62,10 +62,10 @@ #include "DEG_depsgraph_query.h" #include "ED_anim_api.h" -#include "ED_keyframing.h" #include "ED_keyframes_edit.h" -#include "ED_screen.h" +#include "ED_keyframing.h" #include "ED_object.h" +#include "ED_screen.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c index 6f9769f9785..d30d03a1c73 100644 --- a/source/blender/editors/animation/keyingsets.c +++ b/source/blender/editors/animation/keyingsets.c @@ -21,11 +21,11 @@ * \ingroup edanimation */ -#include -#include -#include -#include #include +#include +#include +#include +#include #include "MEM_guardedalloc.h" @@ -33,12 +33,12 @@ #include "BLI_utildefines.h" #include "DNA_anim_types.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" -#include "BKE_main.h" #include "BKE_animsys.h" #include "BKE_context.h" +#include "BKE_main.h" #include "BKE_report.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/animation/time_scrub_ui.c b/source/blender/editors/animation/time_scrub_ui.c index 74c359737b0..25b8e78de92 100644 --- a/source/blender/editors/animation/time_scrub_ui.c +++ b/source/blender/editors/animation/time_scrub_ui.c @@ -34,13 +34,13 @@ #include "UI_interface.h" #include "UI_interface_icons.h" -#include "UI_view2d.h" #include "UI_resources.h" +#include "UI_view2d.h" #include "DNA_scene_types.h" -#include "BLI_rect.h" #include "BLI_math.h" +#include "BLI_rect.h" #include "BLI_string.h" #include "BLI_timecode.h" diff --git a/source/blender/editors/armature/armature_add.c b/source/blender/editors/armature/armature_add.c index 2ebe7d6f144..e87040279af 100644 --- a/source/blender/editors/armature/armature_add.c +++ b/source/blender/editors/armature/armature_add.c @@ -30,15 +30,15 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_ghash.h" +#include "BLI_math.h" #include "BLI_string_utils.h" #include "BKE_action.h" #include "BKE_constraint.h" #include "BKE_context.h" -#include "BKE_idprop.h" #include "BKE_deform.h" +#include "BKE_idprop.h" #include "BKE_layer.h" #include "RNA_access.h" diff --git a/source/blender/editors/armature/armature_edit.c b/source/blender/editors/armature/armature_edit.c index 4ca0cd117b6..c7fa63a0e48 100644 --- a/source/blender/editors/armature/armature_edit.c +++ b/source/blender/editors/armature/armature_edit.c @@ -34,18 +34,18 @@ #include "BLT_translation.h" #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_ghash.h" +#include "BLI_math.h" #include "BKE_action.h" #include "BKE_armature.h" #include "BKE_constraint.h" #include "BKE_context.h" -#include "BKE_layer.h" #include "BKE_global.h" +#include "BKE_layer.h" #include "BKE_main.h" -#include "BKE_report.h" #include "BKE_object.h" +#include "BKE_report.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/armature/armature_naming.c b/source/blender/editors/armature/armature_naming.c index bad4edbabaf..13660244547 100644 --- a/source/blender/editors/armature/armature_naming.c +++ b/source/blender/editors/armature/armature_naming.c @@ -28,9 +28,9 @@ #include "DNA_armature_types.h" #include "DNA_constraint_types.h" -#include "DNA_object_types.h" -#include "DNA_gpencil_types.h" #include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_object_types.h" #include "BLI_blenlib.h" #include "BLI_ghash.h" @@ -39,16 +39,16 @@ #include "BLT_translation.h" -#include "BKE_animsys.h" #include "BKE_action.h" +#include "BKE_animsys.h" #include "BKE_armature.h" #include "BKE_constraint.h" #include "BKE_context.h" #include "BKE_deform.h" +#include "BKE_gpencil_modifier.h" #include "BKE_layer.h" #include "BKE_main.h" #include "BKE_modifier.h" -#include "BKE_gpencil_modifier.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/armature/armature_select.c b/source/blender/editors/armature/armature_select.c index 47eb09cdf3d..21eccd2ca1f 100644 --- a/source/blender/editors/armature/armature_select.c +++ b/source/blender/editors/armature/armature_select.c @@ -32,11 +32,11 @@ #include "BLI_math.h" #include "BLI_string_utils.h" -#include "BKE_context.h" #include "BKE_action.h" +#include "BKE_context.h" +#include "BKE_layer.h" #include "BKE_object.h" #include "BKE_report.h" -#include "BKE_layer.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/armature/armature_skinning.c b/source/blender/editors/armature/armature_skinning.c index 1cb1edaa080..87f980db7b9 100644 --- a/source/blender/editors/armature/armature_skinning.c +++ b/source/blender/editors/armature/armature_skinning.c @@ -23,8 +23,8 @@ * \ingroup edarmature */ -#include "DNA_mesh_types.h" #include "DNA_armature_types.h" +#include "DNA_mesh_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/armature/editarmature_undo.c b/source/blender/editors/armature/editarmature_undo.c index 4753698ae40..c73f8f69fdd 100644 --- a/source/blender/editors/armature/editarmature_undo.c +++ b/source/blender/editors/armature/editarmature_undo.c @@ -42,8 +42,8 @@ #include "ED_undo.h" #include "ED_util.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" /** We only need this locally. */ static CLG_LogRef LOG = {"ed.undo.armature"}; diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c index 6bf507df421..6028ddb216f 100644 --- a/source/blender/editors/armature/meshlaplacian.c +++ b/source/blender/editors/armature/meshlaplacian.c @@ -21,16 +21,16 @@ #include "MEM_guardedalloc.h" -#include "DNA_object_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_math.h" +#include "BLI_alloca.h" #include "BLI_edgehash.h" +#include "BLI_math.h" #include "BLI_memarena.h" #include "BLI_string.h" -#include "BLI_alloca.h" #include "BLT_translation.h" @@ -39,8 +39,8 @@ #include "BKE_mesh_runtime.h" #include "BKE_modifier.h" -#include "ED_mesh.h" #include "ED_armature.h" +#include "ED_mesh.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/armature/pose_edit.c b/source/blender/editors/armature/pose_edit.c index 562935bbcf4..09b6cd9c8cc 100644 --- a/source/blender/editors/armature/pose_edit.c +++ b/source/blender/editors/armature/pose_edit.c @@ -24,13 +24,13 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "DNA_anim_types.h" #include "DNA_armature_types.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BKE_action.h" #include "BKE_anim.h" @@ -38,10 +38,10 @@ #include "BKE_context.h" #include "BKE_deform.h" #include "BKE_global.h" +#include "BKE_layer.h" #include "BKE_main.h" #include "BKE_object.h" #include "BKE_report.h" -#include "BKE_layer.h" #include "BKE_scene.h" #include "DEG_depsgraph.h" @@ -57,8 +57,8 @@ #include "ED_anim_api.h" #include "ED_armature.h" #include "ED_keyframing.h" -#include "ED_screen.h" #include "ED_object.h" +#include "ED_screen.h" #include "ED_view3d.h" #include "UI_interface.h" diff --git a/source/blender/editors/armature/pose_group.c b/source/blender/editors/armature/pose_group.c index 3ae9976c948..9cd87f476d4 100644 --- a/source/blender/editors/armature/pose_group.c +++ b/source/blender/editors/armature/pose_group.c @@ -31,8 +31,8 @@ #include "DNA_armature_types.h" #include "DNA_object_types.h" -#include "BKE_armature.h" #include "BKE_action.h" +#include "BKE_armature.h" #include "BKE_context.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/armature/pose_lib.c b/source/blender/editors/armature/pose_lib.c index 4bd7ad6629a..f759808d08e 100644 --- a/source/blender/editors/armature/pose_lib.c +++ b/source/blender/editors/armature/pose_lib.c @@ -21,8 +21,8 @@ * \ingroup edarmature */ -#include #include +#include #include "MEM_guardedalloc.h" @@ -63,10 +63,10 @@ #include "ED_anim_api.h" #include "ED_armature.h" #include "ED_keyframes_draw.h" -#include "ED_keyframing.h" #include "ED_keyframes_edit.h" -#include "ED_screen.h" +#include "ED_keyframing.h" #include "ED_object.h" +#include "ED_screen.h" #include "armature_intern.h" diff --git a/source/blender/editors/armature/pose_select.c b/source/blender/editors/armature/pose_select.c index 0c359b2a757..07be2baf1ae 100644 --- a/source/blender/editors/armature/pose_select.c +++ b/source/blender/editors/armature/pose_select.c @@ -37,10 +37,10 @@ #include "BKE_armature.h" #include "BKE_constraint.h" #include "BKE_context.h" -#include "BKE_object.h" -#include "BKE_report.h" #include "BKE_layer.h" #include "BKE_modifier.h" +#include "BKE_object.h" +#include "BKE_report.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/armature/pose_slide.c b/source/blender/editors/armature/pose_slide.c index f24779e1baa..336d09f71b5 100644 --- a/source/blender/editors/armature/pose_slide.c +++ b/source/blender/editors/armature/pose_slide.c @@ -23,9 +23,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_dlrbTree.h" +#include "BLI_math.h" #include "BLT_translation.h" diff --git a/source/blender/editors/armature/pose_utils.c b/source/blender/editors/armature/pose_utils.c index 8d2d7d790d2..efb568178d9 100644 --- a/source/blender/editors/armature/pose_utils.c +++ b/source/blender/editors/armature/pose_utils.c @@ -23,8 +23,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "DNA_anim_types.h" #include "DNA_armature_types.h" diff --git a/source/blender/editors/curve/curve_ops.c b/source/blender/editors/curve/curve_ops.c index 81c9c759188..02cb1ee8e1c 100644 --- a/source/blender/editors/curve/curve_ops.c +++ b/source/blender/editors/curve/curve_ops.c @@ -21,8 +21,8 @@ * \ingroup edcurve */ -#include #include +#include #include "DNA_curve_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 6fdf76bfb75..2911611c516 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -21,17 +21,17 @@ * \ingroup edcurve */ +#include "DNA_anim_types.h" #include "DNA_key_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_anim_types.h" #include "MEM_guardedalloc.h" #include "BLI_array_utils.h" #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_ghash.h" +#include "BLI_math.h" #include "BLT_translation.h" @@ -56,13 +56,13 @@ #include "WM_api.h" #include "WM_types.h" +#include "ED_curve.h" #include "ED_object.h" #include "ED_screen.h" #include "ED_transform.h" #include "ED_transform_snap_object_context.h" #include "ED_types.h" #include "ED_view3d.h" -#include "ED_curve.h" #include "curve_intern.h" diff --git a/source/blender/editors/curve/editcurve_add.c b/source/blender/editors/curve/editcurve_add.c index d97223de9b8..91d5ea58361 100644 --- a/source/blender/editors/curve/editcurve_add.c +++ b/source/blender/editors/curve/editcurve_add.c @@ -21,9 +21,9 @@ * \ingroup edcurve */ +#include "DNA_anim_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_anim_types.h" #include "MEM_guardedalloc.h" @@ -42,10 +42,10 @@ #include "WM_api.h" #include "WM_types.h" +#include "ED_curve.h" #include "ED_object.h" #include "ED_screen.h" #include "ED_view3d.h" -#include "ED_curve.h" #include "curve_intern.h" diff --git a/source/blender/editors/curve/editcurve_paint.c b/source/blender/editors/curve/editcurve_paint.c index ffc09596b03..d028a88e322 100644 --- a/source/blender/editors/curve/editcurve_paint.c +++ b/source/blender/editors/curve/editcurve_paint.c @@ -37,10 +37,10 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_space_api.h" -#include "ED_screen.h" -#include "ED_view3d.h" #include "ED_curve.h" +#include "ED_screen.h" +#include "ED_space_api.h" +#include "ED_view3d.h" #include "GPU_batch.h" #include "GPU_batch_presets.h" diff --git a/source/blender/editors/curve/editcurve_select.c b/source/blender/editors/curve/editcurve_select.c index 9df79a082e1..51bb1eafdb9 100644 --- a/source/blender/editors/curve/editcurve_select.c +++ b/source/blender/editors/curve/editcurve_select.c @@ -27,10 +27,10 @@ #include "MEM_guardedalloc.h" #include "BLI_bitmap.h" -#include "BLI_math.h" -#include "BLI_rand.h" #include "BLI_heap_simple.h" #include "BLI_kdtree.h" +#include "BLI_math.h" +#include "BLI_rand.h" #include "BKE_context.h" #include "BKE_curve.h" @@ -41,12 +41,12 @@ #include "WM_api.h" #include "WM_types.h" +#include "ED_curve.h" #include "ED_object.h" #include "ED_screen.h" #include "ED_select_utils.h" #include "ED_types.h" #include "ED_view3d.h" -#include "ED_curve.h" #include "curve_intern.h" diff --git a/source/blender/editors/curve/editcurve_undo.c b/source/blender/editors/curve/editcurve_undo.c index 8bcabb5ed85..94a0ef7a460 100644 --- a/source/blender/editors/curve/editcurve_undo.c +++ b/source/blender/editors/curve/editcurve_undo.c @@ -22,13 +22,13 @@ #include "CLG_log.h" +#include "DNA_anim_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_anim_types.h" +#include "BLI_array_utils.h" #include "BLI_blenlib.h" #include "BLI_ghash.h" -#include "BLI_array_utils.h" #include "BKE_animsys.h" #include "BKE_context.h" @@ -40,11 +40,11 @@ #include "DEG_depsgraph.h" -#include "ED_undo.h" #include "ED_curve.h" +#include "ED_undo.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "curve_intern.h" diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c index 5fe7082d59b..297af4cb72d 100644 --- a/source/blender/editors/curve/editfont.c +++ b/source/blender/editors/curve/editfont.c @@ -21,11 +21,11 @@ * \ingroup edcurve */ +#include +#include #include #include -#include #include -#include #include "MEM_guardedalloc.h" @@ -36,9 +36,9 @@ #include "DNA_curve_types.h" #include "DNA_object_types.h" -#include "DNA_vfont_types.h" #include "DNA_scene_types.h" #include "DNA_text_types.h" +#include "DNA_vfont_types.h" #include "BKE_context.h" #include "BKE_curve.h" diff --git a/source/blender/editors/curve/editfont_undo.c b/source/blender/editors/curve/editfont_undo.c index f00c4731b0f..af591e0c7c5 100644 --- a/source/blender/editors/curve/editfont_undo.c +++ b/source/blender/editors/curve/editfont_undo.c @@ -23,8 +23,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_array_utils.h" +#include "BLI_utildefines.h" #include "DNA_curve_types.h" #include "DNA_object_types.h" @@ -36,11 +36,11 @@ #include "DEG_depsgraph.h" -#include "ED_object.h" #include "ED_curve.h" +#include "ED_object.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #define USE_ARRAY_STORE diff --git a/source/blender/editors/gizmo_library/gizmo_library_presets.c b/source/blender/editors/gizmo_library/gizmo_library_presets.c index fe0893ae3ff..9039851da01 100644 --- a/source/blender/editors/gizmo_library/gizmo_library_presets.c +++ b/source/blender/editors/gizmo_library/gizmo_library_presets.c @@ -26,8 +26,8 @@ #include "BLI_math.h" -#include "DNA_view3d_types.h" #include "DNA_object_types.h" +#include "DNA_view3d_types.h" #include "BKE_context.h" @@ -38,11 +38,11 @@ #include "RNA_access.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" -#include "ED_view3d.h" #include "ED_screen.h" +#include "ED_view3d.h" /* own includes */ #include "ED_gizmo_library.h" /* own include */ diff --git a/source/blender/editors/gizmo_library/gizmo_library_utils.c b/source/blender/editors/gizmo_library/gizmo_library_utils.c index 1964a2ff1a3..3902c112796 100644 --- a/source/blender/editors/gizmo_library/gizmo_library_utils.c +++ b/source/blender/editors/gizmo_library/gizmo_library_utils.c @@ -27,8 +27,8 @@ #include "BLI_math.h" -#include "DNA_view3d_types.h" #include "DNA_screen_types.h" +#include "DNA_view3d_types.h" #include "BKE_context.h" diff --git a/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c index 909be74cced..da6365d724d 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c @@ -50,12 +50,12 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" -#include "ED_view3d.h" -#include "ED_screen.h" #include "ED_gizmo_library.h" +#include "ED_screen.h" +#include "ED_view3d.h" #include "UI_interface.h" diff --git a/source/blender/editors/gizmo_library/gizmo_types/blank3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/blank3d_gizmo.c index e36ab0a0610..5617b6e125e 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/blank3d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/blank3d_gizmo.c @@ -27,11 +27,11 @@ #include "BKE_context.h" -#include "ED_view3d.h" #include "ED_gizmo_library.h" +#include "ED_view3d.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" /* own includes */ #include "../gizmo_geometry.h" diff --git a/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c index ef3014eabc2..11253f01bf2 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c @@ -32,12 +32,12 @@ #include "BKE_context.h" +#include "GPU_batch.h" +#include "GPU_batch_utils.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" #include "GPU_matrix.h" #include "GPU_select.h" -#include "GPU_batch.h" -#include "GPU_batch_utils.h" #include "GPU_state.h" #include "RNA_access.h" @@ -47,9 +47,9 @@ #include "WM_api.h" #include "WM_types.h" +#include "ED_gizmo_library.h" #include "ED_screen.h" #include "ED_view3d.h" -#include "ED_gizmo_library.h" #include "UI_interface.h" #include "UI_interface_icons.h" diff --git a/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c index 6f6f131136c..1b43479eedb 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c @@ -30,17 +30,17 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_dial_2d.h" +#include "BLI_math.h" #include "BLI_rect.h" #include "BKE_context.h" -#include "GPU_matrix.h" -#include "GPU_shader.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" +#include "GPU_matrix.h" #include "GPU_select.h" +#include "GPU_shader.h" #include "GPU_state.h" #include "RNA_access.h" @@ -49,9 +49,9 @@ #include "WM_api.h" #include "WM_types.h" +#include "ED_gizmo_library.h" #include "ED_screen.h" #include "ED_view3d.h" -#include "ED_gizmo_library.h" /* own includes */ #include "../gizmo_library_intern.h" diff --git a/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c index cc69ad8f671..6855268610e 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c @@ -34,11 +34,11 @@ #include "BKE_context.h" -#include "GPU_matrix.h" -#include "GPU_shader.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" +#include "GPU_matrix.h" #include "GPU_select.h" +#include "GPU_shader.h" #include "GPU_state.h" #include "RNA_access.h" @@ -47,9 +47,9 @@ #include "WM_api.h" #include "WM_types.h" +#include "ED_gizmo_library.h" #include "ED_screen.h" #include "ED_view3d.h" -#include "ED_gizmo_library.h" /* own includes */ #include "../gizmo_library_intern.h" diff --git a/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c index 0a2f0738a01..6b308308664 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c @@ -50,10 +50,10 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_screen.h" -#include "ED_view3d.h" -#include "ED_transform.h" #include "ED_gizmo_library.h" +#include "ED_screen.h" +#include "ED_transform.h" +#include "ED_view3d.h" /* own includes */ #include "../gizmo_geometry.h" diff --git a/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.c index f7d22223b55..4049a3b9dcb 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.c @@ -46,10 +46,10 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_screen.h" -#include "ED_view3d.h" #include "ED_gizmo_library.h" +#include "ED_screen.h" #include "ED_transform_snap_object_context.h" +#include "ED_view3d.h" /* own includes */ #include "../gizmo_geometry.h" diff --git a/source/blender/editors/gpencil/annotate_draw.c b/source/blender/editors/gpencil/annotate_draw.c index ef9b6d2943b..5c396ca9041 100644 --- a/source/blender/editors/gpencil/annotate_draw.c +++ b/source/blender/editors/gpencil/annotate_draw.c @@ -21,31 +21,31 @@ * \ingroup edgpencil */ -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include #include "MEM_guardedalloc.h" #include "BLI_sys_types.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLF_api.h" #include "BLT_translation.h" #include "DNA_gpencil_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "DNA_view3d_types.h" #include "DNA_userdef_types.h" -#include "DNA_object_types.h" +#include "DNA_view3d_types.h" #include "BKE_context.h" #include "BKE_global.h" @@ -60,8 +60,8 @@ #include "ED_gpencil.h" #include "ED_screen.h" -#include "ED_view3d.h" #include "ED_space_api.h" +#include "ED_view3d.h" #include "UI_interface_icons.h" #include "UI_resources.h" diff --git a/source/blender/editors/gpencil/annotate_paint.c b/source/blender/editors/gpencil/annotate_paint.c index 5629e29f257..9f2c4070b18 100644 --- a/source/blender/editors/gpencil/annotate_paint.c +++ b/source/blender/editors/gpencil/annotate_paint.c @@ -21,18 +21,18 @@ * \ingroup edgpencil */ -#include +#include #include +#include #include #include -#include #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_math_geom.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -48,17 +48,17 @@ #include "BKE_screen.h" #include "BKE_tracking.h" +#include "DNA_gpencil_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_gpencil_types.h" #include "DNA_windowmanager_types.h" #include "UI_view2d.h" +#include "ED_clip.h" #include "ED_gpencil.h" #include "ED_screen.h" #include "ED_view3d.h" -#include "ED_clip.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c index db13f57b192..896ef7a9ad3 100644 --- a/source/blender/editors/gpencil/drawgpencil.c +++ b/source/blender/editors/gpencil/drawgpencil.c @@ -21,40 +21,40 @@ * \ingroup edgpencil */ -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include #include "MEM_guardedalloc.h" #include "BLI_sys_types.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_polyfill_2d.h" +#include "BLI_utildefines.h" #include "BLF_api.h" #include "BLT_translation.h" #include "DNA_brush_types.h" #include "DNA_gpencil_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "DNA_view3d_types.h" #include "DNA_userdef_types.h" -#include "DNA_object_types.h" +#include "DNA_view3d_types.h" -#include "BKE_context.h" #include "BKE_brush.h" +#include "BKE_context.h" #include "BKE_global.h" -#include "BKE_material.h" -#include "BKE_paint.h" #include "BKE_gpencil.h" #include "BKE_image.h" +#include "BKE_material.h" +#include "BKE_paint.h" #include "DEG_depsgraph.h" @@ -67,8 +67,8 @@ #include "ED_gpencil.h" #include "ED_screen.h" -#include "ED_view3d.h" #include "ED_space_api.h" +#include "ED_view3d.h" #include "UI_interface_icons.h" #include "UI_resources.h" diff --git a/source/blender/editors/gpencil/editaction_gpencil.c b/source/blender/editors/gpencil/editaction_gpencil.c index 7f659efb099..d2b1eba7d86 100644 --- a/source/blender/editors/gpencil/editaction_gpencil.c +++ b/source/blender/editors/gpencil/editaction_gpencil.c @@ -21,11 +21,11 @@ * \ingroup edgpencil */ -#include -#include -#include -#include #include +#include +#include +#include +#include #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/gpencil/gpencil_armature.c b/source/blender/editors/gpencil/gpencil_armature.c index 02913a19523..9566495715a 100644 --- a/source/blender/editors/gpencil/gpencil_armature.c +++ b/source/blender/editors/gpencil/gpencil_armature.c @@ -23,17 +23,17 @@ * Operators for dealing with armatures and GP data-blocks. */ -#include -#include -#include -#include #include +#include +#include +#include +#include #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -42,13 +42,13 @@ #include "DNA_meshdata_types.h" #include "DNA_scene_types.h" -#include "BKE_main.h" #include "BKE_action.h" #include "BKE_armature.h" #include "BKE_context.h" #include "BKE_deform.h" #include "BKE_gpencil.h" #include "BKE_gpencil_modifier.h" +#include "BKE_main.h" #include "BKE_object_deform.h" #include "BKE_report.h" @@ -60,8 +60,8 @@ #include "RNA_enum_types.h" #include "ED_gpencil.h" -#include "ED_object.h" #include "ED_mesh.h" +#include "ED_object.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/gpencil/gpencil_convert.c b/source/blender/editors/gpencil/gpencil_convert.c index 934466475a5..1c55c3b5a8f 100644 --- a/source/blender/editors/gpencil/gpencil_convert.c +++ b/source/blender/editors/gpencil/gpencil_convert.c @@ -22,16 +22,16 @@ * \ingroup edgpencil */ -#include -#include -#include -#include #include +#include +#include +#include +#include #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_rand.h" #include "BLI_utildefines.h" @@ -40,13 +40,13 @@ #include "DNA_anim_types.h" #include "DNA_collection_types.h" #include "DNA_curve_types.h" -#include "DNA_object_types.h" +#include "DNA_gpencil_types.h" #include "DNA_node_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" #include "DNA_view3d_types.h" -#include "DNA_gpencil_types.h" #include "BKE_collection.h" #include "BKE_context.h" @@ -75,11 +75,11 @@ #include "UI_resources.h" #include "UI_view2d.h" -#include "ED_gpencil.h" -#include "ED_view3d.h" #include "ED_clip.h" +#include "ED_gpencil.h" #include "ED_keyframing.h" #include "ED_object.h" +#include "ED_view3d.h" #include "gpencil_intern.h" diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c index 7ba4637f9d8..627bc46d06c 100644 --- a/source/blender/editors/gpencil/gpencil_data.c +++ b/source/blender/editors/gpencil/gpencil_data.c @@ -23,19 +23,19 @@ * Operators for dealing with GP data-blocks and layers. */ -#include -#include -#include -#include #include +#include +#include +#include +#include #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_math.h" #include "BLI_string_utils.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -76,8 +76,8 @@ #include "RNA_define.h" #include "RNA_enum_types.h" -#include "ED_object.h" #include "ED_gpencil.h" +#include "ED_object.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index 00fc6550459..bf1497fb2ed 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -22,11 +22,11 @@ * \ingroup edgpencil */ -#include -#include -#include -#include #include +#include +#include +#include +#include #include "MEM_guardedalloc.h" @@ -39,13 +39,13 @@ #include "BLT_translation.h" +#include "DNA_gpencil_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" #include "DNA_view3d_types.h" -#include "DNA_gpencil_types.h" #include "BKE_brush.h" #include "BKE_context.h" @@ -57,16 +57,16 @@ #include "BKE_object.h" #include "BKE_paint.h" #include "BKE_report.h" -#include "BKE_workspace.h" #include "BKE_scene.h" +#include "BKE_workspace.h" #include "UI_interface.h" #include "UI_resources.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "RNA_access.h" #include "RNA_define.h" @@ -77,10 +77,10 @@ #include "ED_gpencil.h" #include "ED_object.h" #include "ED_screen.h" -#include "ED_transform_snap_object_context.h" -#include "ED_view3d.h" #include "ED_select_utils.h" #include "ED_space_api.h" +#include "ED_transform_snap_object_context.h" +#include "ED_view3d.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c index a7fc5a4965b..d487f76a103 100644 --- a/source/blender/editors/gpencil/gpencil_fill.c +++ b/source/blender/editors/gpencil/gpencil_fill.c @@ -25,10 +25,10 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_blenlib.h" #include "BLI_math.h" #include "BLI_stack.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -39,16 +39,16 @@ #include "DNA_object_types.h" #include "DNA_windowmanager_types.h" -#include "BKE_main.h" #include "BKE_brush.h" -#include "BKE_deform.h" -#include "BKE_image.h" -#include "BKE_gpencil.h" -#include "BKE_material.h" #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_deform.h" +#include "BKE_gpencil.h" +#include "BKE_image.h" +#include "BKE_main.h" +#include "BKE_material.h" #include "BKE_paint.h" #include "BKE_report.h" +#include "BKE_screen.h" #include "ED_gpencil.h" #include "ED_screen.h" @@ -61,9 +61,9 @@ #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" +#include "GPU_framebuffer.h" #include "GPU_immediate.h" #include "GPU_matrix.h" -#include "GPU_framebuffer.h" #include "GPU_state.h" #include "UI_interface.h" diff --git a/source/blender/editors/gpencil/gpencil_interpolate.c b/source/blender/editors/gpencil/gpencil_interpolate.c index 958728c2baf..5577a35c1fd 100644 --- a/source/blender/editors/gpencil/gpencil_interpolate.c +++ b/source/blender/editors/gpencil/gpencil_interpolate.c @@ -22,18 +22,18 @@ * \ingroup edgpencil */ -#include -#include -#include -#include #include +#include +#include +#include +#include #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_easing.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -67,8 +67,8 @@ #include "ED_gpencil.h" #include "ED_object.h" #include "ED_screen.h" -#include "ED_view3d.h" #include "ED_space_api.h" +#include "ED_view3d.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c index 8794a27fb96..8b126912efc 100644 --- a/source/blender/editors/gpencil/gpencil_ops.c +++ b/source/blender/editors/gpencil/gpencil_ops.c @@ -21,14 +21,14 @@ * \ingroup edgpencil */ -#include #include #include +#include #include "BLI_sys_types.h" -#include "BKE_context.h" #include "BKE_brush.h" +#include "BKE_context.h" #include "BKE_gpencil.h" #include "BKE_paint.h" @@ -39,14 +39,14 @@ #include "DNA_space_types.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "RNA_access.h" #include "ED_gpencil.h" -#include "ED_select_utils.h" #include "ED_object.h" +#include "ED_select_utils.h" #include "ED_transform.h" #include "gpencil_intern.h" diff --git a/source/blender/editors/gpencil/gpencil_ops_versioning.c b/source/blender/editors/gpencil/gpencil_ops_versioning.c index e5b9d902210..df094ff5bd0 100644 --- a/source/blender/editors/gpencil/gpencil_ops_versioning.c +++ b/source/blender/editors/gpencil/gpencil_ops_versioning.c @@ -37,13 +37,13 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BKE_main.h" #include "BKE_brush.h" #include "BKE_context.h" #include "BKE_deform.h" #include "BKE_gpencil.h" -#include "BKE_object.h" +#include "BKE_main.h" #include "BKE_material.h" +#include "BKE_object.h" #include "WM_api.h" #include "WM_types.h" @@ -51,8 +51,8 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "ED_object.h" #include "ED_gpencil.h" +#include "ED_object.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index 90076b8d91b..bec080e398d 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -21,53 +21,53 @@ * \ingroup edgpencil */ -#include +#include #include +#include #include #include -#include #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" #include "BLI_math.h" -#include "BLI_utildefines.h" -#include "BLI_rand.h" #include "BLI_math_geom.h" +#include "BLI_rand.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" #include "PIL_time.h" +#include "DNA_brush_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_material_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_material_types.h" -#include "DNA_brush_types.h" #include "DNA_windowmanager_types.h" -#include "BKE_colortools.h" -#include "BKE_main.h" #include "BKE_brush.h" -#include "BKE_paint.h" +#include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_deform.h" #include "BKE_global.h" #include "BKE_gpencil.h" -#include "BKE_report.h" #include "BKE_layer.h" +#include "BKE_main.h" #include "BKE_material.h" +#include "BKE_paint.h" +#include "BKE_report.h" #include "BKE_screen.h" #include "BKE_tracking.h" #include "UI_view2d.h" -#include "ED_gpencil.h" -#include "ED_screen.h" -#include "ED_object.h" -#include "ED_view3d.h" #include "ED_clip.h" +#include "ED_gpencil.h" +#include "ED_object.h" +#include "ED_screen.h" +#include "ED_view3d.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c index f7bfc0bab8c..7470e7789af 100644 --- a/source/blender/editors/gpencil/gpencil_primitive.c +++ b/source/blender/editors/gpencil/gpencil_primitive.c @@ -22,18 +22,18 @@ * \ingroup edgpencil */ -#include -#include -#include -#include #include +#include +#include +#include +#include #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math.h" #include "BLI_rand.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -72,8 +72,8 @@ #include "ED_gpencil.h" #include "ED_object.h" #include "ED_screen.h" -#include "ED_view3d.h" #include "ED_space_api.h" +#include "ED_view3d.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/gpencil/gpencil_sculpt_paint.c b/source/blender/editors/gpencil/gpencil_sculpt_paint.c index 8c92d53b8e6..46867dcb11a 100644 --- a/source/blender/editors/gpencil/gpencil_sculpt_paint.c +++ b/source/blender/editors/gpencil/gpencil_sculpt_paint.c @@ -22,11 +22,11 @@ * \ingroup edgpencil */ -#include -#include -#include -#include #include +#include +#include +#include +#include #include "MEM_guardedalloc.h" @@ -40,13 +40,13 @@ #include "BLT_translation.h" +#include "DNA_gpencil_types.h" #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" #include "DNA_view3d_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_object_types.h" #include "BKE_brush.h" #include "BKE_colortools.h" diff --git a/source/blender/editors/gpencil/gpencil_select.c b/source/blender/editors/gpencil/gpencil_select.c index 133891cda13..4a84d75757e 100644 --- a/source/blender/editors/gpencil/gpencil_select.c +++ b/source/blender/editors/gpencil/gpencil_select.c @@ -21,25 +21,25 @@ * \ingroup edgpencil */ -#include -#include -#include -#include #include +#include +#include +#include +#include #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" #include "BLI_ghash.h" #include "BLI_lasso_2d.h" -#include "BLI_utildefines.h" #include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "DNA_gpencil_types.h" -#include "DNA_scene_types.h" -#include "DNA_space_types.h" -#include "DNA_screen_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" +#include "DNA_screen_types.h" +#include "DNA_space_types.h" #include "BKE_context.h" #include "BKE_gpencil.h" diff --git a/source/blender/editors/gpencil/gpencil_undo.c b/source/blender/editors/gpencil/gpencil_undo.c index f9403fd94b0..c2504ce329e 100644 --- a/source/blender/editors/gpencil/gpencil_undo.c +++ b/source/blender/editors/gpencil/gpencil_undo.c @@ -27,8 +27,8 @@ #include "MEM_guardedalloc.h" #include "DNA_gpencil_types.h" -#include "DNA_object_types.h" #include "DNA_listBase.h" +#include "DNA_object_types.h" #include "DNA_windowmanager_types.h" #include "BLI_listbase.h" diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c index 7fe6f374766..da6e5114822 100644 --- a/source/blender/editors/gpencil/gpencil_utils.c +++ b/source/blender/editors/gpencil/gpencil_utils.c @@ -20,24 +20,24 @@ * \ingroup edgpencil */ -#include -#include -#include -#include #include +#include +#include +#include +#include #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_ghash.h" +#include "BLI_math.h" +#include "BLI_rand.h" #include "BLI_utildefines.h" #include "BLT_translation.h" -#include "BLI_rand.h" -#include "DNA_meshdata_types.h" -#include "DNA_gpencil_types.h" #include "DNA_brush_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" @@ -45,21 +45,21 @@ #include "DNA_view3d_types.h" #include "BKE_action.h" -#include "BKE_colortools.h" -#include "BKE_collection.h" -#include "BKE_deform.h" -#include "BKE_main.h" #include "BKE_brush.h" +#include "BKE_collection.h" +#include "BKE_colortools.h" #include "BKE_context.h" +#include "BKE_deform.h" #include "BKE_gpencil.h" +#include "BKE_main.h" +#include "BKE_material.h" #include "BKE_object.h" #include "BKE_paint.h" -#include "BKE_material.h" #include "BKE_tracking.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "RNA_access.h" #include "RNA_define.h" @@ -68,12 +68,12 @@ #include "UI_resources.h" #include "UI_view2d.h" -#include "ED_gpencil.h" #include "ED_clip.h" -#include "ED_view3d.h" +#include "ED_gpencil.h" #include "ED_object.h" #include "ED_screen.h" #include "ED_select_utils.h" +#include "ED_view3d.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" diff --git a/source/blender/editors/gpencil/gpencil_uv.c b/source/blender/editors/gpencil/gpencil_uv.c index 8e9d46793a9..dac19e33235 100644 --- a/source/blender/editors/gpencil/gpencil_uv.c +++ b/source/blender/editors/gpencil/gpencil_uv.c @@ -23,8 +23,8 @@ #include "DNA_gpencil_types.h" #include "BLI_blenlib.h" -#include "BLI_string.h" #include "BLI_math.h" +#include "BLI_string.h" #include "BLT_translation.h" @@ -32,8 +32,8 @@ #include "BKE_gpencil.h" #include "BKE_unit.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/gpencil/gpencil_weight_paint.c b/source/blender/editors/gpencil/gpencil_weight_paint.c index 0dace9f004b..51d5df1f405 100644 --- a/source/blender/editors/gpencil/gpencil_weight_paint.c +++ b/source/blender/editors/gpencil/gpencil_weight_paint.c @@ -38,9 +38,9 @@ #include "BKE_deform.h" #include "BKE_gpencil.h" #include "BKE_main.h" -#include "DNA_meshdata_types.h" #include "BKE_object_deform.h" #include "BKE_report.h" +#include "DNA_meshdata_types.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index cad8b34557f..f532d7c1f14 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -54,8 +54,8 @@ struct wmOperator; struct wmOperatorType; struct wmWindowManager; -#include "DNA_object_enums.h" #include "BLI_compiler_attrs.h" +#include "DNA_object_enums.h" /* object_edit.c */ /* context.object */ diff --git a/source/blender/editors/include/ED_view3d_offscreen.h b/source/blender/editors/include/ED_view3d_offscreen.h index e1ed7472973..11d1aed1e73 100644 --- a/source/blender/editors/include/ED_view3d_offscreen.h +++ b/source/blender/editors/include/ED_view3d_offscreen.h @@ -24,8 +24,8 @@ #ifndef __ED_VIEW3D_OFFSCREEN_H__ #define __ED_VIEW3D_OFFSCREEN_H__ -#include "DNA_view3d_types.h" #include "DNA_object_enums.h" +#include "DNA_view3d_types.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 3d8c0da78ea..2a4ca48a005 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -21,12 +21,12 @@ * \ingroup edinterface */ +#include #include #include #include -#include -#include #include /* offsetof() */ +#include #include "MEM_guardedalloc.h" @@ -36,11 +36,11 @@ #include "DNA_userdef_types.h" #include "DNA_workspace_types.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" +#include "BLI_rect.h" #include "BLI_string.h" #include "BLI_string_utf8.h" -#include "BLI_rect.h" #include "BLI_utildefines.h" @@ -65,15 +65,15 @@ #include "IMB_imbuf.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "RNA_access.h" #include "BPY_extern.h" -#include "ED_screen.h" #include "ED_numinput.h" +#include "ED_screen.h" #include "IMB_colormanagement.h" diff --git a/source/blender/editors/interface/interface_context_menu.c b/source/blender/editors/interface/interface_context_menu.c index 7a300860583..76107d190ba 100644 --- a/source/blender/editors/interface/interface_context_menu.c +++ b/source/blender/editors/interface/interface_context_menu.c @@ -38,8 +38,8 @@ #include "BKE_idprop.h" #include "BKE_screen.h" -#include "ED_screen.h" #include "ED_keyframing.h" +#include "ED_screen.h" #include "UI_interface.h" diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c index 2800d808889..499d2f7f1fa 100644 --- a/source/blender/editors/interface/interface_draw.c +++ b/source/blender/editors/interface/interface_draw.c @@ -25,27 +25,27 @@ #include #include "DNA_color_types.h" -#include "DNA_screen_types.h" -#include "DNA_movieclip_types.h" #include "DNA_curveprofile_types.h" +#include "DNA_movieclip_types.h" +#include "DNA_screen_types.h" #include "BLI_math.h" +#include "BLI_polyfill_2d.h" #include "BLI_rect.h" #include "BLI_string.h" #include "BLI_utildefines.h" -#include "BLI_polyfill_2d.h" #include "MEM_guardedalloc.h" #include "BKE_colorband.h" #include "BKE_colortools.h" +#include "BKE_curveprofile.h" #include "BKE_node.h" #include "BKE_tracking.h" -#include "BKE_curveprofile.h" +#include "IMB_colormanagement.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "IMB_colormanagement.h" #include "BIF_glutil.h" diff --git a/source/blender/editors/interface/interface_eyedropper.c b/source/blender/editors/interface/interface_eyedropper.c index cb7868d2988..f69dbb94f19 100644 --- a/source/blender/editors/interface/interface_eyedropper.c +++ b/source/blender/editors/interface/interface_eyedropper.c @@ -21,8 +21,8 @@ * \ingroup edinterface */ -#include "DNA_space_types.h" #include "DNA_screen_types.h" +#include "DNA_space_types.h" #include "BLI_blenlib.h" diff --git a/source/blender/editors/interface/interface_eyedropper_color.c b/source/blender/editors/interface/interface_eyedropper_color.c index 0dabe453ce4..372fd841bc1 100644 --- a/source/blender/editors/interface/interface_eyedropper_color.c +++ b/source/blender/editors/interface/interface_eyedropper_color.c @@ -28,8 +28,8 @@ #include "MEM_guardedalloc.h" -#include "DNA_space_types.h" #include "DNA_screen_types.h" +#include "DNA_space_types.h" #include "BLI_math_vector.h" @@ -52,9 +52,9 @@ #include "interface_intern.h" +#include "ED_clip.h" #include "ED_image.h" #include "ED_node.h" -#include "ED_clip.h" #include "interface_eyedropper_intern.h" diff --git a/source/blender/editors/interface/interface_eyedropper_colorband.c b/source/blender/editors/interface/interface_eyedropper_colorband.c index 479cf9ccffe..be23eacafff 100644 --- a/source/blender/editors/interface/interface_eyedropper_colorband.c +++ b/source/blender/editors/interface/interface_eyedropper_colorband.c @@ -38,8 +38,8 @@ #include "BLI_bitmap_draw_2d.h" #include "BLI_math_vector.h" -#include "BKE_context.h" #include "BKE_colorband.h" +#include "BKE_context.h" #include "RNA_access.h" diff --git a/source/blender/editors/interface/interface_eyedropper_datablock.c b/source/blender/editors/interface/interface_eyedropper_datablock.c index 5cf1a21d09c..46164ebac69 100644 --- a/source/blender/editors/interface/interface_eyedropper_datablock.c +++ b/source/blender/editors/interface/interface_eyedropper_datablock.c @@ -28,18 +28,18 @@ #include "MEM_guardedalloc.h" -#include "DNA_space_types.h" -#include "DNA_screen_types.h" #include "DNA_object_types.h" +#include "DNA_screen_types.h" +#include "DNA_space_types.h" #include "BLI_string.h" #include "BLT_translation.h" #include "BKE_context.h" -#include "BKE_screen.h" -#include "BKE_report.h" #include "BKE_idcode.h" +#include "BKE_report.h" +#include "BKE_screen.h" #include "RNA_access.h" @@ -48,13 +48,13 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_space_api.h" -#include "ED_screen.h" -#include "ED_view3d.h" #include "ED_outliner.h" +#include "ED_screen.h" +#include "ED_space_api.h" +#include "ED_view3d.h" -#include "interface_intern.h" #include "interface_eyedropper_intern.h" +#include "interface_intern.h" /** * \note #DataDropper is only internal name to avoid confusion with other kinds of eye-droppers. diff --git a/source/blender/editors/interface/interface_eyedropper_depth.c b/source/blender/editors/interface/interface_eyedropper_depth.c index 15a9d2d9f50..a5e60adec55 100644 --- a/source/blender/editors/interface/interface_eyedropper_depth.c +++ b/source/blender/editors/interface/interface_eyedropper_depth.c @@ -28,14 +28,14 @@ #include "MEM_guardedalloc.h" -#include "DNA_space_types.h" -#include "DNA_screen_types.h" -#include "DNA_object_types.h" #include "DNA_camera_types.h" +#include "DNA_object_types.h" +#include "DNA_screen_types.h" +#include "DNA_space_types.h" #include "DNA_view3d_types.h" -#include "BLI_string.h" #include "BLI_math_vector.h" +#include "BLI_string.h" #include "BKE_context.h" #include "BKE_screen.h" @@ -54,8 +54,8 @@ #include "ED_space_api.h" #include "ED_view3d.h" -#include "interface_intern.h" #include "interface_eyedropper_intern.h" +#include "interface_intern.h" /** * \note #DepthDropper is only internal name to avoid confusion with other kinds of eye-droppers. diff --git a/source/blender/editors/interface/interface_eyedropper_driver.c b/source/blender/editors/interface/interface_eyedropper_driver.c index cc13367c190..89c087855bc 100644 --- a/source/blender/editors/interface/interface_eyedropper_driver.c +++ b/source/blender/editors/interface/interface_eyedropper_driver.c @@ -29,11 +29,11 @@ #include "MEM_guardedalloc.h" #include "DNA_anim_types.h" -#include "DNA_screen_types.h" #include "DNA_object_types.h" +#include "DNA_screen_types.h" -#include "BKE_context.h" #include "BKE_animsys.h" +#include "BKE_context.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" @@ -48,8 +48,8 @@ #include "ED_keyframing.h" -#include "interface_intern.h" #include "interface_eyedropper_intern.h" +#include "interface_intern.h" typedef struct DriverDropper { /* Destination property (i.e. where we'll add a driver) */ diff --git a/source/blender/editors/interface/interface_eyedropper_gpencil_color.c b/source/blender/editors/interface/interface_eyedropper_gpencil_color.c index f9f5c745e94..2944186c701 100644 --- a/source/blender/editors/interface/interface_eyedropper_gpencil_color.c +++ b/source/blender/editors/interface/interface_eyedropper_gpencil_color.c @@ -59,8 +59,8 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "interface_intern.h" #include "interface_eyedropper_intern.h" +#include "interface_intern.h" typedef struct EyedropperGPencil { struct ColorManagedDisplay *display; diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 27549ed60b5..238223fddfd 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -21,13 +21,13 @@ * \ingroup edinterface */ +#include +#include #include #include #include #include #include -#include -#include #include "MEM_guardedalloc.h" @@ -36,29 +36,29 @@ #include "DNA_scene_types.h" #include "DNA_screen_types.h" -#include "BLI_math.h" -#include "BLI_listbase.h" #include "BLI_linklist.h" -#include "BLI_string.h" -#include "BLI_string_utf8.h" -#include "BLI_string_cursor_utf8.h" +#include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_rect.h" +#include "BLI_string.h" +#include "BLI_string_cursor_utf8.h" +#include "BLI_string_utf8.h" #include "BLI_utildefines.h" #include "PIL_time.h" -#include "BKE_colorband.h" #include "BKE_blender_undo.h" #include "BKE_brush.h" +#include "BKE_colorband.h" #include "BKE_colortools.h" #include "BKE_context.h" +#include "BKE_curveprofile.h" +#include "BKE_movieclip.h" +#include "BKE_paint.h" #include "BKE_report.h" #include "BKE_screen.h" #include "BKE_tracking.h" #include "BKE_unit.h" -#include "BKE_paint.h" -#include "BKE_curveprofile.h" -#include "BKE_movieclip.h" #include "IMB_colormanagement.h" @@ -79,9 +79,9 @@ #include "wm_event_system.h" #ifdef WITH_INPUT_IME -# include "wm_window.h" -# include "BLT_translation.h" # include "BLT_lang.h" +# include "BLT_translation.h" +# include "wm_window.h" #endif /* place the mouse at the scaled down location when un-grabbing */ diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 1984372f398..edc5087c8dd 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -27,16 +27,16 @@ #include "MEM_guardedalloc.h" -#include "GPU_matrix.h" #include "GPU_batch.h" #include "GPU_immediate.h" +#include "GPU_matrix.h" #include "GPU_state.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_fileops_types.h" -#include "BLI_math_vector.h" #include "BLI_math_color_blend.h" +#include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "DNA_brush_types.h" #include "DNA_curve_types.h" @@ -50,11 +50,11 @@ #include "RNA_access.h" #include "RNA_enum_types.h" +#include "BKE_appdir.h" #include "BKE_context.h" #include "BKE_global.h" -#include "BKE_paint.h" #include "BKE_icons.h" -#include "BKE_appdir.h" +#include "BKE_paint.h" #include "BKE_studiolight.h" #include "IMB_imbuf.h" diff --git a/source/blender/editors/interface/interface_icons_event.c b/source/blender/editors/interface/interface_icons_event.c index 9398d1c0cd4..fed29571185 100644 --- a/source/blender/editors/interface/interface_icons_event.c +++ b/source/blender/editors/interface/interface_icons_event.c @@ -34,8 +34,8 @@ #include "GPU_state.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "DNA_brush_types.h" #include "DNA_curve_types.h" @@ -48,8 +48,8 @@ #include "RNA_access.h" #include "RNA_enum_types.h" -#include "BKE_icons.h" #include "BKE_appdir.h" +#include "BKE_icons.h" #include "BKE_studiolight.h" #include "IMB_imbuf.h" diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 64ff9d02cdc..79b3c1a0a83 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -18,32 +18,32 @@ * \ingroup edinterface */ +#include #include #include #include #include -#include #include "MEM_guardedalloc.h" -#include "DNA_screen_types.h" #include "DNA_armature_types.h" +#include "DNA_screen_types.h" #include "DNA_userdef_types.h" #include "BLI_alloca.h" #include "BLI_listbase.h" -#include "BLI_string.h" -#include "BLI_rect.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_rect.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" +#include "BKE_animsys.h" #include "BKE_context.h" #include "BKE_global.h" #include "BKE_idprop.h" #include "BKE_screen.h" -#include "BKE_animsys.h" #include "RNA_access.h" diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c index dce584b4ae5..7533ebd4397 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -26,9 +26,9 @@ #include "MEM_guardedalloc.h" #include "DNA_armature_types.h" +#include "DNA_object_types.h" /* for OB_DATA_SUPPORT_ID */ #include "DNA_screen_types.h" #include "DNA_text_types.h" -#include "DNA_object_types.h" /* for OB_DATA_SUPPORT_ID */ #include "BLI_blenlib.h" #include "BLI_math_color.h" @@ -69,9 +69,9 @@ #include "ED_keyframing.h" /* only for UI_OT_editsource */ -#include "ED_screen.h" #include "BKE_main.h" #include "BLI_ghash.h" +#include "ED_screen.h" /* -------------------------------------------------------------------- */ /** \name Copy Data Path Operator diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c index 6e56dd96cb0..d57b4d444bd 100644 --- a/source/blender/editors/interface/interface_panel.c +++ b/source/blender/editors/interface/interface_panel.c @@ -24,10 +24,10 @@ /* a full doc with API notes can be found in * bf-blender/trunk/blender/doc/guides/interface_API.txt */ +#include #include #include #include -#include #include "MEM_guardedalloc.h" @@ -51,10 +51,10 @@ #include "ED_screen.h" -#include "UI_view2d.h" #include "UI_interface.h" #include "UI_interface_icons.h" #include "UI_resources.h" +#include "UI_view2d.h" #include "GPU_immediate.h" #include "GPU_state.h" diff --git a/source/blender/editors/interface/interface_query.c b/source/blender/editors/interface/interface_query.c index 52488027662..de68b192f67 100644 --- a/source/blender/editors/interface/interface_query.c +++ b/source/blender/editors/interface/interface_query.c @@ -20,9 +20,9 @@ * Utilities to inspect the interface, extract information. */ -#include "BLI_utildefines.h" #include "BLI_math.h" #include "BLI_rect.h" +#include "BLI_utildefines.h" #include "DNA_screen_types.h" diff --git a/source/blender/editors/interface/interface_region_color_picker.c b/source/blender/editors/interface/interface_region_color_picker.c index 917c35f0135..ecdcd575d5c 100644 --- a/source/blender/editors/interface/interface_region_color_picker.c +++ b/source/blender/editors/interface/interface_region_color_picker.c @@ -23,19 +23,19 @@ * Color Picker Region & Color Utils */ +#include #include #include #include -#include #include "MEM_guardedalloc.h" #include "DNA_userdef_types.h" -#include "BLI_utildefines.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/editors/interface/interface_region_hud.c b/source/blender/editors/interface/interface_region_hud.c index 04e6c5c24c2..f77739b5114 100644 --- a/source/blender/editors/interface/interface_region_hud.c +++ b/source/blender/editors/interface/interface_region_hud.c @@ -30,9 +30,9 @@ #include "DNA_screen_types.h" #include "DNA_userdef_types.h" -#include "BLI_string.h" -#include "BLI_rect.h" #include "BLI_listbase.h" +#include "BLI_rect.h" +#include "BLI_string.h" #include "BLI_utildefines.h" #include "BKE_context.h" @@ -51,8 +51,8 @@ #include "ED_screen.h" #include "ED_undo.h" -#include "interface_intern.h" #include "GPU_framebuffer.h" +#include "interface_intern.h" /* -------------------------------------------------------------------- */ /** \name Utilities diff --git a/source/blender/editors/interface/interface_region_menu_pie.c b/source/blender/editors/interface/interface_region_menu_pie.c index 062a8383061..1371c7524ae 100644 --- a/source/blender/editors/interface/interface_region_menu_pie.c +++ b/source/blender/editors/interface/interface_region_menu_pie.c @@ -23,10 +23,10 @@ * Pie Menu Region */ +#include #include #include #include -#include #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/interface/interface_region_menu_popup.c b/source/blender/editors/interface/interface_region_menu_popup.c index 9ceb864b278..b3c10e8d6b8 100644 --- a/source/blender/editors/interface/interface_region_menu_popup.c +++ b/source/blender/editors/interface/interface_region_menu_popup.c @@ -23,26 +23,26 @@ * PopUp Menu Region */ +#include #include #include #include -#include #include "MEM_guardedalloc.h" #include "DNA_userdef_types.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" -#include "BLI_string.h" -#include "BLI_rect.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_rect.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" #include "BKE_context.h" -#include "BKE_screen.h" #include "BKE_report.h" +#include "BKE_screen.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/interface/interface_region_popover.c b/source/blender/editors/interface/interface_region_popover.c index d3cd1ebd837..b889f1d6d01 100644 --- a/source/blender/editors/interface/interface_region_popover.c +++ b/source/blender/editors/interface/interface_region_popover.c @@ -46,13 +46,13 @@ #include "BLI_listbase.h" +#include "BLI_math_vector.h" #include "BLI_rect.h" #include "BLI_utildefines.h" -#include "BLI_math_vector.h" #include "BKE_context.h" -#include "BKE_screen.h" #include "BKE_report.h" +#include "BKE_screen.h" #include "ED_screen.h" diff --git a/source/blender/editors/interface/interface_region_popup.c b/source/blender/editors/interface/interface_region_popup.c index 8db70d9a1cc..ba9a5026ce3 100644 --- a/source/blender/editors/interface/interface_region_popup.c +++ b/source/blender/editors/interface/interface_region_popup.c @@ -23,17 +23,17 @@ * PopUp Region (Generic) */ +#include #include #include #include -#include #include "MEM_guardedalloc.h" #include "DNA_userdef_types.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_rect.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/interface/interface_region_search.c b/source/blender/editors/interface/interface_region_search.c index b10d5be5136..dab42e47e0b 100644 --- a/source/blender/editors/interface/interface_region_search.c +++ b/source/blender/editors/interface/interface_region_search.c @@ -23,10 +23,10 @@ * Search Box Region & Interaction */ +#include #include #include #include -#include #include "MEM_guardedalloc.h" @@ -34,8 +34,8 @@ #include "BLI_math.h" -#include "BLI_string.h" #include "BLI_rect.h" +#include "BLI_string.h" #include "BLI_utildefines.h" #include "BKE_context.h" @@ -54,9 +54,9 @@ #include "ED_screen.h" +#include "GPU_state.h" #include "interface_intern.h" #include "interface_regions_intern.h" -#include "GPU_state.h" #define MENU_BORDER (int)(0.3f * U.widget_unit) diff --git a/source/blender/editors/interface/interface_region_tooltip.c b/source/blender/editors/interface/interface_region_tooltip.c index 02c69e5cef6..cf8ff51eccf 100644 --- a/source/blender/editors/interface/interface_region_tooltip.c +++ b/source/blender/editors/interface/interface_region_tooltip.c @@ -32,19 +32,19 @@ * For now it's not a priority, so leave as-is. */ +#include #include #include #include -#include #include "MEM_guardedalloc.h" -#include "DNA_userdef_types.h" #include "DNA_brush_types.h" +#include "DNA_userdef_types.h" #include "BLI_math.h" -#include "BLI_string.h" #include "BLI_rect.h" +#include "BLI_string.h" #include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index 6150cc43554..2275f3fecdf 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -25,9 +25,9 @@ * \note Most logic is now in 'interface_region_*.c' */ +#include "BLI_listbase.h" #include "BLI_utildefines.h" #include "MEM_guardedalloc.h" -#include "BLI_listbase.h" #include "BKE_context.h" #include "BKE_screen.h" diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index cb55c639d91..a1a4c15bdf6 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -19,34 +19,34 @@ */ #include -#include #include +#include #include #include "MEM_guardedalloc.h" +#include "DNA_brush_types.h" #include "DNA_cachefile_types.h" #include "DNA_constraint_types.h" -#include "DNA_node_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_object_force_types.h" -#include "DNA_brush_types.h" -#include "DNA_texture_types.h" -#include "DNA_gpencil_modifier_types.h" -#include "DNA_shader_fx_types.h" #include "DNA_curveprofile_types.h" +#include "DNA_gpencil_modifier_types.h" +#include "DNA_node_types.h" +#include "DNA_object_force_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" +#include "DNA_shader_fx_types.h" +#include "DNA_texture_types.h" -#include "BLI_utildefines.h" #include "BLI_alloca.h" -#include "BLI_string.h" -#include "BLI_ghash.h" -#include "BLI_rect.h" -#include "BLI_math.h" -#include "BLI_listbase.h" #include "BLI_fnmatch.h" +#include "BLI_ghash.h" +#include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_path_util.h" +#include "BLI_rect.h" +#include "BLI_string.h" #include "BLI_timecode.h" +#include "BLI_utildefines.h" #include "BLF_api.h" #include "BLT_translation.h" @@ -56,6 +56,7 @@ #include "BKE_colortools.h" #include "BKE_constraint.h" #include "BKE_context.h" +#include "BKE_curveprofile.h" #include "BKE_global.h" #include "BKE_gpencil_modifier.h" #include "BKE_idcode.h" @@ -70,7 +71,6 @@ #include "BKE_packedFile.h" #include "BKE_paint.h" #include "BKE_particle.h" -#include "BKE_curveprofile.h" #include "BKE_report.h" #include "BKE_scene.h" #include "BKE_screen.h" @@ -80,9 +80,9 @@ #include "DEG_depsgraph_build.h" #include "ED_fileselect.h" -#include "ED_screen.h" #include "ED_object.h" #include "ED_render.h" +#include "ED_screen.h" #include "ED_undo.h" #include "RNA_access.h" diff --git a/source/blender/editors/interface/interface_utils.c b/source/blender/editors/interface/interface_utils.c index 034bd906add..efa7ffb22d0 100644 --- a/source/blender/editors/interface/interface_utils.c +++ b/source/blender/editors/interface/interface_utils.c @@ -21,18 +21,18 @@ * \ingroup edinterface */ +#include #include #include #include -#include #include "DNA_object_types.h" #include "DNA_screen_types.h" -#include "BLI_utildefines.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_string.h" -#include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index b61d54e6cff..7e6ef11518a 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -21,10 +21,10 @@ * \ingroup edinterface */ +#include #include #include #include -#include #include "DNA_brush_types.h" #include "DNA_screen_types.h" diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index fe3f6ccd7ff..63cf2f19737 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -32,8 +32,8 @@ #include "DNA_userdef_types.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_addon.h" #include "BKE_appdir.h" @@ -49,8 +49,8 @@ #include "UI_interface.h" #include "UI_interface_icons.h" -#include "interface_intern.h" #include "GPU_framebuffer.h" +#include "interface_intern.h" /* global for themes */ typedef void (*VectorDrawFunc)(int x, int y, int w, int h, float alpha); diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index ad2e32149d8..a93c80f02d2 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -32,17 +32,17 @@ #include "DNA_userdef_types.h" #include "BLI_array.h" -#include "BLI_utildefines.h" #include "BLI_link_utils.h" -#include "BLI_rect.h" #include "BLI_math.h" #include "BLI_memarena.h" -#include "BLI_timecode.h" +#include "BLI_rect.h" #include "BLI_string.h" +#include "BLI_timecode.h" +#include "BLI_utildefines.h" #include "BKE_context.h" -#include "BKE_screen.h" #include "BKE_global.h" +#include "BKE_screen.h" #include "GPU_immediate.h" #include "GPU_matrix.h" diff --git a/source/blender/editors/interface/view2d_draw.c b/source/blender/editors/interface/view2d_draw.c index b95dbe0b59d..17a95ba3fff 100644 --- a/source/blender/editors/interface/view2d_draw.c +++ b/source/blender/editors/interface/view2d_draw.c @@ -32,11 +32,11 @@ #include "DNA_userdef_types.h" #include "BLI_array.h" -#include "BLI_utildefines.h" -#include "BLI_rect.h" #include "BLI_math.h" -#include "BLI_timecode.h" +#include "BLI_rect.h" #include "BLI_string.h" +#include "BLI_timecode.h" +#include "BLI_utildefines.h" #include "GPU_immediate.h" #include "GPU_matrix.h" diff --git a/source/blender/editors/interface/view2d_gizmo_navigate.c b/source/blender/editors/interface/view2d_gizmo_navigate.c index fd309045899..8d3f1beb947 100644 --- a/source/blender/editors/interface/view2d_gizmo_navigate.c +++ b/source/blender/editors/interface/view2d_gizmo_navigate.c @@ -23,8 +23,8 @@ #include "BKE_context.h" -#include "ED_screen.h" #include "ED_gizmo_library.h" +#include "ED_screen.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index 8116029af59..17af0cff23a 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -29,9 +29,9 @@ #include "DNA_windowmanager_types.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math_base.h" #include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "BKE_context.h" @@ -43,8 +43,8 @@ #include "ED_screen.h" -#include "UI_view2d.h" #include "UI_interface.h" +#include "UI_view2d.h" #include "PIL_time.h" /* USER_ZOOM_CONT */ diff --git a/source/blender/editors/io/io_alembic.c b/source/blender/editors/io/io_alembic.c index 9f9e523b57b..af17303466b 100644 --- a/source/blender/editors/io/io_alembic.c +++ b/source/blender/editors/io/io_alembic.c @@ -30,8 +30,8 @@ # include "BLI_winstuff.h" # endif -# include # include +# include # include "MEM_guardedalloc.h" diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c index 15fee4db73f..9091e7d8afc 100644 --- a/source/blender/editors/io/io_collada.c +++ b/source/blender/editors/io/io_collada.c @@ -36,8 +36,8 @@ # include "DEG_depsgraph.h" -# include "ED_screen.h" # include "ED_object.h" +# include "ED_screen.h" # include "RNA_access.h" # include "RNA_define.h" diff --git a/source/blender/editors/lattice/editlattice_select.c b/source/blender/editors/lattice/editlattice_select.c index 837c5b1c6bd..8751a289b9c 100644 --- a/source/blender/editors/lattice/editlattice_select.c +++ b/source/blender/editors/lattice/editlattice_select.c @@ -25,11 +25,11 @@ #include "MEM_guardedalloc.h" +#include "BLI_bitmap.h" #include "BLI_listbase.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_rand.h" -#include "BLI_bitmap.h" +#include "BLI_utildefines.h" #include "DNA_curve_types.h" #include "DNA_lattice_types.h" @@ -43,13 +43,13 @@ #include "BKE_context.h" #include "BKE_lattice.h" -#include "BKE_report.h" #include "BKE_layer.h" +#include "BKE_report.h" +#include "ED_lattice.h" #include "ED_object.h" #include "ED_screen.h" #include "ED_select_utils.h" -#include "ED_lattice.h" #include "ED_view3d.h" #include "WM_api.h" diff --git a/source/blender/editors/lattice/editlattice_undo.c b/source/blender/editors/lattice/editlattice_undo.c index f90b70c492f..cfc9d162c37 100644 --- a/source/blender/editors/lattice/editlattice_undo.c +++ b/source/blender/editors/lattice/editlattice_undo.c @@ -21,16 +21,16 @@ * \ingroup edlattice */ +#include #include #include -#include #include "MEM_guardedalloc.h" #include "CLG_log.h" -#include "BLI_utildefines.h" #include "BLI_array_utils.h" +#include "BLI_utildefines.h" #include "DNA_curve_types.h" #include "DNA_lattice_types.h" @@ -44,13 +44,13 @@ #include "DEG_depsgraph.h" -#include "ED_object.h" #include "ED_lattice.h" +#include "ED_object.h" #include "ED_undo.h" #include "ED_util.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "lattice_intern.h" diff --git a/source/blender/editors/lattice/lattice_ops.c b/source/blender/editors/lattice/lattice_ops.c index a665d138163..d5505c00132 100644 --- a/source/blender/editors/lattice/lattice_ops.c +++ b/source/blender/editors/lattice/lattice_ops.c @@ -28,10 +28,10 @@ #include "WM_api.h" #include "WM_types.h" +#include "ED_lattice.h" +#include "ED_object.h" #include "ED_screen.h" #include "ED_select_utils.h" -#include "ED_object.h" -#include "ED_lattice.h" #include "lattice_intern.h" diff --git a/source/blender/editors/mask/mask_add.c b/source/blender/editors/mask/mask_add.c index 6299d6761e0..80716195121 100644 --- a/source/blender/editors/mask/mask_add.c +++ b/source/blender/editors/mask/mask_add.c @@ -31,16 +31,16 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" +#include "DNA_mask_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" -#include "DNA_mask_types.h" #include "WM_api.h" #include "WM_types.h" -#include "ED_select_utils.h" #include "ED_mask.h" /* own include */ #include "ED_screen.h" +#include "ED_select_utils.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/mask/mask_draw.c b/source/blender/editors/mask/mask_draw.c index 3f3bf8b7510..a532ff9e1f0 100644 --- a/source/blender/editors/mask/mask_draw.c +++ b/source/blender/editors/mask/mask_draw.c @@ -23,17 +23,17 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_rect.h" -#include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_mask.h" #include "DNA_mask_types.h" -#include "DNA_screen_types.h" #include "DNA_object_types.h" /* SELECT */ +#include "DNA_screen_types.h" #include "DNA_space_types.h" #include "ED_clip.h" @@ -44,8 +44,8 @@ #include "BIF_glutil.h" #include "GPU_immediate.h" -#include "GPU_shader.h" #include "GPU_matrix.h" +#include "GPU_shader.h" #include "GPU_state.h" #include "UI_interface.h" diff --git a/source/blender/editors/mask/mask_edit.c b/source/blender/editors/mask/mask_edit.c index 88cc5e33617..1606d079462 100644 --- a/source/blender/editors/mask/mask_edit.c +++ b/source/blender/editors/mask/mask_edit.c @@ -32,12 +32,12 @@ #include "WM_api.h" #include "WM_types.h" +#include "ED_clip.h" +#include "ED_image.h" +#include "ED_mask.h" /* own include */ +#include "ED_object.h" /* ED_keymap_proportional_maskmode only */ #include "ED_screen.h" #include "ED_select_utils.h" -#include "ED_mask.h" /* own include */ -#include "ED_image.h" -#include "ED_object.h" /* ED_keymap_proportional_maskmode only */ -#include "ED_clip.h" #include "ED_sequencer.h" #include "ED_transform.h" diff --git a/source/blender/editors/mask/mask_editaction.c b/source/blender/editors/mask/mask_editaction.c index 33f4bab14ec..31fc403b157 100644 --- a/source/blender/editors/mask/mask_editaction.c +++ b/source/blender/editors/mask/mask_editaction.c @@ -21,11 +21,11 @@ * \ingroup edmask */ -#include -#include -#include -#include #include +#include +#include +#include +#include #include "MEM_guardedalloc.h" @@ -40,8 +40,8 @@ #include "ED_anim_api.h" #include "ED_keyframes_edit.h" -#include "ED_mask.h" /* own include */ #include "ED_markers.h" +#include "ED_mask.h" /* own include */ /* ***************************************** */ /* NOTE ABOUT THIS FILE: diff --git a/source/blender/editors/mask/mask_ops.c b/source/blender/editors/mask/mask_ops.c index 4d3283e608b..5e7d94dd567 100644 --- a/source/blender/editors/mask/mask_ops.c +++ b/source/blender/editors/mask/mask_ops.c @@ -33,9 +33,9 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "DNA_scene_types.h" #include "DNA_mask_types.h" #include "DNA_object_types.h" /* SELECT */ +#include "DNA_scene_types.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/mask/mask_relationships.c b/source/blender/editors/mask/mask_relationships.c index 130ebb61a90..49eb4fbd4ca 100644 --- a/source/blender/editors/mask/mask_relationships.c +++ b/source/blender/editors/mask/mask_relationships.c @@ -35,8 +35,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_screen.h" #include "ED_clip.h" /* frame remapping functions */ +#include "ED_screen.h" #include "mask_intern.h" /* own include */ diff --git a/source/blender/editors/mask/mask_select.c b/source/blender/editors/mask/mask_select.c index 15b3ab047ee..53ef398ccd6 100644 --- a/source/blender/editors/mask/mask_select.c +++ b/source/blender/editors/mask/mask_select.c @@ -23,10 +23,10 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_rect.h" #include "BLI_lasso_2d.h" #include "BLI_math.h" +#include "BLI_rect.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_mask.h" @@ -37,9 +37,9 @@ #include "WM_types.h" #include "ED_clip.h" +#include "ED_mask.h" /* own include */ #include "ED_screen.h" #include "ED_select_utils.h" -#include "ED_mask.h" /* own include */ #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/mask/mask_shapekey.c b/source/blender/editors/mask/mask_shapekey.c index 2300289fd3b..25b602d63c3 100644 --- a/source/blender/editors/mask/mask_shapekey.c +++ b/source/blender/editors/mask/mask_shapekey.c @@ -23,15 +23,15 @@ #include -#include "BLI_utildefines.h" #include "BLI_listbase.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_mask.h" -#include "DNA_object_types.h" #include "DNA_mask_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c index 5f948595a22..987447c3663 100644 --- a/source/blender/editors/mesh/editface.c +++ b/source/blender/editors/mesh/editface.c @@ -20,15 +20,15 @@ #include "MEM_guardedalloc.h" +#include "BLI_bitmap.h" #include "BLI_blenlib.h" #include "BLI_math.h" -#include "BLI_bitmap.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" -#include "DNA_meshdata_types.h" #include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "BKE_context.h" diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c index 7a0124e72bb..1484dcfa92d 100644 --- a/source/blender/editors/mesh/editmesh_add.c +++ b/source/blender/editors/mesh/editmesh_add.c @@ -33,15 +33,15 @@ #include "BKE_context.h" #include "BKE_editmesh.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" #include "ED_mesh.h" -#include "ED_screen.h" #include "ED_object.h" +#include "ED_screen.h" #include "ED_uvedit.h" #include "mesh_intern.h" /* own include */ diff --git a/source/blender/editors/mesh/editmesh_bevel.c b/source/blender/editors/mesh/editmesh_bevel.c index 123672a977b..10c290e2be9 100644 --- a/source/blender/editors/mesh/editmesh_bevel.c +++ b/source/blender/editors/mesh/editmesh_bevel.c @@ -22,24 +22,24 @@ #include "DNA_object_types.h" -#include "BLI_string.h" #include "BLI_math.h" +#include "BLI_string.h" #include "BLT_translation.h" #include "BKE_context.h" -#include "BKE_global.h" +#include "BKE_curveprofile.h" #include "BKE_editmesh.h" -#include "BKE_unit.h" +#include "BKE_global.h" #include "BKE_layer.h" #include "BKE_mesh.h" -#include "BKE_curveprofile.h" +#include "BKE_unit.h" -#include "DNA_mesh_types.h" #include "DNA_curveprofile_types.h" +#include "DNA_mesh_types.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/mesh/editmesh_bisect.c b/source/blender/editors/mesh/editmesh_bisect.c index e0a4195a668..bc8c456889d 100644 --- a/source/blender/editors/mesh/editmesh_bisect.c +++ b/source/blender/editors/mesh/editmesh_bisect.c @@ -29,22 +29,22 @@ #include "BLT_translation.h" -#include "BKE_global.h" #include "BKE_context.h" #include "BKE_editmesh.h" +#include "BKE_global.h" #include "BKE_layer.h" #include "BKE_report.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" +#include "ED_gizmo_utils.h" #include "ED_mesh.h" #include "ED_screen.h" #include "ED_view3d.h" -#include "ED_gizmo_utils.h" #include "UI_resources.h" diff --git a/source/blender/editors/mesh/editmesh_extrude.c b/source/blender/editors/mesh/editmesh_extrude.c index 3e79b7f1b9d..1ea1501fc66 100644 --- a/source/blender/editors/mesh/editmesh_extrude.c +++ b/source/blender/editors/mesh/editmesh_extrude.c @@ -24,19 +24,19 @@ #include "DNA_modifier_types.h" #include "DNA_object_types.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" -#include "BKE_layer.h" #include "BKE_context.h" -#include "BKE_report.h" #include "BKE_editmesh.h" +#include "BKE_layer.h" +#include "BKE_report.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "ED_mesh.h" #include "ED_screen.h" diff --git a/source/blender/editors/mesh/editmesh_extrude_screw.c b/source/blender/editors/mesh/editmesh_extrude_screw.c index ef393acdb4e..4cffd12cb34 100644 --- a/source/blender/editors/mesh/editmesh_extrude_screw.c +++ b/source/blender/editors/mesh/editmesh_extrude_screw.c @@ -32,8 +32,8 @@ #include "BKE_layer.h" #include "BKE_report.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "WM_types.h" diff --git a/source/blender/editors/mesh/editmesh_extrude_spin.c b/source/blender/editors/mesh/editmesh_extrude_spin.c index 69274f77049..9f1d499bb6a 100644 --- a/source/blender/editors/mesh/editmesh_extrude_spin.c +++ b/source/blender/editors/mesh/editmesh_extrude_spin.c @@ -26,12 +26,12 @@ #include "BLI_math.h" #include "BKE_context.h" -#include "BKE_report.h" #include "BKE_editmesh.h" #include "BKE_layer.h" +#include "BKE_report.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "RNA_enum_types.h" #include "WM_api.h" diff --git a/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c b/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c index 979c59632e1..75a36b68f8b 100644 --- a/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c +++ b/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c @@ -23,14 +23,14 @@ #include "BKE_context.h" #include "BKE_scene.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "RNA_enum_types.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "ED_gizmo_utils.h" #include "ED_screen.h" diff --git a/source/blender/editors/mesh/editmesh_inset.c b/source/blender/editors/mesh/editmesh_inset.c index ea1942dee5f..f2983f06da6 100644 --- a/source/blender/editors/mesh/editmesh_inset.c +++ b/source/blender/editors/mesh/editmesh_inset.c @@ -22,19 +22,19 @@ #include "DNA_object_types.h" -#include "BLI_string.h" #include "BLI_math.h" +#include "BLI_string.h" #include "BLT_translation.h" #include "BKE_context.h" -#include "BKE_global.h" #include "BKE_editmesh.h" -#include "BKE_unit.h" +#include "BKE_global.h" #include "BKE_layer.h" +#include "BKE_unit.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/mesh/editmesh_intersect.c b/source/blender/editors/mesh/editmesh_intersect.c index 847a8ecacc3..7718a07a55e 100644 --- a/source/blender/editors/mesh/editmesh_intersect.c +++ b/source/blender/editors/mesh/editmesh_intersect.c @@ -22,17 +22,17 @@ #include "DNA_object_types.h" +#include "BLI_buffer.h" +#include "BLI_linklist_stack.h" #include "BLI_math.h" #include "BLI_memarena.h" #include "BLI_stack.h" -#include "BLI_buffer.h" -#include "BLI_linklist_stack.h" -#include "BKE_layer.h" -#include "BKE_editmesh_bvh.h" #include "BKE_context.h" -#include "BKE_report.h" #include "BKE_editmesh.h" +#include "BKE_editmesh_bvh.h" +#include "BKE_layer.h" +#include "BKE_report.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index b951c06ba8c..6230eacba94 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -29,14 +29,14 @@ #include "MEM_guardedalloc.h" -#include "BLI_listbase.h" -#include "BLI_string.h" -#include "BLI_array.h" #include "BLI_alloca.h" +#include "BLI_array.h" #include "BLI_linklist.h" +#include "BLI_listbase.h" #include "BLI_math.h" -#include "BLI_smallhash.h" #include "BLI_memarena.h" +#include "BLI_smallhash.h" +#include "BLI_string.h" #include "BLT_translation.h" @@ -50,10 +50,10 @@ #include "GPU_matrix.h" #include "GPU_state.h" +#include "ED_mesh.h" #include "ED_screen.h" #include "ED_space_api.h" #include "ED_view3d.h" -#include "ED_mesh.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/mesh/editmesh_knife_project.c b/source/blender/editors/mesh/editmesh_knife_project.c index ce0d5d9f7a7..10e8bfa529f 100644 --- a/source/blender/editors/mesh/editmesh_knife_project.c +++ b/source/blender/editors/mesh/editmesh_knife_project.c @@ -24,14 +24,14 @@ #include "DNA_curve_types.h" #include "DNA_object_types.h" -#include "BLI_math.h" #include "BLI_linklist.h" #include "BLI_listbase.h" +#include "BLI_math.h" -#include "BKE_mesh.h" #include "BKE_context.h" #include "BKE_curve.h" #include "BKE_editmesh.h" +#include "BKE_mesh.h" #include "BKE_mesh_runtime.h" #include "BKE_object.h" #include "BKE_report.h" @@ -39,8 +39,8 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/mesh/editmesh_loopcut.c b/source/blender/editors/mesh/editmesh_loopcut.c index 066b692e1ff..37bacb4af55 100644 --- a/source/blender/editors/mesh/editmesh_loopcut.c +++ b/source/blender/editors/mesh/editmesh_loopcut.c @@ -25,27 +25,27 @@ #include "MEM_guardedalloc.h" -#include "BLI_string.h" #include "BLI_math.h" +#include "BLI_string.h" #include "BLT_translation.h" #include "DNA_mesh_types.h" #include "BKE_context.h" +#include "BKE_editmesh.h" +#include "BKE_layer.h" #include "BKE_modifier.h" #include "BKE_report.h" -#include "BKE_editmesh.h" #include "BKE_unit.h" -#include "BKE_layer.h" #include "UI_interface.h" +#include "ED_mesh.h" +#include "ED_numinput.h" #include "ED_screen.h" #include "ED_space_api.h" #include "ED_view3d.h" -#include "ED_mesh.h" -#include "ED_numinput.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/mesh/editmesh_mask_extract.c b/source/blender/editors/mesh/editmesh_mask_extract.c index cd91aa1e491..3a0a028468d 100644 --- a/source/blender/editors/mesh/editmesh_mask_extract.c +++ b/source/blender/editors/mesh/editmesh_mask_extract.c @@ -40,15 +40,15 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "ED_mesh.h" -#include "ED_screen.h" #include "ED_object.h" +#include "ED_screen.h" #include "ED_sculpt.h" #include "ED_view3d.h" diff --git a/source/blender/editors/mesh/editmesh_path.c b/source/blender/editors/mesh/editmesh_path.c index e09bcaf4edc..7cde233c6b6 100644 --- a/source/blender/editors/mesh/editmesh_path.c +++ b/source/blender/editors/mesh/editmesh_path.c @@ -23,25 +23,25 @@ #include "MEM_guardedalloc.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" #include "DNA_mesh_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "DNA_windowmanager_types.h" #ifdef WITH_FREESTYLE # include "DNA_meshdata_types.h" #endif -#include "BLI_math.h" #include "BLI_linklist.h" +#include "BLI_math.h" -#include "BKE_layer.h" #include "BKE_context.h" #include "BKE_editmesh.h" +#include "BKE_layer.h" #include "BKE_report.h" -#include "ED_object.h" #include "ED_mesh.h" +#include "ED_object.h" #include "ED_screen.h" #include "ED_uvedit.h" #include "ED_view3d.h" diff --git a/source/blender/editors/mesh/editmesh_polybuild.c b/source/blender/editors/mesh/editmesh_polybuild.c index fac0fc72c0b..c7bb45ccfe3 100644 --- a/source/blender/editors/mesh/editmesh_polybuild.c +++ b/source/blender/editors/mesh/editmesh_polybuild.c @@ -28,15 +28,15 @@ #include "BLI_math.h" #include "BKE_context.h" -#include "BKE_report.h" #include "BKE_editmesh.h" -#include "BKE_mesh.h" #include "BKE_layer.h" +#include "BKE_mesh.h" +#include "BKE_report.h" #include "WM_types.h" -#include "ED_object.h" #include "ED_mesh.h" +#include "ED_object.h" #include "ED_scene.h" #include "ED_screen.h" #include "ED_transform.h" diff --git a/source/blender/editors/mesh/editmesh_preselect_edgering.c b/source/blender/editors/mesh/editmesh_preselect_edgering.c index 92a8c7da71d..50af79fc5e1 100644 --- a/source/blender/editors/mesh/editmesh_preselect_edgering.c +++ b/source/blender/editors/mesh/editmesh_preselect_edgering.c @@ -20,8 +20,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_stack.h" #include "BLI_math.h" +#include "BLI_stack.h" #include "BKE_editmesh.h" diff --git a/source/blender/editors/mesh/editmesh_rip.c b/source/blender/editors/mesh/editmesh_rip.c index 3fa6569e3e9..a1ea6074044 100644 --- a/source/blender/editors/mesh/editmesh_rip.c +++ b/source/blender/editors/mesh/editmesh_rip.c @@ -25,16 +25,16 @@ #include "DNA_object_types.h" -#include "BLI_math.h" #include "BLI_array.h" +#include "BLI_math.h" #include "BKE_context.h" -#include "BKE_report.h" #include "BKE_editmesh.h" #include "BKE_layer.h" +#include "BKE_report.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "WM_types.h" diff --git a/source/blender/editors/mesh/editmesh_rip_edge.c b/source/blender/editors/mesh/editmesh_rip_edge.c index e2aca1e6831..6775cb85ef9 100644 --- a/source/blender/editors/mesh/editmesh_rip_edge.c +++ b/source/blender/editors/mesh/editmesh_rip_edge.c @@ -27,9 +27,9 @@ #include "BLI_math.h" #include "BKE_context.h" -#include "BKE_report.h" #include "BKE_editmesh.h" #include "BKE_layer.h" +#include "BKE_report.h" #include "WM_types.h" diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index 1635aa72ee0..f01511fa513 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -23,21 +23,21 @@ #include "MEM_guardedalloc.h" +#include "BLI_array.h" #include "BLI_bitmap.h" -#include "BLI_listbase.h" +#include "BLI_heap.h" #include "BLI_linklist.h" #include "BLI_linklist_stack.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_math_bits.h" #include "BLI_rand.h" -#include "BLI_array.h" -#include "BLI_heap.h" #include "BLI_utildefines_stack.h" #include "BKE_context.h" -#include "BKE_report.h" #include "BKE_editmesh.h" #include "BKE_layer.h" +#include "BKE_report.h" #include "WM_api.h" #include "WM_types.h" @@ -46,11 +46,11 @@ #include "RNA_define.h" #include "RNA_enum_types.h" -#include "ED_object.h" #include "ED_mesh.h" +#include "ED_object.h" #include "ED_screen.h" -#include "ED_transform.h" #include "ED_select_utils.h" +#include "ED_transform.h" #include "ED_view3d.h" #include "DNA_mesh_types.h" diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 3a1781b941a..b52f63e0a1b 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -35,17 +35,17 @@ #include "BLI_bitmap.h" #include "BLI_heap_simple.h" -#include "BLI_listbase.h" #include "BLI_linklist.h" #include "BLI_linklist_stack.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_rand.h" #include "BLI_sort_utils.h" #include "BLI_string.h" -#include "BKE_editmesh.h" #include "BKE_context.h" #include "BKE_deform.h" +#include "BKE_editmesh.h" #include "BKE_key.h" #include "BKE_layer.h" #include "BKE_lib_id.h" @@ -60,8 +60,8 @@ #include "BLT_translation.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "RNA_enum_types.h" #include "WM_api.h" diff --git a/source/blender/editors/mesh/editmesh_undo.c b/source/blender/editors/mesh/editmesh_undo.c index 951efdc6127..1f857ad4710 100644 --- a/source/blender/editors/mesh/editmesh_undo.c +++ b/source/blender/editors/mesh/editmesh_undo.c @@ -22,32 +22,32 @@ #include "CLG_log.h" +#include "DNA_key_types.h" +#include "DNA_layer_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "DNA_key_types.h" -#include "DNA_layer_types.h" -#include "BLI_listbase.h" #include "BLI_array_utils.h" +#include "BLI_listbase.h" #include "BKE_context.h" +#include "BKE_editmesh.h" #include "BKE_key.h" #include "BKE_layer.h" #include "BKE_main.h" #include "BKE_mesh.h" -#include "BKE_editmesh.h" #include "BKE_undo_system.h" #include "DEG_depsgraph.h" -#include "ED_object.h" #include "ED_mesh.h" -#include "ED_util.h" +#include "ED_object.h" #include "ED_undo.h" +#include "ED_util.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #define USE_ARRAY_STORE diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c index d281dc46b2c..f44a94a63f8 100644 --- a/source/blender/editors/mesh/editmesh_utils.c +++ b/source/blender/editors/mesh/editmesh_utils.c @@ -23,25 +23,25 @@ #include "MEM_guardedalloc.h" +#include "DNA_key_types.h" #include "DNA_mesh_types.h" #include "DNA_object_types.h" -#include "DNA_key_types.h" -#include "BLI_math.h" #include "BLI_alloca.h" #include "BLI_buffer.h" #include "BLI_kdtree.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BKE_DerivedMesh.h" #include "BKE_context.h" +#include "BKE_editmesh.h" +#include "BKE_editmesh_bvh.h" +#include "BKE_global.h" #include "BKE_main.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" #include "BKE_report.h" -#include "BKE_editmesh.h" -#include "BKE_editmesh_bvh.h" -#include "BKE_global.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c index 7007ff29401..51b699acd63 100644 --- a/source/blender/editors/mesh/mesh_data.c +++ b/source/blender/editors/mesh/mesh_data.c @@ -29,9 +29,9 @@ #include "DNA_scene_types.h" #include "DNA_view3d_types.h" -#include "BLI_utildefines.h" #include "BLI_alloca.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_editmesh.h" diff --git a/source/blender/editors/mesh/mesh_mirror.c b/source/blender/editors/mesh/mesh_mirror.c index 628c8273bc5..9b599d8df7f 100644 --- a/source/blender/editors/mesh/mesh_mirror.c +++ b/source/blender/editors/mesh/mesh_mirror.c @@ -29,8 +29,8 @@ #include "DNA_object_types.h" #include "BKE_editmesh.h" -#include "BLI_kdtree.h" #include "BKE_mesh.h" +#include "BLI_kdtree.h" #include "ED_mesh.h" diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c index d467a963799..c61fe39b5fd 100644 --- a/source/blender/editors/mesh/mesh_ops.c +++ b/source/blender/editors/mesh/mesh_ops.c @@ -21,16 +21,16 @@ * \ingroup edmesh */ -#include "DNA_scene_types.h" #include "DNA_modifier_types.h" +#include "DNA_scene_types.h" #include "RNA_access.h" #include "WM_api.h" #include "WM_types.h" -#include "ED_object.h" #include "ED_mesh.h" +#include "ED_object.h" #include "ED_screen.h" #include "ED_select_utils.h" diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index 8f31fa0a1fa..6c5106d3eec 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -37,8 +37,8 @@ #include "DNA_view3d_types.h" #include "DNA_workspace_types.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BKE_context.h" #include "BKE_deform.h" diff --git a/source/blender/editors/metaball/editmball_undo.c b/source/blender/editors/metaball/editmball_undo.c index 165db6c5a06..552e459acb1 100644 --- a/source/blender/editors/metaball/editmball_undo.c +++ b/source/blender/editors/metaball/editmball_undo.c @@ -25,9 +25,9 @@ #include "CLG_log.h" -#include "BLI_utildefines.h" -#include "BLI_listbase.h" #include "BLI_array_utils.h" +#include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "DNA_defs.h" #include "DNA_meta_types.h" @@ -40,13 +40,13 @@ #include "DEG_depsgraph.h" -#include "ED_object.h" #include "ED_mball.h" +#include "ED_object.h" #include "ED_undo.h" #include "ED_util.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" /** We only need this locally. */ static CLG_LogRef LOG = {"ed.undo.mball"}; diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c index 64ae75a0ee8..a64674deda4 100644 --- a/source/blender/editors/metaball/mball_edit.c +++ b/source/blender/editors/metaball/mball_edit.c @@ -27,22 +27,22 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" +#include "BLI_kdtree.h" #include "BLI_math.h" #include "BLI_rand.h" #include "BLI_utildefines.h" -#include "BLI_kdtree.h" #include "DNA_defs.h" #include "DNA_meta_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "BKE_context.h" -#include "BKE_mball.h" #include "BKE_layer.h" +#include "BKE_mball.h" #include "BKE_object.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/metaball/mball_ops.c b/source/blender/editors/metaball/mball_ops.c index c203ca56d74..100ca4691ca 100644 --- a/source/blender/editors/metaball/mball_ops.c +++ b/source/blender/editors/metaball/mball_ops.c @@ -29,9 +29,9 @@ #include "WM_types.h" #include "ED_mball.h" +#include "ED_object.h" #include "ED_screen.h" #include "ED_select_utils.h" -#include "ED_object.h" #include "mball_intern.h" diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 832854ec4cc..576e8e0ec25 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -21,9 +21,9 @@ * \ingroup edobj */ +#include #include #include -#include #include "MEM_guardedalloc.h" @@ -31,24 +31,24 @@ #include "DNA_camera_types.h" #include "DNA_collection_types.h" #include "DNA_curve_types.h" -#include "DNA_light_types.h" +#include "DNA_gpencil_types.h" #include "DNA_key_types.h" +#include "DNA_light_types.h" +#include "DNA_lightprobe_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" #include "DNA_object_fluidsim_types.h" #include "DNA_object_force_types.h" #include "DNA_object_types.h" -#include "DNA_lightprobe_types.h" #include "DNA_scene_types.h" #include "DNA_vfont_types.h" -#include "DNA_gpencil_types.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -58,8 +58,8 @@ #include "BKE_armature.h" #include "BKE_camera.h" #include "BKE_collection.h" -#include "BKE_context.h" #include "BKE_constraint.h" +#include "BKE_context.h" #include "BKE_curve.h" #include "BKE_displist.h" #include "BKE_effect.h" @@ -67,12 +67,12 @@ #include "BKE_gpencil.h" #include "BKE_hair.h" #include "BKE_key.h" -#include "BKE_light.h" #include "BKE_lattice.h" #include "BKE_layer.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_lib_remap.h" +#include "BKE_light.h" #include "BKE_lightprobe.h" #include "BKE_main.h" #include "BKE_material.h" diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c index 6f659858ac2..2cb0229126d 100644 --- a/source/blender/editors/object/object_bake.c +++ b/source/blender/editors/object/object_bake.c @@ -25,40 +25,40 @@ #include "MEM_guardedalloc.h" +#include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" #include "DNA_world_types.h" -#include "DNA_object_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "BLI_blenlib.h" #include "BLI_utildefines.h" +#include "BKE_DerivedMesh.h" #include "BKE_blender.h" +#include "BKE_cdderivedmesh.h" #include "BKE_context.h" #include "BKE_global.h" #include "BKE_image.h" #include "BKE_material.h" +#include "BKE_mesh.h" +#include "BKE_modifier.h" #include "BKE_multires.h" #include "BKE_report.h" -#include "BKE_cdderivedmesh.h" -#include "BKE_modifier.h" -#include "BKE_DerivedMesh.h" -#include "BKE_mesh.h" #include "BKE_scene.h" #include "DEG_depsgraph.h" +#include "RE_multires_bake.h" #include "RE_pipeline.h" #include "RE_shader_ext.h" -#include "RE_multires_bake.h" #include "PIL_time.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "GPU_draw.h" /* GPU_free_image */ diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c index 8cfcad2d77e..7d39d2546b6 100644 --- a/source/blender/editors/object/object_bake_api.c +++ b/source/blender/editors/object/object_bake_api.c @@ -23,16 +23,16 @@ #include "MEM_guardedalloc.h" -#include "DNA_object_types.h" -#include "DNA_mesh_types.h" #include "DNA_material_types.h" +#include "DNA_mesh_types.h" +#include "DNA_object_types.h" #include "RNA_access.h" #include "RNA_define.h" #include "RNA_enum_types.h" -#include "BLI_listbase.h" #include "BLI_fileops.h" +#include "BLI_listbase.h" #include "BLI_path_util.h" #include "BKE_context.h" @@ -57,9 +57,9 @@ #include "RE_engine.h" #include "RE_pipeline.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_colormanagement.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/object/object_collection.c b/source/blender/editors/object/object_collection.c index a278ce90eda..7c12a4839f0 100644 --- a/source/blender/editors/object/object_collection.c +++ b/source/blender/editors/object/object_collection.c @@ -40,8 +40,8 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "ED_screen.h" #include "ED_object.h" +#include "ED_screen.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c index 4db7ee9594e..d9fb48afcbf 100644 --- a/source/blender/editors/object/object_constraint.c +++ b/source/blender/editors/object/object_constraint.c @@ -27,8 +27,8 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_dynstr.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLT_translation.h" @@ -37,10 +37,11 @@ #include "DNA_armature_types.h" #include "DNA_constraint_types.h" #include "DNA_curve_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_text_types.h" -#include "DNA_object_types.h" +#include "BIK_api.h" #include "BKE_action.h" #include "BKE_armature.h" #include "BKE_constraint.h" @@ -50,7 +51,6 @@ #include "BKE_object.h" #include "BKE_report.h" #include "BKE_tracking.h" -#include "BIK_api.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" @@ -67,8 +67,8 @@ #include "RNA_define.h" #include "RNA_enum_types.h" -#include "ED_object.h" #include "ED_keyframing.h" +#include "ED_object.h" #include "ED_screen.h" #include "UI_interface.h" diff --git a/source/blender/editors/object/object_data_transfer.c b/source/blender/editors/object/object_data_transfer.c index 0a5db782892..1e2b7702dc5 100644 --- a/source/blender/editors/object/object_data_transfer.c +++ b/source/blender/editors/object/object_data_transfer.c @@ -26,8 +26,8 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/editors/object/object_data_transform.c b/source/blender/editors/object/object_data_transform.c index 6d03ec2774c..fc91cbb9666 100644 --- a/source/blender/editors/object/object_data_transform.c +++ b/source/blender/editors/object/object_data_transform.c @@ -32,23 +32,23 @@ #include "DNA_anim_types.h" #include "DNA_armature_types.h" +#include "DNA_collection_types.h" +#include "DNA_lattice_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_collection_types.h" -#include "DNA_lattice_types.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_utildefines.h" +#include "BKE_armature.h" #include "BKE_curve.h" #include "BKE_editmesh.h" +#include "BKE_lattice.h" #include "BKE_mball.h" #include "BKE_mesh.h" -#include "BKE_armature.h" -#include "BKE_lattice.h" #include "BKE_scene.h" #include "bmesh.h" @@ -58,9 +58,9 @@ #include "WM_types.h" -#include "ED_object.h" -#include "ED_mesh.h" #include "ED_armature.h" +#include "ED_mesh.h" +#include "ED_object.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index def93db2537..7faad5cdd0e 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -21,19 +21,19 @@ * \ingroup edobj */ +#include +#include +#include +#include //for offsetof #include #include -#include #include -#include -#include -#include //for offsetof #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -41,15 +41,15 @@ #include "DNA_collection_types.h" #include "DNA_curve_types.h" #include "DNA_gpencil_types.h" -#include "DNA_material_types.h" -#include "DNA_meta_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_object_force_types.h" -#include "DNA_meshdata_types.h" -#include "DNA_vfont_types.h" -#include "DNA_mesh_types.h" #include "DNA_lattice_types.h" +#include "DNA_material_types.h" +#include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_meta_types.h" +#include "DNA_object_force_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" +#include "DNA_vfont_types.h" #include "DNA_workspace_types.h" #include "IMB_imbuf_types.h" @@ -60,6 +60,7 @@ #include "BKE_context.h" #include "BKE_curve.h" #include "BKE_editlattice.h" +#include "BKE_editmesh.h" #include "BKE_effect.h" #include "BKE_global.h" #include "BKE_image.h" @@ -74,10 +75,9 @@ #include "BKE_paint.h" #include "BKE_particle.h" #include "BKE_pointcache.h" -#include "BKE_softbody.h" -#include "BKE_editmesh.h" #include "BKE_report.h" #include "BKE_scene.h" +#include "BKE_softbody.h" #include "BKE_workspace.h" #include "DEG_depsgraph.h" @@ -86,15 +86,15 @@ #include "ED_anim_api.h" #include "ED_armature.h" #include "ED_curve.h" -#include "ED_mesh.h" -#include "ED_mball.h" +#include "ED_gpencil.h" +#include "ED_image.h" #include "ED_lattice.h" +#include "ED_mball.h" +#include "ED_mesh.h" #include "ED_object.h" #include "ED_outliner.h" #include "ED_screen.h" #include "ED_undo.h" -#include "ED_image.h" -#include "ED_gpencil.h" #include "RNA_access.h" #include "RNA_define.h" @@ -106,9 +106,9 @@ #include "UI_resources.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "object_intern.h" // own include diff --git a/source/blender/editors/object/object_facemap_ops.c b/source/blender/editors/object/object_facemap_ops.c index 0081e18f33c..147bd3d7871 100644 --- a/source/blender/editors/object/object_facemap_ops.c +++ b/source/blender/editors/object/object_facemap_ops.c @@ -25,27 +25,27 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" -#include "DNA_object_types.h" #include "DNA_mesh_types.h" +#include "DNA_object_types.h" #include "DNA_workspace_types.h" #include "BKE_context.h" #include "BKE_customdata.h" #include "BKE_editmesh.h" #include "BKE_object.h" -#include "BKE_object_facemap.h" #include "BKE_object_deform.h" +#include "BKE_object_facemap.h" #include "DEG_depsgraph.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "ED_mesh.h" #include "ED_object.h" diff --git a/source/blender/editors/object/object_gpencil_modifier.c b/source/blender/editors/object/object_gpencil_modifier.c index 4543f1a19b3..5bf5c4bd95a 100644 --- a/source/blender/editors/object/object_gpencil_modifier.c +++ b/source/blender/editors/object/object_gpencil_modifier.c @@ -27,8 +27,8 @@ #include "MEM_guardedalloc.h" -#include "DNA_gpencil_types.h" #include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -37,11 +37,11 @@ #include "BLI_utildefines.h" #include "BKE_context.h" -#include "BKE_main.h" -#include "BKE_gpencil_modifier.h" -#include "BKE_report.h" -#include "BKE_object.h" #include "BKE_gpencil.h" +#include "BKE_gpencil_modifier.h" +#include "BKE_main.h" +#include "BKE_object.h" +#include "BKE_report.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c index 3c722ffc749..4414acff115 100644 --- a/source/blender/editors/object/object_hook.c +++ b/source/blender/editors/object/object_hook.c @@ -26,8 +26,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_string.h" #include "BLI_utildefines.h" @@ -41,29 +41,29 @@ #include "BKE_action.h" #include "BKE_context.h" +#include "BKE_deform.h" +#include "BKE_editmesh.h" #include "BKE_layer.h" #include "BKE_main.h" #include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_deform.h" -#include "BKE_editmesh.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" #include "DEG_depsgraph_query.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "RNA_enum_types.h" #include "ED_curve.h" #include "ED_mesh.h" #include "ED_screen.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "UI_resources.h" diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index 7c74213608c..f2629b0b02f 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -37,17 +37,17 @@ #include "DNA_scene_types.h" #include "BLI_bitmap.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" +#include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_string_utf8.h" -#include "BLI_path_util.h" #include "BLI_utildefines.h" -#include "BKE_animsys.h" -#include "BKE_curve.h" -#include "BKE_context.h" #include "BKE_DerivedMesh.h" +#include "BKE_animsys.h" +#include "BKE_context.h" +#include "BKE_curve.h" #include "BKE_displist.h" #include "BKE_editmesh.h" #include "BKE_effect.h" @@ -83,9 +83,9 @@ #include "RNA_enum_types.h" #include "ED_armature.h" +#include "ED_mesh.h" #include "ED_object.h" #include "ED_screen.h" -#include "ED_mesh.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c index 52273b887dd..cacf7b67777 100644 --- a/source/blender/editors/object/object_ops.c +++ b/source/blender/editors/object/object_ops.c @@ -21,8 +21,8 @@ * \ingroup edobj */ -#include #include +#include #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -37,9 +37,9 @@ #include "WM_api.h" #include "WM_types.h" +#include "ED_object.h" #include "ED_screen.h" #include "ED_select_utils.h" -#include "ED_object.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 836e3bf7a44..f86ad1216cb 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -33,8 +33,8 @@ #include "DNA_collection_types.h" #include "DNA_constraint_types.h" #include "DNA_gpencil_types.h" -#include "DNA_light_types.h" #include "DNA_lattice_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" @@ -44,37 +44,37 @@ #include "DNA_vfont_types.h" #include "DNA_world_types.h" -#include "BLI_math.h" -#include "BLI_listbase.h" -#include "BLI_linklist.h" -#include "BLI_string.h" #include "BLI_kdtree.h" +#include "BLI_linklist.h" +#include "BLI_listbase.h" +#include "BLI_math.h" +#include "BLI_string.h" #include "BLI_utildefines.h" #include "BLT_translation.h" +#include "BKE_DerivedMesh.h" #include "BKE_action.h" #include "BKE_animsys.h" #include "BKE_armature.h" #include "BKE_camera.h" #include "BKE_collection.h" -#include "BKE_context.h" #include "BKE_constraint.h" +#include "BKE_context.h" #include "BKE_curve.h" -#include "BKE_DerivedMesh.h" #include "BKE_displist.h" #include "BKE_editmesh.h" -#include "BKE_gpencil.h" #include "BKE_fcurve.h" +#include "BKE_gpencil.h" #include "BKE_hair.h" #include "BKE_idprop.h" -#include "BKE_light.h" #include "BKE_lattice.h" #include "BKE_layer.h" #include "BKE_lib_id.h" #include "BKE_lib_override.h" #include "BKE_lib_query.h" #include "BKE_lib_remap.h" +#include "BKE_light.h" #include "BKE_lightprobe.h" #include "BKE_main.h" #include "BKE_material.h" @@ -108,8 +108,8 @@ #include "ED_curve.h" #include "ED_gpencil.h" #include "ED_keyframing.h" -#include "ED_object.h" #include "ED_mesh.h" +#include "ED_object.h" #include "ED_screen.h" #include "ED_view3d.h" diff --git a/source/blender/editors/object/object_remesh.c b/source/blender/editors/object/object_remesh.c index 631cd961e66..a9f2319d926 100644 --- a/source/blender/editors/object/object_remesh.c +++ b/source/blender/editors/object/object_remesh.c @@ -21,11 +21,11 @@ * \ingroup edobj */ +#include +#include +#include #include #include -#include -#include -#include #include "MEM_guardedalloc.h" @@ -33,26 +33,26 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_meshdata_types.h" #include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BKE_context.h" +#include "BKE_customdata.h" #include "BKE_global.h" #include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_mesh.h" -#include "BKE_mesh_runtime.h" #include "BKE_mesh_mirror.h" +#include "BKE_mesh_remesh_voxel.h" +#include "BKE_mesh_runtime.h" #include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_paint.h" #include "BKE_report.h" #include "BKE_scene.h" #include "BKE_shrinkwrap.h" -#include "BKE_customdata.h" -#include "BKE_mesh_remesh_voxel.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" @@ -68,9 +68,9 @@ #include "RNA_enum_types.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "object_intern.h" // own include diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c index 29b2ba59ee9..8f01adb202e 100644 --- a/source/blender/editors/object/object_select.c +++ b/source/blender/editors/object/object_select.c @@ -27,18 +27,18 @@ #include #include "DNA_anim_types.h" +#include "DNA_armature_types.h" #include "DNA_collection_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_modifier_types.h" #include "DNA_scene_types.h" -#include "DNA_armature_types.h" -#include "DNA_light_types.h" #include "DNA_workspace_types.h" -#include "DNA_gpencil_types.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_math_bits.h" -#include "BLI_listbase.h" #include "BLI_rand.h" #include "BLI_string_utils.h" #include "BLI_utildefines.h" @@ -64,15 +64,15 @@ #include "DEG_depsgraph.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "ED_armature.h" +#include "ED_keyframing.h" #include "ED_object.h" #include "ED_outliner.h" #include "ED_screen.h" #include "ED_select_utils.h" -#include "ED_keyframing.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/object/object_shader_fx.c b/source/blender/editors/object/object_shader_fx.c index db0c8c54186..cd71ab674ba 100644 --- a/source/blender/editors/object/object_shader_fx.c +++ b/source/blender/editors/object/object_shader_fx.c @@ -28,9 +28,9 @@ #include "MEM_guardedalloc.h" #include "DNA_gpencil_types.h" -#include "DNA_shader_fx_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "DNA_shader_fx_types.h" #include "BLI_listbase.h" #include "BLI_string_utf8.h" @@ -40,9 +40,9 @@ #include "BKE_context.h" #include "BKE_main.h" -#include "BKE_shader_fx.h" -#include "BKE_report.h" #include "BKE_object.h" +#include "BKE_report.h" +#include "BKE_shader_fx.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/object/object_shapekey.c b/source/blender/editors/object/object_shapekey.c index fb76ba6099d..abce985b65a 100644 --- a/source/blender/editors/object/object_shapekey.c +++ b/source/blender/editors/object/object_shapekey.c @@ -55,8 +55,8 @@ #include "BLI_sys_types.h" // for intptr_t support -#include "ED_object.h" #include "ED_mesh.h" +#include "ED_object.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index 4a085bb61bf..a467667a4c7 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -26,54 +26,54 @@ #include "DNA_anim_types.h" #include "DNA_armature_types.h" +#include "DNA_collection_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_lattice_types.h" +#include "DNA_light_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" -#include "DNA_light_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_collection_types.h" -#include "DNA_lattice_types.h" -#include "BLI_math.h" -#include "BLI_listbase.h" -#include "BLI_utildefines.h" #include "BLI_array.h" +#include "BLI_listbase.h" +#include "BLI_math.h" +#include "BLI_utildefines.h" +#include "BKE_armature.h" #include "BKE_context.h" #include "BKE_curve.h" -#include "BKE_main.h" +#include "BKE_editmesh.h" +#include "BKE_gpencil.h" #include "BKE_idcode.h" +#include "BKE_lattice.h" #include "BKE_layer.h" +#include "BKE_lib_id.h" +#include "BKE_main.h" #include "BKE_mball.h" #include "BKE_mesh.h" -#include "BKE_object.h" -#include "BKE_scene.h" -#include "BKE_report.h" -#include "BKE_editmesh.h" #include "BKE_multires.h" -#include "BKE_armature.h" -#include "BKE_lattice.h" -#include "BKE_lib_id.h" +#include "BKE_object.h" +#include "BKE_report.h" +#include "BKE_scene.h" #include "BKE_tracking.h" -#include "BKE_gpencil.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" #include "ED_armature.h" +#include "ED_gpencil.h" #include "ED_keyframing.h" #include "ED_mesh.h" +#include "ED_object.h" #include "ED_screen.h" #include "ED_view3d.h" -#include "ED_gpencil.h" -#include "ED_object.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/object/object_utils.c b/source/blender/editors/object/object_utils.c index ed764f4dcfc..d6056f85932 100644 --- a/source/blender/editors/object/object_utils.c +++ b/source/blender/editors/object/object_utils.c @@ -23,10 +23,10 @@ #include "DNA_anim_types.h" #include "DNA_armature_types.h" +#include "DNA_collection_types.h" #include "DNA_meta_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_collection_types.h" #include "BLI_math.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index c11b3aebe72..3ec55d42849 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -21,17 +21,17 @@ * \ingroup edobj */ -#include -#include -#include #include +#include +#include +#include #include "MEM_guardedalloc.h" #include "DNA_curve_types.h" #include "DNA_lattice_types.h" -#include "DNA_meshdata_types.h" #include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -39,24 +39,24 @@ #include "BLI_alloca.h" #include "BLI_array.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLI_utildefines_stack.h" #include "BKE_context.h" #include "BKE_customdata.h" #include "BKE_deform.h" +#include "BKE_editmesh.h" +#include "BKE_lattice.h" +#include "BKE_layer.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" #include "BKE_mesh_runtime.h" -#include "BKE_editmesh.h" -#include "BKE_layer.h" #include "BKE_modifier.h" -#include "BKE_report.h" -#include "BKE_object_deform.h" #include "BKE_object.h" -#include "BKE_lattice.h" +#include "BKE_object_deform.h" +#include "BKE_report.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" @@ -70,8 +70,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_object.h" #include "ED_mesh.h" +#include "ED_object.h" #include "UI_resources.h" diff --git a/source/blender/editors/object/object_volume.c b/source/blender/editors/object/object_volume.c index 64482a0bcf6..92fb0788f6b 100644 --- a/source/blender/editors/object/object_volume.c +++ b/source/blender/editors/object/object_volume.c @@ -43,8 +43,8 @@ #include "BKE_report.h" #include "BKE_volume.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "ED_image.h" #include "ED_object.h" diff --git a/source/blender/editors/object/object_warp.c b/source/blender/editors/object/object_warp.c index 836e38e3676..00f9330c8a7 100644 --- a/source/blender/editors/object/object_warp.c +++ b/source/blender/editors/object/object_warp.c @@ -35,8 +35,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_view3d.h" #include "ED_transverts.h" +#include "ED_view3d.h" #include "object_intern.h" diff --git a/source/blender/editors/physics/dynamicpaint_ops.c b/source/blender/editors/physics/dynamicpaint_ops.c index b0dbe5d9a3e..37845e8d74e 100644 --- a/source/blender/editors/physics/dynamicpaint_ops.c +++ b/source/blender/editors/physics/dynamicpaint_ops.c @@ -37,11 +37,11 @@ #include "BKE_context.h" #include "BKE_deform.h" -#include "BKE_object_deform.h" #include "BKE_dynamicpaint.h" #include "BKE_global.h" #include "BKE_main.h" #include "BKE_modifier.h" +#include "BKE_object_deform.h" #include "BKE_report.h" #include "BKE_screen.h" @@ -50,8 +50,8 @@ #include "DEG_depsgraph_query.h" #include "ED_mesh.h" -#include "ED_screen.h" #include "ED_object.h" +#include "ED_screen.h" #include "RNA_access.h" #include "RNA_define.h" @@ -59,8 +59,8 @@ #include "PIL_time.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "physics_intern.h" /* own include */ diff --git a/source/blender/editors/physics/particle_boids.c b/source/blender/editors/physics/particle_boids.c index 55fc49165c9..22cfa50aee9 100644 --- a/source/blender/editors/physics/particle_boids.c +++ b/source/blender/editors/physics/particle_boids.c @@ -39,8 +39,8 @@ #include "DEG_depsgraph_build.h" #include "RNA_access.h" -#include "RNA_enum_types.h" #include "RNA_define.h" +#include "RNA_enum_types.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 17875688c61..8a40f65fc8a 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -21,26 +21,26 @@ * \ingroup edphys */ -#include -#include -#include #include +#include +#include +#include #include "MEM_guardedalloc.h" -#include "DNA_scene_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_view3d_types.h" +#include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" +#include "DNA_view3d_types.h" -#include "BLI_math.h" +#include "BLI_kdtree.h" #include "BLI_lasso_2d.h" #include "BLI_listbase.h" -#include "BLI_rect.h" -#include "BLI_kdtree.h" +#include "BLI_math.h" #include "BLI_rand.h" +#include "BLI_rect.h" #include "BLI_task.h" #include "BLI_utildefines.h" @@ -59,10 +59,10 @@ #include "DEG_depsgraph.h" -#include "ED_object.h" -#include "ED_physics.h" #include "ED_mesh.h" +#include "ED_object.h" #include "ED_particle.h" +#include "ED_physics.h" #include "ED_screen.h" #include "ED_select_utils.h" #include "ED_view3d.h" @@ -74,9 +74,9 @@ #include "UI_resources.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/physics/particle_edit_undo.c b/source/blender/editors/physics/particle_edit_undo.c index e85b025e28e..5b363bdca78 100644 --- a/source/blender/editors/physics/particle_edit_undo.c +++ b/source/blender/editors/physics/particle_edit_undo.c @@ -21,15 +21,15 @@ * \ingroup edphys */ -#include -#include -#include #include +#include +#include +#include #include "MEM_guardedalloc.h" -#include "DNA_scene_types.h" #include "DNA_meshdata_types.h" +#include "DNA_scene_types.h" #include "DNA_windowmanager_types.h" #include "BLI_listbase.h" diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index 4bd58d1bebc..f37a20bf43e 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -31,10 +31,10 @@ #include "DNA_modifier_types.h" #include "DNA_scene_types.h" -#include "BLI_math.h" #include "BLI_listbase.h" -#include "BLI_utildefines.h" +#include "BLI_math.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BKE_bvhutils.h" #include "BKE_context.h" @@ -59,9 +59,9 @@ #include "WM_api.h" #include "WM_types.h" +#include "ED_object.h" #include "ED_particle.h" #include "ED_screen.h" -#include "ED_object.h" #include "UI_resources.h" diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index 0b754780cde..bfbe1d22334 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -33,37 +33,37 @@ #include "DNA_object_types.h" #include "BLI_blenlib.h" -#include "BLI_path_util.h" #include "BLI_math.h" +#include "BLI_path_util.h" #include "BLI_utildefines.h" #include "BLT_translation.h" #include "BKE_context.h" #include "BKE_customdata.h" +#include "BKE_fluid.h" +#include "BKE_global.h" #include "BKE_main.h" #include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_report.h" #include "BKE_scene.h" #include "BKE_screen.h" -#include "BKE_fluid.h" -#include "BKE_global.h" #include "DEG_depsgraph.h" #include "ED_screen.h" #include "PIL_time.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" -#include "physics_intern.h" // own include #include "manta_fluid_API.h" +#include "physics_intern.h" // own include -#include "DNA_scene_types.h" #include "DNA_fluid_types.h" #include "DNA_mesh_types.h" +#include "DNA_scene_types.h" #define FLUID_JOB_BAKE_ALL "FLUID_OT_bake_all" #define FLUID_JOB_BAKE_DATA "FLUID_OT_bake_data" diff --git a/source/blender/editors/physics/physics_ops.c b/source/blender/editors/physics/physics_ops.c index ea638a2fe44..f6943c25063 100644 --- a/source/blender/editors/physics/physics_ops.c +++ b/source/blender/editors/physics/physics_ops.c @@ -28,9 +28,9 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_select_utils.h" -#include "ED_physics.h" #include "ED_object.h" +#include "ED_physics.h" +#include "ED_select_utils.h" #include "physics_intern.h" // own include diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index f687120d228..8a8fd703845 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -22,15 +22,15 @@ */ #include -#include #include +#include #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_timecode.h" #include "BLI_math.h" #include "BLI_threads.h" +#include "BLI_timecode.h" #include "BLI_utildefines.h" #include "PIL_time.h" @@ -39,14 +39,14 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_view3d_types.h" #include "DNA_userdef_types.h" +#include "DNA_view3d_types.h" #include "BKE_blender_undo.h" #include "BKE_blender_version.h" #include "BKE_camera.h" -#include "BKE_context.h" #include "BKE_colortools.h" +#include "BKE_context.h" #include "BKE_global.h" #include "BKE_image.h" #include "BKE_layer.h" @@ -55,9 +55,9 @@ #include "BKE_node.h" #include "BKE_object.h" #include "BKE_report.h" -#include "BKE_sequencer.h" -#include "BKE_screen.h" #include "BKE_scene.h" +#include "BKE_screen.h" +#include "BKE_sequencer.h" #include "BKE_undo_system.h" #include "DEG_depsgraph.h" @@ -68,14 +68,14 @@ #include "ED_object.h" #include "ED_render.h" #include "ED_screen.h" -#include "ED_util.h" #include "ED_undo.h" +#include "ED_util.h" #include "ED_view3d.h" #include "BIF_glutil.h" -#include "RE_pipeline.h" #include "RE_engine.h" +#include "RE_pipeline.h" #include "IMB_colormanagement.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index 6baf8cdba07..442f700ad6f 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -22,26 +22,26 @@ */ #include -#include #include +#include #include "MEM_guardedalloc.h" -#include "DNA_camera_types.h" #include "BLI_bitmap.h" +#include "BLI_blenlib.h" #include "BLI_math.h" #include "BLI_math_color_blend.h" -#include "BLI_blenlib.h" -#include "BLI_utildefines.h" -#include "BLI_threads.h" #include "BLI_task.h" +#include "BLI_threads.h" +#include "BLI_utildefines.h" +#include "DNA_camera_types.h" -#include "DNA_anim_types.h" #include "DNA_action_types.h" +#include "DNA_anim_types.h" #include "DNA_curve_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" #include "DNA_gpencil_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BKE_animsys.h" #include "BKE_camera.h" @@ -65,15 +65,15 @@ #include "WM_api.h" #include "WM_types.h" +#include "ED_gpencil.h" #include "ED_screen.h" #include "ED_view3d.h" #include "ED_view3d_offscreen.h" -#include "ED_gpencil.h" -#include "RE_pipeline.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_colormanagement.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" +#include "RE_pipeline.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index 369572a5d6d..1427c6ed500 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -23,8 +23,8 @@ /* global includes */ -#include #include +#include #include #ifndef WIN32 @@ -34,37 +34,37 @@ #endif #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "PIL_time.h" #include "BLO_readfile.h" -#include "DNA_world_types.h" +#include "DNA_brush_types.h" #include "DNA_camera_types.h" #include "DNA_collection_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" -#include "DNA_light_types.h" -#include "DNA_space_types.h" #include "DNA_scene_types.h" -#include "DNA_brush_types.h" #include "DNA_screen_types.h" +#include "DNA_space_types.h" +#include "DNA_world_types.h" #include "BKE_appdir.h" #include "BKE_brush.h" -#include "BKE_context.h" #include "BKE_colortools.h" +#include "BKE_context.h" #include "BKE_global.h" +#include "BKE_icons.h" #include "BKE_idprop.h" #include "BKE_image.h" -#include "BKE_icons.h" +#include "BKE_layer.h" #include "BKE_lib_id.h" #include "BKE_light.h" -#include "BKE_layer.h" #include "BKE_main.h" #include "BKE_material.h" #include "BKE_node.h" @@ -73,8 +73,8 @@ #include "BKE_world.h" #include "DEG_depsgraph.h" -#include "DEG_depsgraph_query.h" #include "DEG_depsgraph_build.h" +#include "DEG_depsgraph_query.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" @@ -82,11 +82,11 @@ #include "BIF_glutil.h" -#include "GPU_shader.h" #include "GPU_glew.h" +#include "GPU_shader.h" -#include "RE_pipeline.h" #include "RE_engine.h" +#include "RE_pipeline.h" #include "RE_shader_ext.h" #include "WM_api.h" diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index d022de0545f..62a078bedb7 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -36,9 +36,9 @@ #include "DNA_space_types.h" #include "DNA_world_types.h" -#include "BLI_utildefines.h" #include "BLI_listbase.h" #include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -76,10 +76,10 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_object.h" #include "ED_curve.h" #include "ED_mesh.h" #include "ED_node.h" +#include "ED_object.h" #include "ED_render.h" #include "ED_scene.h" #include "ED_screen.h" diff --git a/source/blender/editors/render/render_update.c b/source/blender/editors/render/render_update.c index e494bd90d65..d2bb53de06f 100644 --- a/source/blender/editors/render/render_update.c +++ b/source/blender/editors/render/render_update.c @@ -32,9 +32,9 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" #include "DNA_view3d_types.h" +#include "DNA_windowmanager_types.h" #include "DNA_workspace_types.h" #include "DNA_world_types.h" -#include "DNA_windowmanager_types.h" #include "DRW_engine.h" diff --git a/source/blender/editors/render/render_view.c b/source/blender/editors/render/render_view.c index 1aa0c0ab37d..a93ea343229 100644 --- a/source/blender/editors/render/render_view.c +++ b/source/blender/editors/render/render_view.c @@ -21,8 +21,8 @@ * \ingroup edrend */ -#include #include +#include #include "BLI_listbase.h" #include "BLI_utildefines.h" @@ -31,11 +31,11 @@ #include "DNA_userdef_types.h" #include "BKE_context.h" -#include "BKE_image.h" #include "BKE_global.h" +#include "BKE_image.h" #include "BKE_main.h" -#include "BKE_screen.h" #include "BKE_report.h" +#include "BKE_screen.h" #include "BLT_translation.h" diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index a083675ca01..56ea59c1d6e 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -21,18 +21,18 @@ * \ingroup edscr */ -#include #include +#include #include "MEM_guardedalloc.h" #include "DNA_userdef_types.h" #include "BLI_blenlib.h" +#include "BLI_linklist_stack.h" #include "BLI_math.h" #include "BLI_rand.h" #include "BLI_utildefines.h" -#include "BLI_linklist_stack.h" #include "BKE_context.h" #include "BKE_global.h" @@ -44,20 +44,20 @@ #include "RNA_types.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "ED_screen.h" #include "ED_screen_types.h" #include "ED_space_api.h" #include "ED_time_scrub_ui.h" +#include "GPU_framebuffer.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" #include "GPU_matrix.h" #include "GPU_state.h" -#include "GPU_framebuffer.h" #include "BLF_api.h" diff --git a/source/blender/editors/screen/area_query.c b/source/blender/editors/screen/area_query.c index 2cccd9a2ba5..739f1b93e07 100644 --- a/source/blender/editors/screen/area_query.c +++ b/source/blender/editors/screen/area_query.c @@ -23,8 +23,8 @@ #include "DNA_userdef_types.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math_base.h" +#include "BLI_utildefines.h" #include "RNA_types.h" diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c index 94c1f4cfc35..f757b856dcf 100644 --- a/source/blender/editors/screen/glutil.c +++ b/source/blender/editors/screen/glutil.c @@ -27,8 +27,8 @@ #include "DNA_userdef_types.h" #include "DNA_vec_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c index 540a4c05247..9536772be3d 100644 --- a/source/blender/editors/screen/screen_context.c +++ b/source/blender/editors/screen/screen_context.c @@ -27,33 +27,33 @@ #include "MEM_guardedalloc.h" -#include "DNA_object_types.h" #include "DNA_armature_types.h" #include "DNA_gpencil_types.h" -#include "DNA_sequence_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" +#include "DNA_sequence_types.h" #include "DNA_space_types.h" #include "DNA_windowmanager_types.h" #include "BLI_utildefines.h" -#include "BKE_context.h" -#include "BKE_object.h" #include "BKE_action.h" #include "BKE_armature.h" +#include "BKE_context.h" #include "BKE_gpencil.h" #include "BKE_layer.h" +#include "BKE_object.h" #include "BKE_sequencer.h" #include "RNA_access.h" +#include "ED_anim_api.h" #include "ED_armature.h" #include "ED_gpencil.h" -#include "ED_anim_api.h" -#include "WM_api.h" #include "UI_interface.h" +#include "WM_api.h" #include "screen_intern.h" diff --git a/source/blender/editors/screen/screen_draw.c b/source/blender/editors/screen/screen_draw.c index a6b8bba73e3..3331f4db11b 100644 --- a/source/blender/editors/screen/screen_draw.c +++ b/source/blender/editors/screen/screen_draw.c @@ -21,10 +21,10 @@ #include "ED_screen.h" #include "GPU_batch_presets.h" -#include "GPU_platform.h" #include "GPU_framebuffer.h" #include "GPU_immediate.h" #include "GPU_matrix.h" +#include "GPU_platform.h" #include "GPU_state.h" #include "BLI_listbase.h" diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index d62ea73876f..f25f685f2e1 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -21,15 +21,15 @@ * \ingroup edscr */ -#include #include +#include #include "MEM_guardedalloc.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_workspace_types.h" #include "DNA_userdef_types.h" +#include "DNA_workspace_types.h" #include "BLI_blenlib.h" #include "BLI_utildefines.h" @@ -41,18 +41,18 @@ #include "BKE_layer.h" #include "BKE_lib_id.h" #include "BKE_main.h" -#include "BKE_screen.h" #include "BKE_scene.h" +#include "BKE_screen.h" #include "BKE_sound.h" #include "BKE_workspace.h" #include "WM_api.h" #include "WM_types.h" -#include "ED_screen.h" -#include "ED_screen_types.h" #include "ED_clip.h" #include "ED_node.h" +#include "ED_screen.h" +#include "ED_screen_types.h" #include "UI_interface.h" diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 2fe34d61a04..fccdf3f06f3 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -26,25 +26,25 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_dlrbTree.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLT_translation.h" #include "DNA_anim_types.h" #include "DNA_armature_types.h" -#include "DNA_lattice_types.h" -#include "DNA_object_types.h" #include "DNA_curve_types.h" -#include "DNA_scene_types.h" -#include "DNA_meta_types.h" -#include "DNA_mesh_types.h" +#include "DNA_lattice_types.h" #include "DNA_mask_types.h" +#include "DNA_mesh_types.h" +#include "DNA_meta_types.h" #include "DNA_node_types.h" -#include "DNA_workspace_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "DNA_userdef_types.h" +#include "DNA_workspace_types.h" #include "BKE_context.h" #include "BKE_editmesh.h" @@ -77,8 +77,8 @@ #include "ED_screen.h" #include "ED_screen_types.h" #include "ED_sequencer.h" -#include "ED_util.h" #include "ED_undo.h" +#include "ED_util.h" #include "ED_view3d.h" #include "RNA_access.h" diff --git a/source/blender/editors/screen/screen_user_menu.c b/source/blender/editors/screen/screen_user_menu.c index 661c17f55d2..38d83801f2b 100644 --- a/source/blender/editors/screen/screen_user_menu.c +++ b/source/blender/editors/screen/screen_user_menu.c @@ -21,25 +21,25 @@ * \ingroup spview3d */ -#include -#include -#include #include +#include +#include +#include #include "DNA_scene_types.h" #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_listbase.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" #include "BKE_blender_user_menu.h" #include "BKE_context.h" -#include "BKE_screen.h" #include "BKE_idprop.h" +#include "BKE_screen.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/screen/screendump.c b/source/blender/editors/screen/screendump.c index 005c76d26b0..d52dc262c3f 100644 --- a/source/blender/editors/screen/screendump.c +++ b/source/blender/editors/screen/screendump.c @@ -22,16 +22,16 @@ * \ingroup edscr */ -#include #include +#include #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" @@ -48,8 +48,8 @@ #include "UI_interface.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "screen_intern.h" diff --git a/source/blender/editors/screen/workspace_edit.c b/source/blender/editors/screen/workspace_edit.c index 47f6324ee0d..784fa60999d 100644 --- a/source/blender/editors/screen/workspace_edit.c +++ b/source/blender/editors/screen/workspace_edit.c @@ -21,10 +21,10 @@ #include #include -#include "BLI_utildefines.h" #include "BLI_fileops.h" #include "BLI_listbase.h" #include "BLI_path_util.h" +#include "BLI_utildefines.h" #include "BKE_appdir.h" #include "BKE_blendfile.h" diff --git a/source/blender/editors/screen/workspace_layout_edit.c b/source/blender/editors/screen/workspace_layout_edit.c index 67ac5067134..276e36b97dc 100644 --- a/source/blender/editors/screen/workspace_layout_edit.c +++ b/source/blender/editors/screen/workspace_layout_edit.c @@ -20,8 +20,8 @@ #include -#include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "DNA_screen_types.h" #include "DNA_workspace_types.h" diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c index 0ddce872545..c035863203b 100644 --- a/source/blender/editors/sculpt_paint/paint_cursor.c +++ b/source/blender/editors/sculpt_paint/paint_cursor.c @@ -29,8 +29,8 @@ #include "BLI_utildefines.h" #include "DNA_brush_types.h" -#include "DNA_customdata_types.h" #include "DNA_color_types.h" +#include "DNA_customdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" @@ -39,13 +39,13 @@ #include "DNA_view3d_types.h" #include "BKE_brush.h" +#include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_curve.h" #include "BKE_image.h" #include "BKE_node.h" -#include "BKE_paint.h" -#include "BKE_colortools.h" #include "BKE_object.h" +#include "BKE_paint.h" #include "WM_api.h" #include "wm_cursors.h" diff --git a/source/blender/editors/sculpt_paint/paint_curve.c b/source/blender/editors/sculpt_paint/paint_curve.c index 4578e211c97..68fd2f15877 100644 --- a/source/blender/editors/sculpt_paint/paint_curve.c +++ b/source/blender/editors/sculpt_paint/paint_curve.c @@ -18,8 +18,8 @@ * \ingroup edsculpt */ -#include #include +#include #include "MEM_guardedalloc.h" @@ -35,8 +35,8 @@ #include "BKE_main.h" #include "BKE_paint.h" -#include "ED_view3d.h" #include "ED_paint.h" +#include "ED_view3d.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/sculpt_paint/paint_hide.c b/source/blender/editors/sculpt_paint/paint_hide.c index 32b0965363a..ce5a80585b0 100644 --- a/source/blender/editors/sculpt_paint/paint_hide.c +++ b/source/blender/editors/sculpt_paint/paint_hide.c @@ -33,12 +33,12 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BKE_pbvh.h" #include "BKE_ccg.h" #include "BKE_context.h" #include "BKE_mesh.h" #include "BKE_multires.h" #include "BKE_paint.h" +#include "BKE_pbvh.h" #include "BKE_subsurf.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index dd064591018..cbb0ce84156 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -24,14 +24,14 @@ */ #include -#include -#include #include +#include +#include #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLT_translation.h" @@ -44,9 +44,9 @@ #include "DNA_node_types.h" #include "DNA_object_types.h" +#include "BKE_brush.h" #include "BKE_colorband.h" #include "BKE_context.h" -#include "BKE_brush.h" #include "BKE_image.h" #include "BKE_main.h" #include "BKE_material.h" @@ -67,9 +67,9 @@ #include "ED_view3d.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/sculpt_paint/paint_image_2d.c b/source/blender/editors/sculpt_paint/paint_image_2d.c index 4a99e40a361..fc56c5cb6c6 100644 --- a/source/blender/editors/sculpt_paint/paint_image_2d.c +++ b/source/blender/editors/sculpt_paint/paint_image_2d.c @@ -26,19 +26,19 @@ #include "MEM_guardedalloc.h" #include "DNA_brush_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_space_types.h" -#include "DNA_object_types.h" +#include "BLI_bitmap.h" #include "BLI_listbase.h" #include "BLI_math_color_blend.h" #include "BLI_stack.h" -#include "BLI_bitmap.h" #include "BLI_task.h" +#include "BKE_brush.h" #include "BKE_colorband.h" #include "BKE_context.h" -#include "BKE_brush.h" #include "BKE_image.h" #include "BKE_paint.h" #include "BKE_report.h" @@ -48,9 +48,9 @@ #include "ED_paint.h" #include "ED_screen.h" +#include "IMB_colormanagement.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "IMB_colormanagement.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index b45e4f81027..8362a4a576a 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -24,9 +24,9 @@ */ #include -#include -#include #include +#include +#include #include "MEM_guardedalloc.h" @@ -61,8 +61,8 @@ #include "BKE_brush.h" #include "BKE_camera.h" #include "BKE_colorband.h" -#include "BKE_context.h" #include "BKE_colortools.h" +#include "BKE_context.h" #include "BKE_customdata.h" #include "BKE_idprop.h" #include "BKE_image.h" @@ -81,8 +81,8 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "ED_object.h" #include "ED_node.h" +#include "ED_object.h" #include "ED_paint.h" #include "ED_screen.h" #include "ED_uvedit.h" diff --git a/source/blender/editors/sculpt_paint/paint_mask.c b/source/blender/editors/sculpt_paint/paint_mask.c index d6e5559b810..fb8cc3a639b 100644 --- a/source/blender/editors/sculpt_paint/paint_mask.c +++ b/source/blender/editors/sculpt_paint/paint_mask.c @@ -27,17 +27,17 @@ #include "DNA_object_types.h" #include "BLI_bitmap_draw_2d.h" -#include "BLI_math_matrix.h" -#include "BLI_math_geom.h" -#include "BLI_utildefines.h" #include "BLI_lasso_2d.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" #include "BLI_task.h" +#include "BLI_utildefines.h" -#include "BKE_pbvh.h" #include "BKE_ccg.h" #include "BKE_context.h" #include "BKE_multires.h" #include "BKE_paint.h" +#include "BKE_pbvh.h" #include "BKE_subsurf.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c index 6f0ee3626e4..59a0c50d402 100644 --- a/source/blender/editors/sculpt_paint/paint_ops.c +++ b/source/blender/editors/sculpt_paint/paint_ops.c @@ -20,19 +20,19 @@ #include "MEM_guardedalloc.h" -#include #include "BLI_listbase.h" -#include "BLI_utildefines.h" #include "BLI_math_vector.h" #include "BLI_string.h" +#include "BLI_utildefines.h" +#include -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" +#include "DNA_brush_types.h" #include "DNA_customdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_brush_types.h" #include "BKE_brush.h" #include "BKE_context.h" @@ -42,13 +42,13 @@ #include "BKE_paint.h" #include "BKE_report.h" +#include "ED_image.h" #include "ED_paint.h" #include "ED_screen.h" -#include "ED_image.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c index 0e194e57538..01a0e8ddd5b 100644 --- a/source/blender/editors/sculpt_paint/paint_stroke.c +++ b/source/blender/editors/sculpt_paint/paint_stroke.c @@ -23,26 +23,26 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" -#include "BLI_utildefines.h" -#include "BLI_rand.h" #include "BLI_listbase.h" +#include "BLI_math.h" +#include "BLI_rand.h" +#include "BLI_utildefines.h" #include "PIL_time.h" -#include "DNA_object_types.h" -#include "DNA_scene_types.h" #include "DNA_brush_types.h" #include "DNA_curve_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "RNA_access.h" -#include "BKE_context.h" -#include "BKE_paint.h" #include "BKE_brush.h" -#include "BKE_curve.h" #include "BKE_colortools.h" +#include "BKE_context.h" +#include "BKE_curve.h" #include "BKE_image.h" +#include "BKE_paint.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/sculpt_paint/paint_utils.c b/source/blender/editors/sculpt_paint/paint_utils.c index 77a3aa529e6..e67d43d4571 100644 --- a/source/blender/editors/sculpt_paint/paint_utils.c +++ b/source/blender/editors/sculpt_paint/paint_utils.c @@ -24,19 +24,19 @@ #include #include +#include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "DNA_material_types.h" -#include "DNA_scene_types.h" #include "DNA_brush_types.h" +#include "DNA_scene_types.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_math_color.h" -#include "BLI_utildefines.h" -#include "BLI_listbase.h" #include "BLI_rect.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -60,13 +60,13 @@ #include "GPU_state.h" #include "IMB_colormanagement.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "RE_render_ext.h" -#include "ED_view3d.h" #include "ED_screen.h" +#include "ED_view3d.h" #include "BLI_sys_types.h" #include "ED_mesh.h" /* for face mask functions */ diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index a00296a911f..604146e2ca6 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -28,23 +28,24 @@ #include "MEM_guardedalloc.h" -#include "BLI_listbase.h" -#include "BLI_rect.h" -#include "BLI_math.h" #include "BLI_array_utils.h" +#include "BLI_listbase.h" +#include "BLI_math.h" +#include "BLI_rect.h" #include "BLI_task.h" +#include "DNA_brush_types.h" #include "DNA_mesh_types.h" +#include "DNA_object_types.h" #include "DNA_particle_types.h" #include "DNA_scene_types.h" -#include "DNA_brush_types.h" -#include "DNA_object_types.h" #include "RNA_access.h" #include "BKE_brush.h" #include "BKE_context.h" #include "BKE_deform.h" +#include "BKE_layer.h" #include "BKE_main.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" @@ -54,29 +55,28 @@ #include "BKE_paint.h" #include "BKE_report.h" #include "BKE_subsurf.h" -#include "BKE_layer.h" #include "DEG_depsgraph.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "ED_armature.h" -#include "ED_object.h" #include "ED_mesh.h" +#include "ED_object.h" #include "ED_screen.h" #include "ED_view3d.h" /* For IMB_BlendMode only. */ #include "IMB_imbuf.h" -#include "bmesh.h" #include "BKE_ccg.h" +#include "bmesh.h" -#include "sculpt_intern.h" #include "paint_intern.h" /* own include */ +#include "sculpt_intern.h" /* -------------------------------------------------------------------- */ /** \name Internal Utilities diff --git a/source/blender/editors/sculpt_paint/paint_vertex_color_ops.c b/source/blender/editors/sculpt_paint/paint_vertex_color_ops.c index 3a4c8f20028..6e706c907dd 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_color_ops.c +++ b/source/blender/editors/sculpt_paint/paint_vertex_color_ops.c @@ -29,8 +29,8 @@ #include "BLI_math_color.h" #include "BKE_context.h" -#include "BKE_mesh.h" #include "BKE_deform.h" +#include "BKE_mesh.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/sculpt_paint/paint_vertex_proj.c b/source/blender/editors/sculpt_paint/paint_vertex_proj.c index e9935ff3eeb..85cd211367a 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_proj.c +++ b/source/blender/editors/sculpt_paint/paint_vertex_proj.c @@ -26,8 +26,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "DNA_mesh_types.h" #include "DNA_object_types.h" diff --git a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c index 5c408933559..103f312975a 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c +++ b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c @@ -20,13 +20,13 @@ #include "MEM_guardedalloc.h" +#include "BLI_bitmap.h" #include "BLI_blenlib.h" #include "BLI_math.h" -#include "BLI_bitmap.h" +#include "DNA_brush_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_brush_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -35,6 +35,7 @@ #include "RNA_enum_types.h" #include "BKE_brush.h" +#include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_deform.h" #include "BKE_mesh.h" @@ -44,7 +45,6 @@ #include "BKE_object_deform.h" #include "BKE_paint.h" #include "BKE_report.h" -#include "BKE_colortools.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c b/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c index 517bb6324be..5a3067ef193 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c +++ b/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c @@ -33,9 +33,9 @@ #include "BKE_deform.h" #include "BKE_mesh.h" #include "BKE_modifier.h" +#include "BKE_object.h" #include "BKE_object_deform.h" #include "BKE_report.h" -#include "BKE_object.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 1f05b3b944e..bec44242931 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -24,12 +24,12 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_dial_2d.h" -#include "BLI_gsqueue.h" #include "BLI_ghash.h" +#include "BLI_gsqueue.h" #include "BLI_hash.h" +#include "BLI_math.h" #include "BLI_task.h" #include "BLI_utildefines.h" @@ -37,13 +37,13 @@ #include "PIL_time.h" +#include "DNA_brush_types.h" #include "DNA_customdata_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_brush_types.h" #include "BKE_brush.h" #include "BKE_ccg.h" @@ -74,13 +74,13 @@ #include "DEG_depsgraph.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" -#include "ED_sculpt.h" #include "ED_object.h" #include "ED_screen.h" +#include "ED_sculpt.h" #include "ED_view3d.h" #include "paint_intern.h" #include "sculpt_intern.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_cloth.c b/source/blender/editors/sculpt_paint/sculpt_cloth.c index 431f95d5509..a1ccae7b5ab 100644 --- a/source/blender/editors/sculpt_paint/sculpt_cloth.c +++ b/source/blender/editors/sculpt_paint/sculpt_cloth.c @@ -23,24 +23,24 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_dial_2d.h" -#include "BLI_gsqueue.h" #include "BLI_ghash.h" +#include "BLI_gsqueue.h" #include "BLI_hash.h" +#include "BLI_math.h" #include "BLI_task.h" #include "BLI_utildefines.h" #include "BLT_translation.h" +#include "DNA_brush_types.h" #include "DNA_customdata_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_brush_types.h" #include "BKE_brush.h" #include "BKE_ccg.h" @@ -71,13 +71,13 @@ #include "DEG_depsgraph.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" -#include "ED_sculpt.h" #include "ED_object.h" #include "ED_screen.h" +#include "ED_sculpt.h" #include "ED_view3d.h" #include "paint_intern.h" #include "sculpt_intern.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.h b/source/blender/editors/sculpt_paint/sculpt_intern.h index 4e36ae7aa5e..b8235dc5c95 100644 --- a/source/blender/editors/sculpt_paint/sculpt_intern.h +++ b/source/blender/editors/sculpt_paint/sculpt_intern.h @@ -24,13 +24,13 @@ #ifndef __SCULPT_INTERN_H__ #define __SCULPT_INTERN_H__ +#include "DNA_key_types.h" #include "DNA_listBase.h" #include "DNA_vec_types.h" -#include "DNA_key_types.h" #include "BLI_bitmap.h" -#include "BLI_threads.h" #include "BLI_gsqueue.h" +#include "BLI_threads.h" #include "BKE_paint.h" #include "BKE_pbvh.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.c b/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.c index f2671b66f7f..c74a2ba503a 100644 --- a/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.c +++ b/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.c @@ -23,14 +23,14 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_task.h" +#include "DNA_brush_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "DNA_brush_types.h" #include "BKE_brush.h" #include "BKE_ccg.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_pose.c b/source/blender/editors/sculpt_paint/sculpt_pose.c index 57fef1dd4a6..f1c884f9897 100644 --- a/source/blender/editors/sculpt_paint/sculpt_pose.c +++ b/source/blender/editors/sculpt_paint/sculpt_pose.c @@ -23,14 +23,14 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_task.h" +#include "DNA_brush_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "DNA_brush_types.h" #include "BKE_brush.h" #include "BKE_ccg.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c b/source/blender/editors/sculpt_paint/sculpt_undo.c index 8c80818d12d..af404c64fb0 100644 --- a/source/blender/editors/sculpt_paint/sculpt_undo.c +++ b/source/blender/editors/sculpt_paint/sculpt_undo.c @@ -26,33 +26,33 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" -#include "BLI_utildefines.h" -#include "BLI_string.h" -#include "BLI_listbase.h" #include "BLI_ghash.h" +#include "BLI_listbase.h" +#include "BLI_math.h" +#include "BLI_string.h" #include "BLI_task.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" +#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_mesh_types.h" #include "DNA_screen_types.h" #include "BKE_ccg.h" #include "BKE_context.h" #include "BKE_customdata.h" +#include "BKE_global.h" +#include "BKE_key.h" +#include "BKE_main.h" +#include "BKE_mesh.h" #include "BKE_multires.h" #include "BKE_paint.h" -#include "BKE_key.h" -#include "BKE_mesh.h" #include "BKE_scene.h" -#include "BKE_subsurf.h" #include "BKE_subdiv_ccg.h" +#include "BKE_subsurf.h" #include "BKE_undo_system.h" -#include "BKE_global.h" -#include "BKE_main.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.c b/source/blender/editors/sculpt_paint/sculpt_uv.c index b652c509db9..f364c174f0f 100644 --- a/source/blender/editors/sculpt_paint/sculpt_uv.c +++ b/source/blender/editors/sculpt_paint/sculpt_uv.c @@ -24,14 +24,14 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_math.h" #include "BLI_ghash.h" +#include "BLI_math.h" +#include "BLI_utildefines.h" -#include "DNA_object_types.h" -#include "DNA_scene_types.h" #include "DNA_brush_types.h" #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BKE_brush.h" #include "BKE_colortools.h" @@ -43,9 +43,9 @@ #include "DEG_depsgraph.h" -#include "ED_screen.h" #include "ED_image.h" #include "ED_mesh.h" +#include "ED_screen.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c index 68e9e6d4ced..61abbd10e98 100644 --- a/source/blender/editors/sound/sound_ops.c +++ b/source/blender/editors/sound/sound_ops.c @@ -21,10 +21,10 @@ * \ingroup edsnd */ -#include -#include -#include #include +#include +#include +#include #include "MEM_guardedalloc.h" @@ -33,9 +33,9 @@ #include "DNA_packedFile_types.h" #include "DNA_scene_types.h" -#include "DNA_space_types.h" #include "DNA_sequence_types.h" #include "DNA_sound_types.h" +#include "DNA_space_types.h" #include "DNA_userdef_types.h" #include "BKE_context.h" diff --git a/source/blender/editors/space_action/action_buttons.c b/source/blender/editors/space_action/action_buttons.c index c9c20adcab4..ed49a1ed6d6 100644 --- a/source/blender/editors/space_action/action_buttons.c +++ b/source/blender/editors/space_action/action_buttons.c @@ -21,10 +21,10 @@ * \ingroup spaction */ -#include -#include -#include #include +#include +#include +#include #include "DNA_anim_types.h" #include "DNA_object_types.h" diff --git a/source/blender/editors/space_action/action_data.c b/source/blender/editors/space_action/action_data.c index 228cc77744f..6c2cee4042b 100644 --- a/source/blender/editors/space_action/action_data.c +++ b/source/blender/editors/space_action/action_data.c @@ -21,10 +21,10 @@ * \ingroup spaction */ +#include #include #include #include -#include #include "BLI_utildefines.h" @@ -33,33 +33,33 @@ #include "DNA_anim_types.h" #include "DNA_gpencil_types.h" #include "DNA_key_types.h" +#include "DNA_mask_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_mask_types.h" #include "RNA_access.h" #include "RNA_define.h" #include "RNA_enum_types.h" -#include "BKE_animsys.h" #include "BKE_action.h" +#include "BKE_animsys.h" #include "BKE_context.h" #include "BKE_fcurve.h" #include "BKE_key.h" #include "BKE_lib_id.h" #include "BKE_nla.h" -#include "BKE_scene.h" #include "BKE_report.h" +#include "BKE_scene.h" #include "UI_view2d.h" #include "ED_anim_api.h" #include "ED_gpencil.h" -#include "ED_keyframing.h" #include "ED_keyframes_edit.h" -#include "ED_screen.h" +#include "ED_keyframing.h" #include "ED_markers.h" #include "ED_mask.h" +#include "ED_screen.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_action/action_draw.c b/source/blender/editors/space_action/action_draw.c index 54308553343..75eeb125609 100644 --- a/source/blender/editors/space_action/action_draw.c +++ b/source/blender/editors/space_action/action_draw.c @@ -23,10 +23,10 @@ /* System includes ----------------------------------------------------- */ +#include #include #include #include -#include #include "BLI_blenlib.h" #include "BLI_math.h" @@ -38,8 +38,8 @@ #include "DNA_cachefile_types.h" #include "DNA_gpencil_types.h" #include "DNA_object_types.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" #include "BKE_action.h" #include "BKE_context.h" diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c index d7ad2066561..927e51a3e04 100644 --- a/source/blender/editors/space_action/action_edit.c +++ b/source/blender/editors/space_action/action_edit.c @@ -21,10 +21,10 @@ * \ingroup spaction */ +#include #include #include #include -#include #include "BLI_blenlib.h" #include "BLI_math.h" @@ -35,9 +35,9 @@ #include "DNA_anim_types.h" #include "DNA_gpencil_types.h" #include "DNA_key_types.h" +#include "DNA_mask_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_mask_types.h" #include "RNA_access.h" #include "RNA_define.h" @@ -47,8 +47,8 @@ #include "BKE_animsys.h" #include "BKE_context.h" #include "BKE_fcurve.h" -#include "BKE_gpencil.h" #include "BKE_global.h" +#include "BKE_gpencil.h" #include "BKE_key.h" #include "BKE_nla.h" #include "BKE_report.h" @@ -57,11 +57,11 @@ #include "ED_anim_api.h" #include "ED_gpencil.h" -#include "ED_keyframing.h" #include "ED_keyframes_edit.h" -#include "ED_screen.h" +#include "ED_keyframing.h" #include "ED_markers.h" #include "ED_mask.h" +#include "ED_screen.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_action/action_ops.c b/source/blender/editors/space_action/action_ops.c index 744c6c75463..7422c05511c 100644 --- a/source/blender/editors/space_action/action_ops.c +++ b/source/blender/editors/space_action/action_ops.c @@ -21,16 +21,16 @@ * \ingroup spaction */ -#include #include +#include #include "DNA_space_types.h" #include "ED_anim_api.h" #include "ED_markers.h" -#include "ED_transform.h" #include "ED_object.h" #include "ED_select_utils.h" +#include "ED_transform.h" #include "action_intern.h" diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c index 4322e4277ad..173c2f1b5dc 100644 --- a/source/blender/editors/space_action/action_select.c +++ b/source/blender/editors/space_action/action_select.c @@ -20,10 +20,10 @@ * \ingroup spaction */ +#include #include #include #include -#include #include "MEM_guardedalloc.h" @@ -34,27 +34,27 @@ #include "DNA_anim_types.h" #include "DNA_gpencil_types.h" +#include "DNA_mask_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_mask_types.h" #include "RNA_access.h" #include "RNA_define.h" -#include "BKE_fcurve.h" -#include "BKE_nla.h" #include "BKE_context.h" +#include "BKE_fcurve.h" #include "BKE_gpencil.h" +#include "BKE_nla.h" -#include "UI_view2d.h" #include "UI_interface.h" +#include "UI_view2d.h" #include "ED_anim_api.h" #include "ED_gpencil.h" -#include "ED_mask.h" #include "ED_keyframes_draw.h" #include "ED_keyframes_edit.h" #include "ED_markers.h" +#include "ED_mask.h" #include "ED_screen.h" #include "ED_select_utils.h" diff --git a/source/blender/editors/space_action/space_action.c b/source/blender/editors/space_action/space_action.c index af59b56065c..64c81797bb4 100644 --- a/source/blender/editors/space_action/space_action.c +++ b/source/blender/editors/space_action/space_action.c @@ -21,8 +21,8 @@ * \ingroup spaction */ -#include #include +#include #include "DNA_action_types.h" #include "DNA_collection_types.h" @@ -42,21 +42,21 @@ #include "RNA_enum_types.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "UI_interface.h" #include "UI_resources.h" #include "UI_view2d.h" -#include "ED_space_api.h" -#include "ED_screen.h" #include "ED_anim_api.h" #include "ED_markers.h" +#include "ED_screen.h" +#include "ED_space_api.h" #include "ED_time_scrub_ui.h" -#include "action_intern.h" /* own include */ #include "GPU_framebuffer.h" +#include "action_intern.h" /* own include */ /* ******************** default callbacks for action space ***************** */ diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c index d34b1ccb899..44d64bd750a 100644 --- a/source/blender/editors/space_api/spacetypes.c +++ b/source/blender/editors/space_api/spacetypes.c @@ -38,10 +38,16 @@ #include "ED_anim_api.h" #include "ED_armature.h" +#include "ED_clip.h" #include "ED_curve.h" #include "ED_fileselect.h" +#include "ED_gizmo_library.h" #include "ED_gpencil.h" +#include "ED_lattice.h" +#include "ED_logic.h" #include "ED_markers.h" +#include "ED_mask.h" +#include "ED_mball.h" #include "ED_mesh.h" #include "ED_node.h" #include "ED_object.h" @@ -51,18 +57,12 @@ #include "ED_scene.h" #include "ED_screen.h" #include "ED_sculpt.h" -#include "ED_space_api.h" -#include "ED_sound.h" -#include "ED_uvedit.h" -#include "ED_userpref.h" -#include "ED_lattice.h" -#include "ED_mball.h" -#include "ED_logic.h" -#include "ED_clip.h" -#include "ED_mask.h" #include "ED_sequencer.h" -#include "ED_gizmo_library.h" +#include "ED_sound.h" +#include "ED_space_api.h" #include "ED_transform.h" +#include "ED_userpref.h" +#include "ED_uvedit.h" #include "io_ops.h" diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index 21dfb3df771..587ba5b0b79 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -32,33 +32,33 @@ #include "BLT_translation.h" #include "DNA_armature_types.h" +#include "DNA_brush_types.h" #include "DNA_collection_types.h" #include "DNA_light_types.h" +#include "DNA_linestyle_types.h" #include "DNA_material_types.h" #include "DNA_node_types.h" #include "DNA_scene_types.h" -#include "DNA_world_types.h" -#include "DNA_brush_types.h" -#include "DNA_linestyle_types.h" #include "DNA_windowmanager_types.h" +#include "DNA_world_types.h" -#include "BKE_context.h" #include "BKE_action.h" +#include "BKE_context.h" #include "BKE_layer.h" +#include "BKE_linestyle.h" #include "BKE_material.h" #include "BKE_modifier.h" #include "BKE_paint.h" #include "BKE_particle.h" #include "BKE_screen.h" #include "BKE_texture.h" -#include "BKE_linestyle.h" #include "RNA_access.h" -#include "ED_buttons.h" #include "ED_armature.h" -#include "ED_screen.h" +#include "ED_buttons.h" #include "ED_physics.h" +#include "ED_screen.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/space_buttons/buttons_ops.c b/source/blender/editors/space_buttons/buttons_ops.c index 3ea6d183969..b393311e1fd 100644 --- a/source/blender/editors/space_buttons/buttons_ops.c +++ b/source/blender/editors/space_buttons/buttons_ops.c @@ -28,10 +28,10 @@ #include "DNA_userdef_types.h" -#include "BLI_utildefines.h" #include "BLI_fileops.h" #include "BLI_path_util.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/editors/space_buttons/buttons_texture.c b/source/blender/editors/space_buttons/buttons_texture.c index 03c8fbb4e66..00818ac77b5 100644 --- a/source/blender/editors/space_buttons/buttons_texture.c +++ b/source/blender/editors/space_buttons/buttons_texture.c @@ -32,23 +32,23 @@ #include "BLT_translation.h" -#include "DNA_brush_types.h" #include "DNA_ID.h" +#include "DNA_brush_types.h" +#include "DNA_linestyle_types.h" #include "DNA_node_types.h" -#include "DNA_object_types.h" #include "DNA_object_force_types.h" +#include "DNA_object_types.h" #include "DNA_particle_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "DNA_linestyle_types.h" #include "DNA_windowmanager_types.h" #include "BKE_context.h" +#include "BKE_gpencil_modifier.h" #include "BKE_layer.h" #include "BKE_linestyle.h" #include "BKE_modifier.h" -#include "BKE_gpencil_modifier.h" #include "BKE_node.h" #include "BKE_paint.h" #include "BKE_particle.h" diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c index 6d4cb65522e..2fd54db667b 100644 --- a/source/blender/editors/space_buttons/space_buttons.c +++ b/source/blender/editors/space_buttons/space_buttons.c @@ -21,8 +21,8 @@ * \ingroup spbuttons */ -#include #include +#include #include "MEM_guardedalloc.h" @@ -32,13 +32,13 @@ #include "BKE_context.h" #include "BKE_screen.h" -#include "ED_space_api.h" #include "ED_screen.h" +#include "ED_space_api.h" #include "ED_view3d.h" /* To draw toolbar UI. */ #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_clip/clip_buttons.c b/source/blender/editors/space_clip/clip_buttons.c index 6b9d3fd054a..dc85b3959e1 100644 --- a/source/blender/editors/space_clip/clip_buttons.c +++ b/source/blender/editors/space_clip/clip_buttons.c @@ -21,8 +21,8 @@ * \ingroup spclip */ -#include #include +#include #include "MEM_guardedalloc.h" @@ -30,17 +30,17 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "BLI_utildefines.h" #include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_path_util.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" #include "BKE_context.h" -#include "BKE_screen.h" #include "BKE_movieclip.h" +#include "BKE_screen.h" #include "BKE_tracking.h" #include "DEG_depsgraph.h" @@ -57,8 +57,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "clip_intern.h" /* own include */ diff --git a/source/blender/editors/space_clip/clip_dopesheet_draw.c b/source/blender/editors/space_clip/clip_dopesheet_draw.c index 72c140011a9..eba0f33d6cc 100644 --- a/source/blender/editors/space_clip/clip_dopesheet_draw.c +++ b/source/blender/editors/space_clip/clip_dopesheet_draw.c @@ -24,15 +24,15 @@ #include "DNA_movieclip_types.h" #include "DNA_scene_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" #include "BLI_rect.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_movieclip.h" -#include "ED_screen.h" #include "ED_clip.h" +#include "ED_screen.h" #include "WM_types.h" diff --git a/source/blender/editors/space_clip/clip_dopesheet_ops.c b/source/blender/editors/space_clip/clip_dopesheet_ops.c index fbe92195a65..cd95a00c62a 100644 --- a/source/blender/editors/space_clip/clip_dopesheet_ops.c +++ b/source/blender/editors/space_clip/clip_dopesheet_ops.c @@ -23,9 +23,9 @@ #include "DNA_scene_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" #include "BLI_rect.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_tracking.h" @@ -33,8 +33,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_screen.h" #include "ED_clip.h" +#include "ED_screen.h" #include "UI_interface.h" diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c index 45502d1eb81..2a6cf4d5a55 100644 --- a/source/blender/editors/space_clip/clip_draw.c +++ b/source/blender/editors/space_clip/clip_draw.c @@ -28,24 +28,24 @@ #include "MEM_guardedalloc.h" #include "IMB_colormanagement.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" -#include "BLI_string.h" #include "BLI_math_base.h" #include "BLI_rect.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_image.h" #include "BKE_movieclip.h" #include "BKE_tracking.h" -#include "ED_screen.h" #include "ED_clip.h" -#include "ED_mask.h" #include "ED_gpencil.h" +#include "ED_mask.h" +#include "ED_screen.h" #include "BIF_glutil.h" diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c index 1ac4e4a81a7..6336f1bff3a 100644 --- a/source/blender/editors/space_clip/clip_editor.c +++ b/source/blender/editors/space_clip/clip_editor.c @@ -21,10 +21,10 @@ * \ingroup spclip */ -#include #include -#include #include +#include +#include #ifndef WIN32 # include @@ -36,11 +36,11 @@ #include "DNA_mask_types.h" -#include "BLI_utildefines.h" #include "BLI_fileops.h" #include "BLI_math.h" #include "BLI_rect.h" #include "BLI_task.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_global.h" @@ -51,12 +51,12 @@ #include "BKE_tracking.h" #include "IMB_colormanagement.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" -#include "ED_screen.h" #include "ED_clip.h" #include "ED_mask.h" +#include "ED_screen.h" #include "ED_select_utils.h" #include "WM_api.h" diff --git a/source/blender/editors/space_clip/clip_graph_draw.c b/source/blender/editors/space_clip/clip_graph_draw.c index 10bf8d93983..7f3d3f3d651 100644 --- a/source/blender/editors/space_clip/clip_graph_draw.c +++ b/source/blender/editors/space_clip/clip_graph_draw.c @@ -24,15 +24,15 @@ #include "DNA_movieclip_types.h" #include "DNA_scene_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_movieclip.h" #include "BKE_tracking.h" -#include "ED_screen.h" #include "ED_clip.h" +#include "ED_screen.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" diff --git a/source/blender/editors/space_clip/clip_graph_ops.c b/source/blender/editors/space_clip/clip_graph_ops.c index 9547c65ffab..e974480a233 100644 --- a/source/blender/editors/space_clip/clip_graph_ops.c +++ b/source/blender/editors/space_clip/clip_graph_ops.c @@ -23,9 +23,9 @@ #include "DNA_scene_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" #include "BLI_rect.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_tracking.h" @@ -35,9 +35,9 @@ #include "WM_api.h" #include "WM_types.h" +#include "ED_clip.h" #include "ED_screen.h" #include "ED_select_utils.h" -#include "ED_clip.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c index 0f978b38e60..efc8c3bb7dd 100644 --- a/source/blender/editors/space_clip/clip_ops.c +++ b/source/blender/editors/space_clip/clip_ops.c @@ -22,8 +22,8 @@ */ #include -#include #include +#include #ifndef WIN32 # include @@ -33,16 +33,16 @@ #include "MEM_guardedalloc.h" -#include "DNA_userdef_types.h" #include "DNA_scene_types.h" /* min/max frames */ +#include "DNA_userdef_types.h" -#include "BLI_utildefines.h" #include "BLI_fileops.h" -#include "BLI_path_util.h" #include "BLI_math.h" +#include "BLI_path_util.h" #include "BLI_rect.h" -#include "BLI_task.h" #include "BLI_string.h" +#include "BLI_task.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -57,11 +57,11 @@ #include "WM_api.h" #include "WM_types.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" -#include "ED_screen.h" #include "ED_clip.h" +#include "ED_screen.h" #include "UI_interface.h" diff --git a/source/blender/editors/space_clip/clip_toolbar.c b/source/blender/editors/space_clip/clip_toolbar.c index 4c4110759cd..1e3911863fc 100644 --- a/source/blender/editors/space_clip/clip_toolbar.c +++ b/source/blender/editors/space_clip/clip_toolbar.c @@ -38,8 +38,8 @@ #include "RNA_access.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "ED_screen.h" #include "ED_undo.h" diff --git a/source/blender/editors/space_clip/clip_utils.c b/source/blender/editors/space_clip/clip_utils.c index 902229c0bba..4a0df454a78 100644 --- a/source/blender/editors/space_clip/clip_utils.c +++ b/source/blender/editors/space_clip/clip_utils.c @@ -25,9 +25,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_listbase.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_animsys.h" #include "BKE_context.h" @@ -43,8 +43,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_screen.h" #include "ED_clip.h" +#include "ED_screen.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c index 3256ee3eb73..a273487eee9 100644 --- a/source/blender/editors/space_clip/space_clip.c +++ b/source/blender/editors/space_clip/space_clip.c @@ -21,43 +21,43 @@ * \ingroup spclip */ -#include #include +#include -#include "DNA_scene_types.h" #include "DNA_mask_types.h" #include "DNA_movieclip_types.h" +#include "DNA_scene_types.h" #include "DNA_view3d_types.h" /* for pivot point */ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_lib_id.h" #include "BKE_movieclip.h" -#include "BKE_tracking.h" #include "BKE_screen.h" +#include "BKE_tracking.h" #include "IMB_imbuf_types.h" #include "ED_anim_api.h" /* for timeline cursor drawing */ -#include "ED_mask.h" -#include "ED_space_api.h" -#include "ED_screen.h" -#include "ED_time_scrub_ui.h" -#include "ED_select_utils.h" #include "ED_clip.h" +#include "ED_mask.h" +#include "ED_screen.h" +#include "ED_select_utils.h" +#include "ED_space_api.h" +#include "ED_time_scrub_ui.h" #include "ED_transform.h" #include "ED_uvedit.h" /* just for ED_image_draw_cursor */ #include "IMB_imbuf.h" +#include "GPU_framebuffer.h" #include "GPU_glew.h" #include "GPU_matrix.h" -#include "GPU_framebuffer.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index 3c25be9fe1e..f88f6113b54 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -26,23 +26,23 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "BLI_utildefines.h" +#include "BLI_blenlib.h" #include "BLI_ghash.h" #include "BLI_math.h" -#include "BLI_blenlib.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_movieclip.h" -#include "BKE_tracking.h" #include "BKE_report.h" +#include "BKE_tracking.h" #include "DEG_depsgraph.h" #include "WM_api.h" #include "WM_types.h" -#include "ED_screen.h" #include "ED_clip.h" +#include "ED_screen.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_clip/tracking_ops_detect.c b/source/blender/editors/space_clip/tracking_ops_detect.c index a9c97258def..dd620e85324 100644 --- a/source/blender/editors/space_clip/tracking_ops_detect.c +++ b/source/blender/editors/space_clip/tracking_ops_detect.c @@ -31,16 +31,16 @@ #include "BKE_context.h" #include "BKE_movieclip.h" -#include "BKE_tracking.h" #include "BKE_report.h" +#include "BKE_tracking.h" #include "WM_api.h" #include "WM_types.h" #include "ED_clip.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_clip/tracking_ops_orient.c b/source/blender/editors/space_clip/tracking_ops_orient.c index 8bc77cf82cb..25e30c116c5 100644 --- a/source/blender/editors/space_clip/tracking_ops_orient.c +++ b/source/blender/editors/space_clip/tracking_ops_orient.c @@ -28,15 +28,15 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" -#include "BKE_context.h" #include "BKE_constraint.h" -#include "BKE_tracking.h" +#include "BKE_context.h" #include "BKE_layer.h" #include "BKE_object.h" #include "BKE_report.h" +#include "BKE_tracking.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/space_clip/tracking_ops_plane.c b/source/blender/editors/space_clip/tracking_ops_plane.c index 329dc8be894..0cf0e85929c 100644 --- a/source/blender/editors/space_clip/tracking_ops_plane.c +++ b/source/blender/editors/space_clip/tracking_ops_plane.c @@ -26,12 +26,12 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_context.h" -#include "BKE_tracking.h" #include "BKE_report.h" +#include "BKE_tracking.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/space_clip/tracking_ops_solve.c b/source/blender/editors/space_clip/tracking_ops_solve.c index b6c5c087025..c18207d7045 100644 --- a/source/blender/editors/space_clip/tracking_ops_solve.c +++ b/source/blender/editors/space_clip/tracking_ops_solve.c @@ -28,8 +28,8 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "BLI_utildefines.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_global.h" diff --git a/source/blender/editors/space_clip/tracking_ops_track.c b/source/blender/editors/space_clip/tracking_ops_track.c index f579b2a08e2..c14895f8483 100644 --- a/source/blender/editors/space_clip/tracking_ops_track.c +++ b/source/blender/editors/space_clip/tracking_ops_track.c @@ -23,21 +23,21 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" -#include "BKE_main.h" #include "BKE_context.h" -#include "BKE_movieclip.h" -#include "BKE_tracking.h" #include "BKE_global.h" +#include "BKE_main.h" +#include "BKE_movieclip.h" #include "BKE_report.h" +#include "BKE_tracking.h" #include "WM_api.h" #include "WM_types.h" -#include "ED_screen.h" #include "ED_clip.h" +#include "ED_screen.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_clip/tracking_select.c b/source/blender/editors/space_clip/tracking_select.c index 36e529e47d0..2166cff4883 100644 --- a/source/blender/editors/space_clip/tracking_select.c +++ b/source/blender/editors/space_clip/tracking_select.c @@ -26,10 +26,10 @@ #include "DNA_movieclip_types.h" #include "DNA_scene_types.h" -#include "BLI_utildefines.h" +#include "BLI_lasso_2d.h" #include "BLI_math.h" #include "BLI_rect.h" -#include "BLI_lasso_2d.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_tracking.h" @@ -49,8 +49,8 @@ #include "DEG_depsgraph.h" -#include "tracking_ops_intern.h" /* own include */ #include "clip_intern.h" /* own include */ +#include "tracking_ops_intern.h" /* own include */ static float dist_to_crns(float co[2], float pos[2], float crns[4][2]); diff --git a/source/blender/editors/space_console/console_draw.c b/source/blender/editors/space_console/console_draw.c index ee1496c96bb..6c56e8dfb79 100644 --- a/source/blender/editors/space_console/console_draw.c +++ b/source/blender/editors/space_console/console_draw.c @@ -23,8 +23,8 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "DNA_space_types.h" #include "DNA_screen_types.h" +#include "DNA_space_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/space_console/console_ops.c b/source/blender/editors/space_console/console_ops.c index abb566aa39b..58d6fb425b0 100644 --- a/source/blender/editors/space_console/console_ops.c +++ b/source/blender/editors/space_console/console_ops.c @@ -18,30 +18,30 @@ * \ingroup spconsole */ +#include /* ispunct */ #include #include -#include /* ispunct */ #include #include "MEM_guardedalloc.h" #include "DNA_userdef_types.h" -#include "BLI_utildefines.h" +#include "BLI_dynstr.h" #include "BLI_listbase.h" +#include "BLI_math.h" +#include "BLI_string.h" #include "BLI_string_cursor_utf8.h" #include "BLI_string_utf8.h" -#include "BLI_string.h" -#include "BLI_dynstr.h" -#include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "WM_api.h" #include "WM_types.h" -#include "UI_view2d.h" #include "ED_screen.h" +#include "UI_view2d.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_console/space_console.c b/source/blender/editors/space_console/space_console.c index eb83f9963b0..66aa92275b4 100644 --- a/source/blender/editors/space_console/space_console.c +++ b/source/blender/editors/space_console/space_console.c @@ -18,20 +18,20 @@ * \ingroup spconsole */ -#include #include +#include #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BKE_global.h" #include "BKE_context.h" +#include "BKE_global.h" #include "BKE_screen.h" -#include "ED_space_api.h" #include "ED_screen.h" +#include "ED_space_api.h" #include "RNA_access.h" @@ -41,8 +41,8 @@ #include "UI_resources.h" #include "UI_view2d.h" -#include "console_intern.h" // own include #include "GPU_framebuffer.h" +#include "console_intern.h" // own include /* ******************** default callbacks for console space ***************** */ diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c index d7682a41570..5f5aced292d 100644 --- a/source/blender/editors/space_file/file_draw.c +++ b/source/blender/editors/space_file/file_draw.c @@ -21,14 +21,14 @@ * \ingroup spfile */ +#include #include #include -#include #include "BLI_blenlib.h" #include "BLI_fileops_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #ifdef WIN32 # include "BLI_winstuff.h" diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index 169abfb9a10..c17ca31a7df 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -40,8 +40,8 @@ # include "BLI_winstuff.h" #endif -#include "ED_screen.h" #include "ED_fileselect.h" +#include "ED_screen.h" #include "ED_select_utils.h" #include "UI_interface.h" @@ -62,11 +62,11 @@ #include "filelist.h" #include "fsmenu.h" -#include -#include -#include #include #include +#include +#include +#include /* ---------- FILE SELECTION ------------ */ static FileSelection find_file_mouse_rect(SpaceFile *sfile, diff --git a/source/blender/editors/space_file/file_utils.c b/source/blender/editors/space_file/file_utils.c index 61ddd7d63f2..452f2f704cf 100644 --- a/source/blender/editors/space_file/file_utils.c +++ b/source/blender/editors/space_file/file_utils.c @@ -18,15 +18,15 @@ * \ingroup spfile */ -#include "BLI_rect.h" #include "BLI_listbase.h" +#include "BLI_rect.h" #include "BLO_readfile.h" #include "BKE_context.h" -#include "ED_screen.h" #include "ED_fileselect.h" +#include "ED_screen.h" #include "WM_types.h" diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index 1fc0866bd9f..6bbe54e2f5c 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -23,8 +23,8 @@ /* global includes */ -#include #include +#include #include #include #include @@ -32,8 +32,8 @@ #ifndef WIN32 # include #else -# include # include +# include #endif #include "MEM_guardedalloc.h" @@ -75,8 +75,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "UI_resources.h" #include "UI_interface_icons.h" +#include "UI_resources.h" #include "atomic_ops.h" diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c index 6c0f79f0f5c..67c0fae3565 100644 --- a/source/blender/editors/space_file/filesel.c +++ b/source/blender/editors/space_file/filesel.c @@ -21,33 +21,33 @@ * \ingroup spfile */ -#include -#include #include +#include +#include #include #include /* path/file handling stuff */ #ifdef WIN32 -# include -# include # include "BLI_winstuff.h" +# include +# include #else -# include -# include # include +# include +# include #endif -#include "DNA_space_types.h" #include "DNA_screen_types.h" +#include "DNA_space_types.h" #include "DNA_userdef_types.h" #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_fnmatch.h" +#include "BLI_utildefines.h" #include "BLO_readfile.h" diff --git a/source/blender/editors/space_file/fsmenu.c b/source/blender/editors/space_file/fsmenu.c index 4f3fc997074..08b800df7dd 100644 --- a/source/blender/editors/space_file/fsmenu.c +++ b/source/blender/editors/space_file/fsmenu.c @@ -21,16 +21,16 @@ * \ingroup spfile */ +#include +#include #include #include -#include -#include #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_blenlib.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -43,22 +43,22 @@ # include /* For SHGetSpecialFolderPath, has to be done before BLI_winstuff * because 'near' is disabled through BLI_windstuff. */ -# include # include "BLI_winstuff.h" +# include #endif -#include "WM_api.h" -#include "WM_types.h" #include "UI_interface_icons.h" #include "UI_resources.h" +#include "WM_api.h" +#include "WM_types.h" #ifdef __APPLE__ # include #endif /* __APPLE__ */ #ifdef __linux__ -# include # include "BLI_fileops_types.h" +# include #endif #include "fsmenu.h" /* include ourselves */ diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c index 50ee64da9c8..c3159d38e7e 100644 --- a/source/blender/editors/space_file/space_file.c +++ b/source/blender/editors/space_file/space_file.c @@ -21,8 +21,8 @@ * \ingroup spfile */ -#include #include +#include #include "MEM_guardedalloc.h" @@ -31,18 +31,18 @@ #include "BKE_appdir.h" #include "BKE_context.h" -#include "BKE_screen.h" #include "BKE_global.h" +#include "BKE_screen.h" #include "RNA_access.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" -#include "ED_space_api.h" -#include "ED_screen.h" #include "ED_fileselect.h" +#include "ED_screen.h" +#include "ED_space_api.h" #include "IMB_imbuf_types.h" #include "IMB_thumbs.h" @@ -50,10 +50,10 @@ #include "UI_resources.h" #include "UI_view2d.h" -#include "file_intern.h" // own include -#include "fsmenu.h" -#include "filelist.h" #include "GPU_framebuffer.h" +#include "file_intern.h" // own include +#include "filelist.h" +#include "fsmenu.h" static ARegion *file_execute_region_ensure(ScrArea *sa, ARegion *ar_prev) { diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c index e1edb07ab68..c2aa74a695e 100644 --- a/source/blender/editors/space_graph/graph_buttons.c +++ b/source/blender/editors/space_graph/graph_buttons.c @@ -21,10 +21,10 @@ * \ingroup spgraph */ -#include -#include -#include #include +#include +#include +#include #include "DNA_anim_types.h" #include "DNA_object_types.h" @@ -32,8 +32,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLT_translation.h" @@ -42,8 +42,8 @@ #include "BKE_context.h" #include "BKE_curve.h" #include "BKE_fcurve.h" -#include "BKE_main.h" #include "BKE_global.h" +#include "BKE_main.h" #include "BKE_screen.h" #include "BKE_unit.h" diff --git a/source/blender/editors/space_graph/graph_draw.c b/source/blender/editors/space_graph/graph_draw.c index f86ca60cefe..eac87caf777 100644 --- a/source/blender/editors/space_graph/graph_draw.c +++ b/source/blender/editors/space_graph/graph_draw.c @@ -20,10 +20,10 @@ * \ingroup spgraph */ -#include -#include -#include #include +#include +#include +#include #include "BLI_blenlib.h" #include "BLI_math.h" @@ -32,8 +32,8 @@ #include "DNA_anim_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "DNA_windowmanager_types.h" #include "DNA_userdef_types.h" +#include "DNA_windowmanager_types.h" #include "BKE_context.h" #include "BKE_curve.h" diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c index e9f9249e608..8c64fb5bb40 100644 --- a/source/blender/editors/space_graph/graph_edit.c +++ b/source/blender/editors/space_graph/graph_edit.c @@ -21,10 +21,10 @@ * \ingroup spgraph */ +#include #include #include #include -#include #ifdef WITH_AUDASPACE # include @@ -54,16 +54,16 @@ #include "DEG_depsgraph_build.h" -#include "UI_view2d.h" #include "UI_interface.h" +#include "UI_view2d.h" #include "ED_anim_api.h" -#include "ED_keyframing.h" #include "ED_keyframes_edit.h" +#include "ED_keyframing.h" +#include "ED_markers.h" #include "ED_numinput.h" #include "ED_screen.h" #include "ED_transform.h" -#include "ED_markers.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_graph/graph_ops.c b/source/blender/editors/space_graph/graph_ops.c index 344688bbd21..de25a2d990d 100644 --- a/source/blender/editors/space_graph/graph_ops.c +++ b/source/blender/editors/space_graph/graph_ops.c @@ -21,14 +21,14 @@ * \ingroup spgraph */ -#include #include +#include #include "DNA_scene_types.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math_base.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_global.h" @@ -38,10 +38,10 @@ #include "ED_anim_api.h" #include "ED_markers.h" +#include "ED_object.h" #include "ED_screen.h" #include "ED_select_utils.h" #include "ED_transform.h" -#include "ED_object.h" #include "graph_intern.h" diff --git a/source/blender/editors/space_graph/graph_select.c b/source/blender/editors/space_graph/graph_select.c index 94870cf0d81..a2e9ba86dec 100644 --- a/source/blender/editors/space_graph/graph_select.c +++ b/source/blender/editors/space_graph/graph_select.c @@ -20,29 +20,29 @@ * \ingroup spgraph */ +#include #include #include #include -#include #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" +#include "BLI_lasso_2d.h" #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BLI_lasso_2d.h" #include "DNA_anim_types.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" #include "DNA_space_types.h" #include "RNA_access.h" #include "RNA_define.h" +#include "BKE_context.h" #include "BKE_fcurve.h" #include "BKE_nla.h" -#include "BKE_context.h" #include "UI_view2d.h" diff --git a/source/blender/editors/space_graph/graph_utils.c b/source/blender/editors/space_graph/graph_utils.c index b95ab48189c..0af94904ba6 100644 --- a/source/blender/editors/space_graph/graph_utils.c +++ b/source/blender/editors/space_graph/graph_utils.c @@ -21,14 +21,14 @@ * \ingroup spgraph */ -#include -#include -#include #include +#include +#include +#include #include "DNA_anim_types.h" -#include "DNA_space_types.h" #include "DNA_screen_types.h" +#include "DNA_space_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/space_graph/space_graph.c b/source/blender/editors/space_graph/space_graph.c index 330d309411e..05edfccd6a8 100644 --- a/source/blender/editors/space_graph/space_graph.c +++ b/source/blender/editors/space_graph/space_graph.c @@ -21,8 +21,8 @@ * \ingroup spgraph */ -#include #include +#include #include "DNA_anim_types.h" #include "DNA_collection_types.h" @@ -38,27 +38,27 @@ #include "BKE_fcurve.h" #include "BKE_screen.h" -#include "ED_space_api.h" -#include "ED_screen.h" #include "ED_anim_api.h" #include "ED_markers.h" +#include "ED_screen.h" +#include "ED_space_api.h" #include "ED_time_scrub_ui.h" +#include "GPU_framebuffer.h" #include "GPU_immediate.h" #include "GPU_state.h" -#include "GPU_framebuffer.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "RNA_access.h" #include "RNA_define.h" #include "RNA_enum_types.h" +#include "UI_interface.h" #include "UI_resources.h" #include "UI_view2d.h" -#include "UI_interface.h" #include "graph_intern.h" // own include diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index 54bd2f37f3a..873091bd68d 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -21,8 +21,8 @@ * \ingroup spimage */ -#include #include +#include #include "DNA_node_types.h" #include "DNA_scene_types.h" @@ -37,8 +37,8 @@ #include "BKE_context.h" #include "BKE_image.h" #include "BKE_node.h" -#include "BKE_screen.h" #include "BKE_scene.h" +#include "BKE_screen.h" #include "RE_pipeline.h" @@ -47,8 +47,8 @@ #include "IMB_imbuf_types.h" #include "ED_gpencil.h" -#include "ED_screen.h" #include "ED_image.h" +#include "ED_screen.h" #include "RNA_access.h" diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c index d1b2c2330ac..a58abb2fbd5 100644 --- a/source/blender/editors/space_image/image_draw.c +++ b/source/blender/editors/space_image/image_draw.c @@ -27,26 +27,26 @@ #include "MEM_guardedalloc.h" +#include "DNA_brush_types.h" #include "DNA_camera_types.h" +#include "DNA_mask_types.h" #include "DNA_object_types.h" -#include "DNA_space_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" -#include "DNA_brush_types.h" -#include "DNA_mask_types.h" +#include "DNA_space_types.h" #include "PIL_time.h" #include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_rect.h" -#include "BLI_threads.h" #include "BLI_string.h" +#include "BLI_threads.h" #include "BLI_utildefines.h" +#include "IMB_colormanagement.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "IMB_colormanagement.h" #include "IMB_moviecache.h" #include "BKE_context.h" @@ -72,8 +72,8 @@ #include "UI_resources.h" #include "UI_view2d.h" -#include "RE_pipeline.h" #include "RE_engine.h" +#include "RE_pipeline.h" #include "image_intern.h" diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c index 9d07780f756..99190fa2d39 100644 --- a/source/blender/editors/space_image/image_edit.c +++ b/source/blender/editors/space_image/image_edit.c @@ -26,8 +26,8 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_rect.h" #include "BLI_listbase.h" +#include "BLI_rect.h" #include "BKE_colortools.h" #include "BKE_context.h" diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 395329e5f6e..0f823933c24 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -21,11 +21,11 @@ * \ingroup spimage */ -#include -#include -#include -#include #include +#include +#include +#include +#include #ifndef WIN32 # include #else @@ -46,31 +46,31 @@ #include "BLT_translation.h" #include "DNA_camera_types.h" -#include "DNA_object_types.h" #include "DNA_node_types.h" +#include "DNA_object_types.h" #include "DNA_packedFile_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "BKE_colortools.h" #include "BKE_context.h" +#include "BKE_global.h" #include "BKE_icons.h" #include "BKE_image.h" #include "BKE_image_save.h" -#include "BKE_global.h" #include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_packedFile.h" #include "BKE_paint.h" #include "BKE_report.h" -#include "BKE_screen.h" #include "BKE_scene.h" +#include "BKE_screen.h" #include "DEG_depsgraph.h" #include "GPU_draw.h" -#include "GPU_state.h" #include "GPU_immediate.h" +#include "GPU_state.h" #include "IMB_colormanagement.h" #include "IMB_imbuf.h" @@ -90,8 +90,8 @@ #include "ED_render.h" #include "ED_screen.h" #include "ED_space_api.h" -#include "ED_uvedit.h" #include "ED_util.h" +#include "ED_uvedit.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/space_image/image_undo.c b/source/blender/editors/space_image/image_undo.c index eac330b4ff2..1394c05d7bc 100644 --- a/source/blender/editors/space_image/image_undo.c +++ b/source/blender/editors/space_image/image_undo.c @@ -34,16 +34,16 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" +#include "BLI_math.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include "DNA_image_types.h" -#include "DNA_windowmanager_types.h" #include "DNA_object_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" +#include "DNA_windowmanager_types.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" @@ -55,10 +55,10 @@ #include "DEG_depsgraph.h" +#include "ED_object.h" #include "ED_paint.h" #include "ED_undo.h" #include "ED_util.h" -#include "ED_object.h" #include "GPU_draw.h" diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index 1fff40ab73a..a9cbebc5655 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -22,12 +22,12 @@ */ #include "DNA_gpencil_types.h" -#include "DNA_mesh_types.h" +#include "DNA_image_types.h" #include "DNA_mask_types.h" +#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_image_types.h" #include "MEM_guardedalloc.h" @@ -59,23 +59,23 @@ #include "ED_mesh.h" #include "ED_node.h" #include "ED_render.h" -#include "ED_space_api.h" #include "ED_screen.h" -#include "ED_uvedit.h" +#include "ED_space_api.h" #include "ED_transform.h" +#include "ED_uvedit.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" -#include "UI_resources.h" #include "UI_interface.h" +#include "UI_resources.h" #include "UI_view2d.h" -#include "image_intern.h" -#include "GPU_framebuffer.h" #include "GPU_batch_presets.h" +#include "GPU_framebuffer.h" #include "GPU_viewport.h" +#include "image_intern.h" /* TODO(fclem) remove bad level calls */ #include "../draw/DRW_engine.h" diff --git a/source/blender/editors/space_info/info_draw.c b/source/blender/editors/space_info/info_draw.c index 60170276a16..2a3f6d6e365 100644 --- a/source/blender/editors/space_info/info_draw.c +++ b/source/blender/editors/space_info/info_draw.c @@ -21,23 +21,23 @@ * \ingroup spinfo */ -#include #include +#include #include "BLI_utildefines.h" -#include "DNA_space_types.h" #include "DNA_screen_types.h" +#include "DNA_space_types.h" #include "BKE_report.h" -#include "UI_resources.h" #include "UI_interface.h" +#include "UI_resources.h" #include "UI_view2d.h" +#include "GPU_framebuffer.h" #include "info_intern.h" #include "textview.h" -#include "GPU_framebuffer.h" static enum eTextViewContext_LineFlag report_line_data(TextViewContext *tvc, uchar fg[4], diff --git a/source/blender/editors/space_info/info_ops.c b/source/blender/editors/space_info/info_ops.c index 430cd95cdd2..30f36509b41 100644 --- a/source/blender/editors/space_info/info_ops.c +++ b/source/blender/editors/space_info/info_ops.c @@ -21,8 +21,8 @@ * \ingroup spinfo */ -#include #include +#include #include "DNA_packedFile_types.h" #include "DNA_space_types.h" diff --git a/source/blender/editors/space_info/info_report.c b/source/blender/editors/space_info/info_report.c index 303e2bbaec9..7499c057950 100644 --- a/source/blender/editors/space_info/info_report.c +++ b/source/blender/editors/space_info/info_report.c @@ -18,9 +18,9 @@ * \ingroup spinfo */ +#include #include #include -#include #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/space_info/info_stats.c b/source/blender/editors/space_info/info_stats.c index dd74e1a8ccc..78bc0961cb3 100644 --- a/source/blender/editors/space_info/info_stats.c +++ b/source/blender/editors/space_info/info_stats.c @@ -44,21 +44,21 @@ #include "BKE_blender_version.h" #include "BKE_curve.h" #include "BKE_displist.h" +#include "BKE_editmesh.h" +#include "BKE_gpencil.h" #include "BKE_key.h" #include "BKE_layer.h" #include "BKE_main.h" +#include "BKE_object.h" #include "BKE_paint.h" #include "BKE_particle.h" -#include "BKE_editmesh.h" -#include "BKE_object.h" -#include "BKE_gpencil.h" #include "BKE_scene.h" #include "BKE_subdiv_ccg.h" #include "DEG_depsgraph_query.h" -#include "ED_info.h" #include "ED_armature.h" +#include "ED_info.h" #include "GPU_extensions.h" diff --git a/source/blender/editors/space_info/space_info.c b/source/blender/editors/space_info/space_info.c index 789a0d8ea08..58ce3316c4b 100644 --- a/source/blender/editors/space_info/space_info.c +++ b/source/blender/editors/space_info/space_info.c @@ -21,8 +21,8 @@ * \ingroup spinfo */ -#include #include +#include #include "MEM_guardedalloc.h" @@ -34,22 +34,22 @@ #include "BKE_context.h" #include "BKE_screen.h" -#include "ED_space_api.h" #include "ED_screen.h" +#include "ED_space_api.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "RNA_access.h" -#include "UI_resources.h" #include "UI_interface.h" +#include "UI_resources.h" #include "UI_view2d.h" -#include "info_intern.h" /* own include */ #include "BLO_readfile.h" #include "GPU_framebuffer.h" +#include "info_intern.h" /* own include */ /* ******************** default callbacks for info space ***************** */ diff --git a/source/blender/editors/space_info/textview.c b/source/blender/editors/space_info/textview.c index d7f2cb9ce1f..d9af8555f04 100644 --- a/source/blender/editors/space_info/textview.c +++ b/source/blender/editors/space_info/textview.c @@ -23,8 +23,8 @@ #include "BLF_api.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_string_utf8.h" +#include "BLI_utildefines.h" #include "GPU_immediate.h" #include "GPU_state.h" diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index 315fa1d12aa..ca7f8791f75 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -21,10 +21,10 @@ * \ingroup spnla */ -#include -#include -#include #include +#include +#include +#include #include "DNA_anim_types.h" @@ -36,8 +36,8 @@ #include "BLT_translation.h" -#include "BKE_nla.h" #include "BKE_context.h" +#include "BKE_nla.h" #include "BKE_screen.h" #include "WM_api.h" diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c index b97267dc2a8..a69aed38cab 100644 --- a/source/blender/editors/space_nla/nla_channels.c +++ b/source/blender/editors/space_nla/nla_channels.c @@ -21,10 +21,10 @@ * \ingroup spnla */ -#include +#include #include #include -#include +#include #include "DNA_anim_types.h" #include "DNA_object_types.h" @@ -34,12 +34,12 @@ #include "BLI_utildefines.h" #include "BKE_animsys.h" -#include "BKE_nla.h" #include "BKE_context.h" #include "BKE_global.h" +#include "BKE_nla.h" +#include "BKE_report.h" #include "BKE_scene.h" #include "BKE_screen.h" -#include "BKE_report.h" #include "ED_anim_api.h" #include "ED_keyframes_edit.h" diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c index 56176c1cb92..4ccf752a916 100644 --- a/source/blender/editors/space_nla/nla_draw.c +++ b/source/blender/editors/space_nla/nla_draw.c @@ -21,11 +21,11 @@ * \ingroup spnla */ -#include +#include +#include #include #include -#include -#include +#include #include "DNA_anim_types.h" #include "DNA_node_types.h" @@ -37,9 +37,9 @@ #include "BLI_dlrbTree.h" #include "BLI_utildefines.h" +#include "BKE_context.h" #include "BKE_fcurve.h" #include "BKE_nla.h" -#include "BKE_context.h" #include "BKE_screen.h" #include "ED_anim_api.h" @@ -55,8 +55,8 @@ #include "UI_resources.h" #include "UI_view2d.h" -#include "nla_private.h" #include "nla_intern.h" /* own include */ +#include "nla_private.h" /* *********************************************** */ /* Strips */ diff --git a/source/blender/editors/space_nla/nla_edit.c b/source/blender/editors/space_nla/nla_edit.c index f15e26e1b0d..2427001657a 100644 --- a/source/blender/editors/space_nla/nla_edit.c +++ b/source/blender/editors/space_nla/nla_edit.c @@ -21,9 +21,9 @@ * \ingroup spnla */ -#include -#include #include +#include +#include #include "DNA_anim_types.h" #include "DNA_object_types.h" diff --git a/source/blender/editors/space_nla/nla_ops.c b/source/blender/editors/space_nla/nla_ops.c index 55470388e22..2e32c496170 100644 --- a/source/blender/editors/space_nla/nla_ops.c +++ b/source/blender/editors/space_nla/nla_ops.c @@ -21,8 +21,8 @@ * \ingroup spnla */ -#include #include +#include #include "DNA_scene_types.h" diff --git a/source/blender/editors/space_nla/nla_select.c b/source/blender/editors/space_nla/nla_select.c index b8d5b17e26c..09abfc300c7 100644 --- a/source/blender/editors/space_nla/nla_select.c +++ b/source/blender/editors/space_nla/nla_select.c @@ -21,8 +21,8 @@ * \ingroup spnla */ -#include #include +#include #include "DNA_anim_types.h" #include "DNA_scene_types.h" @@ -31,8 +31,8 @@ #include "BLI_blenlib.h" -#include "BKE_nla.h" #include "BKE_context.h" +#include "BKE_nla.h" #include "BKE_screen.h" #include "ED_anim_api.h" @@ -46,8 +46,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "UI_view2d.h" #include "UI_interface.h" +#include "UI_view2d.h" #include "nla_intern.h" // own include diff --git a/source/blender/editors/space_nla/space_nla.c b/source/blender/editors/space_nla/space_nla.c index e04338b41fc..c4e1431ee26 100644 --- a/source/blender/editors/space_nla/space_nla.c +++ b/source/blender/editors/space_nla/space_nla.c @@ -21,8 +21,8 @@ * \ingroup spnla */ -#include #include +#include #include "DNA_anim_types.h" #include "DNA_collection_types.h" @@ -36,15 +36,15 @@ #include "BKE_context.h" #include "BKE_screen.h" -#include "ED_space_api.h" #include "ED_anim_api.h" #include "ED_markers.h" #include "ED_screen.h" +#include "ED_space_api.h" #include "ED_time_scrub_ui.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "RNA_access.h" @@ -52,8 +52,8 @@ #include "UI_resources.h" #include "UI_view2d.h" -#include "nla_intern.h" /* own include */ #include "GPU_framebuffer.h" +#include "nla_intern.h" /* own include */ /* ******************** default callbacks for nla space ***************** */ diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index beaa8c2617e..55a5a043014 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -28,10 +28,10 @@ #include "DNA_node_types.h" #include "DNA_object_types.h" -#include "DNA_space_types.h" #include "DNA_screen_types.h" -#include "DNA_userdef_types.h" +#include "DNA_space_types.h" #include "DNA_text_types.h" +#include "DNA_userdef_types.h" #include "BKE_context.h" #include "BKE_curve.h" @@ -47,9 +47,9 @@ #include "GPU_batch.h" #include "GPU_batch_presets.h" -#include "GPU_platform.h" #include "GPU_immediate.h" #include "GPU_matrix.h" +#include "GPU_platform.h" #include "GPU_state.h" #include "RNA_access.h" @@ -67,10 +67,10 @@ #include "IMB_colormanagement.h" #include "IMB_imbuf_types.h" -#include "node_intern.h" /* own include */ #include "NOD_composite.h" #include "NOD_shader.h" #include "NOD_texture.h" +#include "node_intern.h" /* own include */ /* ****************** SOCKET BUTTON DRAW FUNCTIONS ***************** */ diff --git a/source/blender/editors/space_node/node_add.c b/source/blender/editors/space_node/node_add.c index 644f2b2dc5b..1d73937d762 100644 --- a/source/blender/editors/space_node/node_add.c +++ b/source/blender/editors/space_node/node_add.c @@ -40,8 +40,8 @@ #include "BKE_texture.h" #include "ED_node.h" /* own include */ -#include "ED_screen.h" #include "ED_render.h" +#include "ED_screen.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_node/node_buttons.c b/source/blender/editors/space_node/node_buttons.c index 072a67dee6c..ee1d2b43c5f 100644 --- a/source/blender/editors/space_node/node_buttons.c +++ b/source/blender/editors/space_node/node_buttons.c @@ -25,8 +25,8 @@ #include "DNA_node_types.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLT_translation.h" diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index d2258db074d..0552660b9bf 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -23,16 +23,16 @@ */ #include "DNA_light_types.h" -#include "DNA_node_types.h" +#include "DNA_linestyle_types.h" #include "DNA_material_types.h" +#include "DNA_node_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" #include "DNA_texture_types.h" #include "DNA_world_types.h" -#include "DNA_linestyle_types.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLT_translation.h" @@ -47,17 +47,17 @@ #include "BIF_glutil.h" +#include "GPU_framebuffer.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" #include "GPU_matrix.h" #include "GPU_state.h" -#include "GPU_framebuffer.h" #include "WM_api.h" #include "WM_types.h" -#include "ED_node.h" #include "ED_gpencil.h" +#include "ED_node.h" #include "ED_space_api.h" #include "UI_resources.h" diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index 677a7cac745..9d81994bb0b 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -29,8 +29,8 @@ #include "DNA_text_types.h" #include "DNA_world_types.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BKE_context.h" #include "BKE_global.h" @@ -50,9 +50,9 @@ #include "RE_pipeline.h" #include "ED_node.h" /* own include */ -#include "ED_select_utils.h" -#include "ED_screen.h" #include "ED_render.h" +#include "ED_screen.h" +#include "ED_select_utils.h" #include "RNA_access.h" #include "RNA_define.h" @@ -67,10 +67,10 @@ #include "IMB_imbuf_types.h" -#include "node_intern.h" /* own include */ #include "NOD_composite.h" #include "NOD_shader.h" #include "NOD_texture.h" +#include "node_intern.h" /* own include */ #define USE_ESC_COMPO diff --git a/source/blender/editors/space_node/node_gizmo.c b/source/blender/editors/space_node/node_gizmo.c index e20cadf21a3..28d7e1b8d04 100644 --- a/source/blender/editors/space_node/node_gizmo.c +++ b/source/blender/editors/space_node/node_gizmo.c @@ -20,17 +20,17 @@ #include -#include "BLI_utildefines.h" #include "BLI_math_matrix.h" #include "BLI_math_vector.h" #include "BLI_rect.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_image.h" #include "BKE_main.h" -#include "ED_screen.h" #include "ED_gizmo_library.h" +#include "ED_screen.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/editors/space_node/node_group.c b/source/blender/editors/space_node/node_group.c index 64e8358c23c..2a4c6147d5d 100644 --- a/source/blender/editors/space_node/node_group.c +++ b/source/blender/editors/space_node/node_group.c @@ -25,11 +25,11 @@ #include "MEM_guardedalloc.h" -#include "DNA_node_types.h" #include "DNA_anim_types.h" +#include "DNA_node_types.h" -#include "BLI_listbase.h" #include "BLI_linklist.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLT_translation.h" @@ -44,8 +44,8 @@ #include "DEG_depsgraph_build.h" #include "ED_node.h" /* own include */ -#include "ED_screen.h" #include "ED_render.h" +#include "ED_screen.h" #include "RNA_access.h" #include "RNA_define.h" @@ -55,8 +55,8 @@ #include "UI_resources.h" -#include "node_intern.h" /* own include */ #include "NOD_common.h" +#include "node_intern.h" /* own include */ static bool node_group_operator_active(bContext *C) { diff --git a/source/blender/editors/space_node/node_intern.h b/source/blender/editors/space_node/node_intern.h index c1aeca87d7b..8c7c490b181 100644 --- a/source/blender/editors/space_node/node_intern.h +++ b/source/blender/editors/space_node/node_intern.h @@ -24,9 +24,9 @@ #ifndef __NODE_INTERN_H__ #define __NODE_INTERN_H__ -#include /* for size_t */ #include "BKE_node.h" #include "UI_interface.h" +#include /* for size_t */ /* internal exports only */ diff --git a/source/blender/editors/space_node/node_relationships.c b/source/blender/editors/space_node/node_relationships.c index 7556b6ebd06..5dc98a3905a 100644 --- a/source/blender/editors/space_node/node_relationships.c +++ b/source/blender/editors/space_node/node_relationships.c @@ -26,9 +26,9 @@ #include "DNA_anim_types.h" #include "DNA_node_types.h" -#include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_easing.h" +#include "BLI_math.h" #include "BKE_animsys.h" #include "BKE_context.h" @@ -37,8 +37,8 @@ #include "BKE_node.h" #include "ED_node.h" /* own include */ -#include "ED_screen.h" #include "ED_render.h" +#include "ED_screen.h" #include "ED_util.h" #include "RNA_access.h" @@ -47,8 +47,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "UI_view2d.h" #include "UI_resources.h" +#include "UI_view2d.h" #include "BLT_translation.h" diff --git a/source/blender/editors/space_node/node_select.c b/source/blender/editors/space_node/node_select.c index a2453cb0837..2c9e7a213c2 100644 --- a/source/blender/editors/space_node/node_select.c +++ b/source/blender/editors/space_node/node_select.c @@ -25,12 +25,12 @@ #include "DNA_node_types.h" -#include "BLI_utildefines.h" -#include "BLI_rect.h" #include "BLI_lasso_2d.h" #include "BLI_math.h" +#include "BLI_rect.h" #include "BLI_string.h" #include "BLI_string_utf8.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_main.h" diff --git a/source/blender/editors/space_node/node_templates.c b/source/blender/editors/space_node/node_templates.c index ccbd09d8b68..7d4095326f8 100644 --- a/source/blender/editors/space_node/node_templates.c +++ b/source/blender/editors/space_node/node_templates.c @@ -41,8 +41,8 @@ #include "NOD_socket.h" -#include "UI_interface.h" #include "../interface/interface_intern.h" /* XXX bad level */ +#include "UI_interface.h" #include "ED_node.h" /* own include */ diff --git a/source/blender/editors/space_node/node_view.c b/source/blender/editors/space_node/node_view.c index 7023a3ebd18..9283b073e86 100644 --- a/source/blender/editors/space_node/node_view.c +++ b/source/blender/editors/space_node/node_view.c @@ -23,9 +23,9 @@ #include "DNA_node_types.h" +#include "BLI_math.h" #include "BLI_rect.h" #include "BLI_utildefines.h" -#include "BLI_math.h" #include "BKE_context.h" #include "BKE_image.h" @@ -33,10 +33,10 @@ #include "BKE_node.h" #include "BKE_screen.h" +#include "ED_image.h" #include "ED_node.h" /* own include */ #include "ED_screen.h" #include "ED_space_api.h" -#include "ED_image.h" #include "RNA_access.h" #include "RNA_define.h" @@ -52,8 +52,8 @@ #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "node_intern.h" /* own include */ #include "NOD_composite.h" +#include "node_intern.h" /* own include */ /* **************** View All Operator ************** */ diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c index 951c26b69e0..ce351595522 100644 --- a/source/blender/editors/space_node/space_node.c +++ b/source/blender/editors/space_node/space_node.c @@ -34,14 +34,14 @@ #include "BKE_context.h" #include "BKE_lib_id.h" +#include "BKE_node.h" #include "BKE_scene.h" #include "BKE_screen.h" -#include "BKE_node.h" -#include "ED_space_api.h" #include "ED_node.h" #include "ED_render.h" #include "ED_screen.h" +#include "ED_space_api.h" #include "UI_resources.h" #include "UI_view2d.h" diff --git a/source/blender/editors/space_outliner/outliner_collections.c b/source/blender/editors/space_outliner/outliner_collections.c index f129bc9e2ea..8da085f436d 100644 --- a/source/blender/editors/space_outliner/outliner_collections.c +++ b/source/blender/editors/space_outliner/outliner_collections.c @@ -20,14 +20,14 @@ #include -#include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "DNA_collection_types.h" #include "DNA_object_types.h" -#include "BKE_context.h" #include "BKE_collection.h" +#include "BKE_context.h" #include "BKE_layer.h" #include "BKE_lib_id.h" #include "BKE_main.h" @@ -41,8 +41,8 @@ #include "ED_screen.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 83ddbe63e9c..dcef1c9db6a 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -24,21 +24,21 @@ #include "DNA_anim_types.h" #include "DNA_armature_types.h" #include "DNA_collection_types.h" -#include "DNA_gpencil_types.h" +#include "DNA_constraint_types.h" #include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" #include "DNA_light_types.h" #include "DNA_lightprobe_types.h" +#include "DNA_object_force_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_sequence_types.h" -#include "DNA_constraint_types.h" -#include "DNA_object_force_types.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" +#include "BLI_mempool.h" #include "BLI_string_utils.h" #include "BLI_utildefines.h" -#include "BLI_mempool.h" #include "BLT_translation.h" diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c index 1d852d72e6e..f2a3bad03b4 100644 --- a/source/blender/editors/space_outliner/outliner_edit.c +++ b/source/blender/editors/space_outliner/outliner_edit.c @@ -25,17 +25,17 @@ #include "MEM_guardedalloc.h" +#include "DNA_ID.h" #include "DNA_anim_types.h" #include "DNA_collection_types.h" -#include "DNA_ID.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" #include "DNA_material_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BLI_blenlib.h" #include "BLI_dynstr.h" -#include "BLI_utildefines.h" #include "BLI_path_util.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -60,12 +60,12 @@ #include "../blenloader/BLO_readfile.h" +#include "ED_armature.h" +#include "ED_keyframing.h" #include "ED_object.h" #include "ED_outliner.h" #include "ED_screen.h" #include "ED_select_utils.h" -#include "ED_keyframing.h" -#include "ED_armature.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index 8ddacfc84c2..d50a097e6f6 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -27,16 +27,16 @@ #include "DNA_armature_types.h" #include "DNA_collection_types.h" +#include "DNA_gpencil_types.h" #include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_sequence_types.h" #include "DNA_world_types.h" -#include "DNA_gpencil_types.h" -#include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "BKE_armature.h" #include "BKE_collection.h" diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index 5bb0d626c2f..768ec17c1e7 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -26,6 +26,7 @@ #include "DNA_anim_types.h" #include "DNA_armature_types.h" #include "DNA_collection_types.h" +#include "DNA_constraint_types.h" #include "DNA_gpencil_types.h" #include "DNA_hair_types.h" #include "DNA_light_types.h" @@ -33,23 +34,21 @@ #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" +#include "DNA_modifier_types.h" +#include "DNA_object_types.h" #include "DNA_pointcloud_types.h" #include "DNA_scene_types.h" #include "DNA_sequence_types.h" #include "DNA_volume_types.h" #include "DNA_world_types.h" -#include "DNA_object_types.h" -#include "DNA_constraint_types.h" -#include "DNA_modifier_types.h" #include "BLI_blenlib.h" #include "BLI_utildefines.h" #include "BKE_animsys.h" #include "BKE_collection.h" -#include "BKE_context.h" #include "BKE_constraint.h" -#include "BKE_object.h" +#include "BKE_context.h" #include "BKE_fcurve.h" #include "BKE_global.h" #include "BKE_layer.h" @@ -57,6 +56,7 @@ #include "BKE_lib_override.h" #include "BKE_lib_query.h" #include "BKE_main.h" +#include "BKE_object.h" #include "BKE_report.h" #include "BKE_scene.h" #include "BKE_screen.h" @@ -74,12 +74,12 @@ #include "ED_undo.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "UI_interface.h" -#include "UI_view2d.h" #include "UI_resources.h" +#include "UI_view2d.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index b942021ca33..2787ab5cc52 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -28,33 +28,33 @@ #include "DNA_anim_types.h" #include "DNA_armature_types.h" -#include "DNA_constraint_types.h" -#include "DNA_camera_types.h" #include "DNA_cachefile_types.h" +#include "DNA_camera_types.h" #include "DNA_collection_types.h" +#include "DNA_constraint_types.h" #include "DNA_gpencil_types.h" #include "DNA_hair_types.h" #include "DNA_key_types.h" #include "DNA_light_types.h" +#include "DNA_lightprobe_types.h" +#include "DNA_linestyle_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" -#include "DNA_lightprobe_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 "DNA_world_types.h" #include "DNA_sequence_types.h" #include "DNA_speaker_types.h" -#include "DNA_object_types.h" -#include "DNA_linestyle_types.h" +#include "DNA_volume_types.h" +#include "DNA_world_types.h" #include "BLI_blenlib.h" -#include "BLI_listbase.h" -#include "BLI_utildefines.h" -#include "BLI_mempool.h" #include "BLI_fnmatch.h" +#include "BLI_listbase.h" +#include "BLI_mempool.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/editors/space_outliner/outliner_utils.c b/source/blender/editors/space_outliner/outliner_utils.c index 61ba4e9551d..45b46788c8f 100644 --- a/source/blender/editors/space_outliner/outliner_utils.c +++ b/source/blender/editors/space_outliner/outliner_utils.c @@ -30,9 +30,9 @@ #include "DNA_space_types.h" #include "BKE_context.h" -#include "BKE_outliner_treehash.h" #include "BKE_layer.h" #include "BKE_object.h" +#include "BKE_outliner_treehash.h" #include "ED_armature.h" #include "ED_outliner.h" diff --git a/source/blender/editors/space_outliner/space_outliner.c b/source/blender/editors/space_outliner/space_outliner.c index ff9b3c8a05b..cfeaf8aa897 100644 --- a/source/blender/editors/space_outliner/space_outliner.c +++ b/source/blender/editors/space_outliner/space_outliner.c @@ -21,23 +21,23 @@ * \ingroup spoutliner */ -#include #include +#include #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_mempool.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_layer.h" -#include "BKE_screen.h" -#include "BKE_scene.h" #include "BKE_outliner_treehash.h" +#include "BKE_scene.h" +#include "BKE_screen.h" -#include "ED_space_api.h" #include "ED_screen.h" +#include "ED_space_api.h" #include "WM_api.h" #include "WM_message.h" @@ -45,14 +45,14 @@ #include "RNA_access.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "UI_resources.h" #include "UI_view2d.h" -#include "outliner_intern.h" #include "GPU_framebuffer.h" +#include "outliner_intern.h" static void outliner_main_region_init(wmWindowManager *wm, ARegion *region) { diff --git a/source/blender/editors/space_script/script_edit.c b/source/blender/editors/space_script/script_edit.c index d2f2411c538..79311cac6b5 100644 --- a/source/blender/editors/space_script/script_edit.c +++ b/source/blender/editors/space_script/script_edit.c @@ -21,11 +21,11 @@ * \ingroup spscript */ -#include #include +#include -#include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_report.h" diff --git a/source/blender/editors/space_script/script_ops.c b/source/blender/editors/space_script/script_ops.c index 3101bf6a7a7..4b557daf36a 100644 --- a/source/blender/editors/space_script/script_ops.c +++ b/source/blender/editors/space_script/script_ops.c @@ -21,8 +21,8 @@ * \ingroup spscript */ -#include #include +#include #include "WM_api.h" diff --git a/source/blender/editors/space_script/space_script.c b/source/blender/editors/space_script/space_script.c index 4ee3a87e4fa..d872facd488 100644 --- a/source/blender/editors/space_script/space_script.c +++ b/source/blender/editors/space_script/space_script.c @@ -21,8 +21,8 @@ * \ingroup spscript */ -#include #include +#include #include "MEM_guardedalloc.h" @@ -32,8 +32,8 @@ #include "BKE_context.h" #include "BKE_screen.h" -#include "ED_space_api.h" #include "ED_screen.h" +#include "ED_space_api.h" #include "WM_api.h" #include "WM_types.h" @@ -44,8 +44,8 @@ #ifdef WITH_PYTHON #endif -#include "script_intern.h" // own include #include "GPU_framebuffer.h" +#include "script_intern.h" // own include // static script_run_python(char *funcname, ) diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index d3179095e24..ac9b605b193 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -21,10 +21,10 @@ * \ingroup spseq */ -#include -#include -#include #include +#include +#include +#include #include "MEM_guardedalloc.h" @@ -34,8 +34,8 @@ #include "BLT_translation.h" -#include "DNA_scene_types.h" #include "DNA_mask_types.h" +#include "DNA_scene_types.h" #include "BKE_context.h" #include "BKE_lib_id.h" diff --git a/source/blender/editors/space_sequencer/sequencer_buttons.c b/source/blender/editors/space_sequencer/sequencer_buttons.c index 7bec913900d..a2568e2e827 100644 --- a/source/blender/editors/space_sequencer/sequencer_buttons.c +++ b/source/blender/editors/space_sequencer/sequencer_buttons.c @@ -21,13 +21,13 @@ * \ingroup spseq */ -#include #include +#include #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -35,15 +35,15 @@ #include "BKE_global.h" #include "BKE_screen.h" -#include "ED_screen.h" #include "ED_gpencil.h" +#include "ED_screen.h" #include "ED_sequencer.h" #include "WM_api.h" #include "WM_types.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "sequencer_intern.h" diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index fa1e26881c8..058d41ab294 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -21,50 +21,50 @@ * \ingroup spseq */ -#include #include +#include #include "BLI_blenlib.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include "IMB_imbuf_types.h" -#include "DNA_scene_types.h" +#include "DNA_anim_types.h" #include "DNA_mask_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "DNA_screen_types.h" +#include "DNA_sound_types.h" #include "DNA_space_types.h" #include "DNA_userdef_types.h" -#include "DNA_sound_types.h" -#include "DNA_anim_types.h" #include "BKE_context.h" +#include "BKE_fcurve.h" #include "BKE_global.h" +#include "BKE_scene.h" #include "BKE_sequencer.h" #include "BKE_sound.h" -#include "BKE_scene.h" -#include "BKE_fcurve.h" #include "IMB_colormanagement.h" #include "IMB_imbuf.h" +#include "GPU_framebuffer.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" #include "GPU_matrix.h" #include "GPU_state.h" -#include "GPU_framebuffer.h" #include "GPU_vertex_buffer.h" #include "ED_anim_api.h" #include "ED_gpencil.h" #include "ED_markers.h" #include "ED_mask.h" -#include "ED_sequencer.h" #include "ED_screen.h" -#include "ED_time_scrub_ui.h" +#include "ED_sequencer.h" #include "ED_space_api.h" +#include "ED_time_scrub_ui.h" #include "BIF_glutil.h" diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 769c74bb82c..3f36c844f30 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -21,8 +21,8 @@ * \ingroup spseq */ -#include #include +#include #include #include "MEM_guardedalloc.h" @@ -40,11 +40,11 @@ #include "BKE_context.h" #include "BKE_global.h" +#include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_report.h" #include "BKE_sequencer.h" #include "BKE_sound.h" -#include "BKE_lib_id.h" #include "WM_api.h" #include "WM_types.h" @@ -57,12 +57,12 @@ #include "ED_anim_api.h" #include "ED_numinput.h" #include "ED_screen.h" -#include "ED_transform.h" #include "ED_sequencer.h" #include "ED_space_api.h" +#include "ED_transform.h" -#include "UI_view2d.h" #include "UI_interface.h" +#include "UI_view2d.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h index 2cbd4d35e27..fe3170e10e0 100644 --- a/source/blender/editors/space_sequencer/sequencer_intern.h +++ b/source/blender/editors/space_sequencer/sequencer_intern.h @@ -24,8 +24,8 @@ #ifndef __SEQUENCER_INTERN_H__ #define __SEQUENCER_INTERN_H__ -#include "RNA_access.h" #include "DNA_sequence_types.h" +#include "RNA_access.h" /* internal exports only */ diff --git a/source/blender/editors/space_sequencer/sequencer_ops.c b/source/blender/editors/space_sequencer/sequencer_ops.c index 5f7a66fd439..4296701366a 100644 --- a/source/blender/editors/space_sequencer/sequencer_ops.c +++ b/source/blender/editors/space_sequencer/sequencer_ops.c @@ -21,18 +21,18 @@ * \ingroup spseq */ -#include #include +#include #include "DNA_space_types.h" #include "WM_api.h" #include "WM_types.h" -#include "ED_sequencer.h" #include "ED_markers.h" -#include "ED_transform.h" /* transform keymap */ #include "ED_select_utils.h" +#include "ED_sequencer.h" +#include "ED_transform.h" /* transform keymap */ #include "BKE_sequencer.h" diff --git a/source/blender/editors/space_sequencer/sequencer_preview.c b/source/blender/editors/space_sequencer/sequencer_preview.c index 8ec3ed850d2..7c8a5ff5981 100644 --- a/source/blender/editors/space_sequencer/sequencer_preview.c +++ b/source/blender/editors/space_sequencer/sequencer_preview.c @@ -27,9 +27,9 @@ #include "BLI_listbase.h" #include "BLI_threads.h" -#include "BKE_sound.h" #include "BKE_context.h" #include "BKE_global.h" +#include "BKE_sound.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_sequencer/sequencer_scopes.c b/source/blender/editors/space_sequencer/sequencer_scopes.c index 4d492d74e82..309840ea9e3 100644 --- a/source/blender/editors/space_sequencer/sequencer_scopes.c +++ b/source/blender/editors/space_sequencer/sequencer_scopes.c @@ -23,12 +23,12 @@ #include #include -#include "BLI_utildefines.h" #include "BLI_task.h" +#include "BLI_utildefines.h" #include "IMB_colormanagement.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "atomic_ops.h" diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index 7f243b8a6ad..ccb18331c55 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -21,13 +21,13 @@ * \ingroup spseq */ -#include #include +#include #include #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "DNA_scene_types.h" @@ -44,8 +44,8 @@ #include "ED_outliner.h" #include "ED_screen.h" -#include "ED_sequencer.h" #include "ED_select_utils.h" +#include "ED_sequencer.h" #include "UI_view2d.h" diff --git a/source/blender/editors/space_sequencer/sequencer_view.c b/source/blender/editors/space_sequencer/sequencer_view.c index f30a604ca93..714a634766c 100644 --- a/source/blender/editors/space_sequencer/sequencer_view.c +++ b/source/blender/editors/space_sequencer/sequencer_view.c @@ -30,8 +30,8 @@ #include "BKE_context.h" #include "BKE_main.h" -#include "BKE_sequencer.h" #include "BKE_screen.h" +#include "BKE_sequencer.h" #include "WM_api.h" #include "WM_types.h" @@ -40,9 +40,9 @@ #include "ED_screen.h" #include "ED_space_api.h" +#include "IMB_colormanagement.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "IMB_colormanagement.h" #include "UI_view2d.h" diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c index 8a934a28690..1aa2a0c9c44 100644 --- a/source/blender/editors/space_sequencer/space_sequencer.c +++ b/source/blender/editors/space_sequencer/space_sequencer.c @@ -21,12 +21,12 @@ * \ingroup spseq */ -#include #include +#include #include "DNA_gpencil_types.h" -#include "DNA_scene_types.h" #include "DNA_mask_types.h" +#include "DNA_scene_types.h" #include "MEM_guardedalloc.h" @@ -40,14 +40,14 @@ #include "BKE_sequencer.h" #include "BKE_sequencer_offscreen.h" -#include "ED_space_api.h" #include "ED_screen.h" +#include "ED_space_api.h" #include "ED_view3d.h" #include "ED_view3d_offscreen.h" /* only for sequencer view3d drawing callback */ #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "RNA_access.h" diff --git a/source/blender/editors/space_statusbar/space_statusbar.c b/source/blender/editors/space_statusbar/space_statusbar.c index a37ad59fc14..1efb18403de 100644 --- a/source/blender/editors/space_statusbar/space_statusbar.c +++ b/source/blender/editors/space_statusbar/space_statusbar.c @@ -18,8 +18,8 @@ * \ingroup spstatusbar */ -#include #include +#include #include "MEM_guardedalloc.h" @@ -37,8 +37,8 @@ #include "UI_view2d.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" /* ******************** default callbacks for statusbar space ******************** */ diff --git a/source/blender/editors/space_text/space_text.c b/source/blender/editors/space_text/space_text.c index 437b118a69c..92b084a8d0d 100644 --- a/source/blender/editors/space_text/space_text.c +++ b/source/blender/editors/space_text/space_text.c @@ -29,14 +29,14 @@ #include "BLI_blenlib.h" -#include "BKE_global.h" #include "BKE_context.h" +#include "BKE_global.h" #include "BKE_lib_id.h" #include "BKE_screen.h" #include "BKE_text.h" -#include "ED_space_api.h" #include "ED_screen.h" +#include "ED_space_api.h" #include "WM_api.h" #include "WM_types.h" @@ -47,9 +47,9 @@ #include "RNA_access.h" +#include "GPU_framebuffer.h" #include "text_format.h" #include "text_intern.h" /* own include */ -#include "GPU_framebuffer.h" /* ******************** default callbacks for text space ***************** */ diff --git a/source/blender/editors/space_text/text_autocomplete.c b/source/blender/editors/space_text/text_autocomplete.c index 7a74cf9fe80..cb1861d8726 100644 --- a/source/blender/editors/space_text/text_autocomplete.c +++ b/source/blender/editors/space_text/text_autocomplete.c @@ -29,16 +29,16 @@ #include "BLI_ghash.h" #include "BKE_context.h" +#include "BKE_screen.h" #include "BKE_text.h" #include "BKE_text_suggestions.h" -#include "BKE_screen.h" #include "WM_api.h" #include "WM_types.h" +#include "ED_screen.h" #include "ED_text.h" #include "ED_undo.h" -#include "ED_screen.h" #include "UI_interface.h" diff --git a/source/blender/editors/space_text/text_draw.c b/source/blender/editors/space_text/text_draw.c index b03c3ca68cb..777b6b1ef1d 100644 --- a/source/blender/editors/space_text/text_draw.c +++ b/source/blender/editors/space_text/text_draw.c @@ -27,14 +27,14 @@ #include "BLI_blenlib.h" #include "BLI_math.h" -#include "DNA_text_types.h" -#include "DNA_space_types.h" #include "DNA_screen_types.h" +#include "DNA_space_types.h" +#include "DNA_text_types.h" #include "BKE_context.h" +#include "BKE_screen.h" #include "BKE_text.h" #include "BKE_text_suggestions.h" -#include "BKE_screen.h" #include "ED_text.h" @@ -45,8 +45,8 @@ #include "UI_resources.h" #include "UI_view2d.h" -#include "text_intern.h" #include "text_format.h" +#include "text_intern.h" /******************** text font drawing ******************/ diff --git a/source/blender/editors/space_text/text_format.c b/source/blender/editors/space_text/text_format.c index 48ee30e450f..2eeb46049d2 100644 --- a/source/blender/editors/space_text/text_format.c +++ b/source/blender/editors/space_text/text_format.c @@ -27,8 +27,8 @@ #include "BLI_blenlib.h" #include "BLI_string_utils.h" -#include "DNA_text_types.h" #include "DNA_space_types.h" +#include "DNA_text_types.h" #include "ED_text.h" diff --git a/source/blender/editors/space_text/text_format_lua.c b/source/blender/editors/space_text/text_format_lua.c index 6bbb0d529ab..42a52ce0f58 100644 --- a/source/blender/editors/space_text/text_format_lua.c +++ b/source/blender/editors/space_text/text_format_lua.c @@ -21,8 +21,8 @@ #include "BLI_blenlib.h" -#include "DNA_text_types.h" #include "DNA_space_types.h" +#include "DNA_text_types.h" #include "BKE_text.h" diff --git a/source/blender/editors/space_text/text_format_osl.c b/source/blender/editors/space_text/text_format_osl.c index 0275a293e7a..53e38cfe870 100644 --- a/source/blender/editors/space_text/text_format_osl.c +++ b/source/blender/editors/space_text/text_format_osl.c @@ -21,8 +21,8 @@ #include "BLI_blenlib.h" -#include "DNA_text_types.h" #include "DNA_space_types.h" +#include "DNA_text_types.h" #include "BKE_text.h" diff --git a/source/blender/editors/space_text/text_format_pov.c b/source/blender/editors/space_text/text_format_pov.c index 13830aa7c4d..52aaad034bf 100644 --- a/source/blender/editors/space_text/text_format_pov.c +++ b/source/blender/editors/space_text/text_format_pov.c @@ -21,8 +21,8 @@ #include "BLI_blenlib.h" -#include "DNA_text_types.h" #include "DNA_space_types.h" +#include "DNA_text_types.h" #include "BKE_text.h" diff --git a/source/blender/editors/space_text/text_format_pov_ini.c b/source/blender/editors/space_text/text_format_pov_ini.c index 08f6d10ac6d..df4f1e6b38c 100644 --- a/source/blender/editors/space_text/text_format_pov_ini.c +++ b/source/blender/editors/space_text/text_format_pov_ini.c @@ -21,8 +21,8 @@ #include "BLI_blenlib.h" -#include "DNA_text_types.h" #include "DNA_space_types.h" +#include "DNA_text_types.h" #include "BKE_text.h" diff --git a/source/blender/editors/space_text/text_format_py.c b/source/blender/editors/space_text/text_format_py.c index 1e628bbc39b..3858f7225ef 100644 --- a/source/blender/editors/space_text/text_format_py.c +++ b/source/blender/editors/space_text/text_format_py.c @@ -21,8 +21,8 @@ #include "BLI_blenlib.h" -#include "DNA_text_types.h" #include "DNA_space_types.h" +#include "DNA_text_types.h" #include "BKE_text.h" diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index 43010829bdf..e0b15d0a9d5 100644 --- a/source/blender/editors/space_text/text_ops.c +++ b/source/blender/editors/space_text/text_ops.c @@ -21,8 +21,8 @@ * \ingroup sptext */ -#include #include +#include #include "MEM_guardedalloc.h" @@ -44,9 +44,9 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_text.h" #include "ED_curve.h" #include "ED_screen.h" +#include "ED_text.h" #include "UI_interface.h" #include "UI_resources.h" @@ -57,8 +57,8 @@ # include "BPY_extern.h" #endif -#include "text_intern.h" #include "text_format.h" +#include "text_intern.h" static void txt_screen_clamp(SpaceText *st, ARegion *region); diff --git a/source/blender/editors/space_text/text_undo.c b/source/blender/editors/space_text/text_undo.c index 4a628cf70e4..4126f36e44a 100644 --- a/source/blender/editors/space_text/text_undo.c +++ b/source/blender/editors/space_text/text_undo.c @@ -18,8 +18,8 @@ * \ingroup sptext */ -#include #include +#include #include "MEM_guardedalloc.h" @@ -33,17 +33,17 @@ #include "PIL_time.h" #include "BKE_context.h" +#include "BKE_main.h" #include "BKE_report.h" #include "BKE_text.h" #include "BKE_undo_system.h" -#include "BKE_main.h" #include "WM_api.h" #include "WM_types.h" -#include "ED_text.h" #include "ED_curve.h" #include "ED_screen.h" +#include "ED_text.h" #include "ED_undo.h" #include "UI_interface.h" @@ -52,8 +52,8 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "text_intern.h" #include "text_format.h" +#include "text_intern.h" /* -------------------------------------------------------------------- */ /** \name Implements ED Undo System diff --git a/source/blender/editors/space_topbar/space_topbar.c b/source/blender/editors/space_topbar/space_topbar.c index facdba46b21..cacf956aa84 100644 --- a/source/blender/editors/space_topbar/space_topbar.c +++ b/source/blender/editors/space_topbar/space_topbar.c @@ -21,8 +21,8 @@ * \ingroup sptopbar */ -#include #include +#include #include "MEM_guardedalloc.h" @@ -47,8 +47,8 @@ #include "RNA_access.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" /* ******************** default callbacks for topbar space ***************** */ diff --git a/source/blender/editors/space_userpref/space_userpref.c b/source/blender/editors/space_userpref/space_userpref.c index e3c1170ddba..d3bea4598ff 100644 --- a/source/blender/editors/space_userpref/space_userpref.c +++ b/source/blender/editors/space_userpref/space_userpref.c @@ -21,8 +21,8 @@ * \ingroup spuserpref */ -#include #include +#include #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 00f61a4d0aa..5959052b0ab 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -22,8 +22,8 @@ */ #include "DNA_mesh_types.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BLI_math.h" @@ -35,9 +35,9 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "GPU_shader.h" -#include "GPU_immediate.h" #include "GPU_batch.h" +#include "GPU_immediate.h" +#include "GPU_shader.h" #include "GPU_state.h" #include "ED_mesh.h" diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index 0f5607bc8cd..eb245ae0766 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -21,15 +21,15 @@ * \ingroup spview3d */ -#include #include +#include +#include "DNA_defaults.h" +#include "DNA_gpencil_types.h" #include "DNA_lightprobe_types.h" #include "DNA_material_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_defaults.h" #include "MEM_guardedalloc.h" @@ -51,8 +51,8 @@ #include "BKE_screen.h" #include "BKE_workspace.h" -#include "ED_space_api.h" #include "ED_screen.h" +#include "ED_space_api.h" #include "ED_transform.h" #include "GPU_matrix.h" @@ -60,9 +60,9 @@ #include "DRW_engine.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "RE_engine.h" #include "RE_pipeline.h" diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index 54f00b67898..80ab18cd3db 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -21,17 +21,17 @@ * \ingroup spview3d */ -#include -#include -#include #include +#include +#include +#include #include "DNA_armature_types.h" #include "DNA_curve_types.h" #include "DNA_lattice_types.h" -#include "DNA_meta_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "DNA_meta_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -39,20 +39,20 @@ #include "BLT_translation.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "BKE_action.h" #include "BKE_context.h" #include "BKE_curve.h" #include "BKE_customdata.h" -#include "BKE_screen.h" -#include "BKE_editmesh.h" #include "BKE_deform.h" +#include "BKE_editmesh.h" #include "BKE_object.h" #include "BKE_object_deform.h" #include "BKE_report.h" +#include "BKE_screen.h" #include "DEG_depsgraph.h" @@ -62,8 +62,8 @@ #include "RNA_access.h" #include "ED_armature.h" -#include "ED_object.h" #include "ED_mesh.h" +#include "ED_object.h" #include "ED_screen.h" #include "UI_interface.h" diff --git a/source/blender/editors/space_view3d/view3d_camera_control.c b/source/blender/editors/space_view3d/view3d_camera_control.c index d812ed530ce..a6c1d1bbc33 100644 --- a/source/blender/editors/space_view3d/view3d_camera_control.c +++ b/source/blender/editors/space_view3d/view3d_camera_control.c @@ -37,9 +37,9 @@ * - updating can optionally keyframe the camera object. */ -#include "DNA_scene_types.h" -#include "DNA_object_types.h" #include "DNA_camera_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 75865bc50e1..8af651c7309 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -23,25 +23,25 @@ #include +#include "BLI_jitter_2d.h" #include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_rect.h" #include "BLI_string.h" #include "BLI_string_utils.h" #include "BLI_threads.h" -#include "BLI_jitter_2d.h" #include "BKE_camera.h" #include "BKE_collection.h" #include "BKE_context.h" #include "BKE_customdata.h" #include "BKE_global.h" -#include "BKE_layer.h" #include "BKE_key.h" +#include "BKE_layer.h" #include "BKE_main.h" -#include "BKE_scene.h" #include "BKE_object.h" #include "BKE_paint.h" +#include "BKE_scene.h" #include "BKE_studiolight.h" #include "BKE_unit.h" @@ -62,8 +62,8 @@ #include "DRW_select_buffer.h" #include "ED_armature.h" -#include "ED_keyframing.h" #include "ED_gpencil.h" +#include "ED_keyframing.h" #include "ED_screen.h" #include "ED_screen_types.h" #include "ED_transform.h" @@ -74,13 +74,13 @@ #include "GPU_batch.h" #include "GPU_batch_presets.h" #include "GPU_draw.h" -#include "GPU_matrix.h" +#include "GPU_framebuffer.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" #include "GPU_material.h" -#include "GPU_viewport.h" +#include "GPU_matrix.h" #include "GPU_state.h" -#include "GPU_framebuffer.h" +#include "GPU_viewport.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 9ae9811c626..92adc7d6756 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -23,17 +23,17 @@ * 3D view manipulation/operators. */ -#include -#include -#include #include +#include +#include +#include #include "DNA_armature_types.h" #include "DNA_camera_types.h" #include "DNA_curve_types.h" +#include "DNA_gpencil_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_gpencil_types.h" #include "MEM_guardedalloc.h" @@ -60,19 +60,19 @@ #include "DEG_depsgraph_query.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "RNA_access.h" #include "RNA_define.h" #include "ED_armature.h" +#include "ED_mesh.h" #include "ED_particle.h" #include "ED_screen.h" #include "ED_transform.h" -#include "ED_mesh.h" -#include "ED_view3d.h" #include "ED_transform_snap_object_context.h" +#include "ED_view3d.h" #include "UI_resources.h" diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c index b32bcbde3e9..8291d93ee13 100644 --- a/source/blender/editors/space_view3d/view3d_fly.c +++ b/source/blender/editors/space_view3d/view3d_fly.c @@ -30,8 +30,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BKE_context.h" #include "BKE_report.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_armature.c b/source/blender/editors/space_view3d/view3d_gizmo_armature.c index dbad06da5ec..ee512a5f726 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_armature.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_armature.c @@ -22,18 +22,18 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BKE_armature.h" #include "BKE_action.h" +#include "BKE_armature.h" #include "BKE_context.h" #include "BKE_layer.h" #include "BKE_object.h" -#include "DNA_object_types.h" #include "DNA_armature_types.h" +#include "DNA_object_types.h" #include "ED_armature.h" -#include "ED_screen.h" #include "ED_gizmo_library.h" +#include "ED_screen.h" #include "UI_resources.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_camera.c b/source/blender/editors/space_view3d/view3d_gizmo_camera.c index 23845a64ad8..a9928fa2dc0 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_camera.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_camera.c @@ -26,12 +26,12 @@ #include "BKE_context.h" #include "BKE_layer.h" -#include "DNA_object_types.h" #include "DNA_camera_types.h" +#include "DNA_object_types.h" #include "ED_armature.h" -#include "ED_screen.h" #include "ED_gizmo_library.h" +#include "ED_screen.h" #include "UI_resources.h" @@ -40,8 +40,8 @@ #include "RNA_access.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_empty.c b/source/blender/editors/space_view3d/view3d_gizmo_empty.c index 793aec42dcd..7f677d88921 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_empty.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_empty.c @@ -22,17 +22,17 @@ #include "BLI_utildefines.h" #include "BKE_context.h" +#include "BKE_image.h" #include "BKE_layer.h" #include "BKE_object.h" -#include "BKE_image.h" #include "DEG_depsgraph.h" -#include "DNA_object_types.h" #include "DNA_light_types.h" +#include "DNA_object_types.h" -#include "ED_screen.h" #include "ED_gizmo_library.h" +#include "ED_screen.h" #include "UI_resources.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_forcefield.c b/source/blender/editors/space_view3d/view3d_gizmo_forcefield.c index 90b1539c8a7..242a0a802a6 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_forcefield.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_forcefield.c @@ -24,11 +24,11 @@ #include "BKE_layer.h" #include "BKE_object.h" -#include "DNA_object_types.h" #include "DNA_object_force_types.h" +#include "DNA_object_types.h" -#include "ED_screen.h" #include "ED_gizmo_library.h" +#include "ED_screen.h" #include "UI_resources.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_light.c b/source/blender/editors/space_view3d/view3d_gizmo_light.c index 890de0ae611..5bf105b6775 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_light.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_light.c @@ -27,11 +27,11 @@ #include "DEG_depsgraph.h" -#include "DNA_object_types.h" #include "DNA_light_types.h" +#include "DNA_object_types.h" -#include "ED_screen.h" #include "ED_gizmo_library.h" +#include "ED_screen.h" #include "UI_resources.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_navigate.c b/source/blender/editors/space_view3d/view3d_gizmo_navigate.c index 91a2ee297ad..cc00037b1fb 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_navigate.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_navigate.c @@ -26,8 +26,8 @@ #include "DNA_object_types.h" -#include "ED_screen.h" #include "ED_gizmo_library.h" +#include "ED_screen.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c b/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c index e86aaccf848..a8e8d8cee96 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c @@ -33,12 +33,12 @@ #include "BKE_context.h" +#include "GPU_batch.h" +#include "GPU_batch_presets.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" #include "GPU_matrix.h" #include "GPU_state.h" -#include "GPU_batch.h" -#include "GPU_batch_presets.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_preselect.c b/source/blender/editors/space_view3d/view3d_gizmo_preselect.c index b9dc287b9cb..3f07653fb2f 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_preselect.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_preselect.c @@ -30,8 +30,8 @@ #include "UI_resources.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "view3d_intern.h" /* own include */ diff --git a/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c b/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c index 0a5b27a4d15..30212fcd9e5 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c @@ -31,8 +31,8 @@ #include "DNA_mesh_types.h" #include "BKE_context.h" -#include "BKE_layer.h" #include "BKE_editmesh.h" +#include "BKE_layer.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" @@ -45,10 +45,10 @@ #include "bmesh.h" -#include "ED_screen.h" -#include "ED_mesh.h" -#include "ED_view3d.h" #include "ED_gizmo_library.h" +#include "ED_mesh.h" +#include "ED_screen.h" +#include "ED_view3d.h" /* -------------------------------------------------------------------- */ /** \name Mesh Element (Vert/Edge/Face) Pre-Select Gizmo API diff --git a/source/blender/editors/space_view3d/view3d_gizmo_ruler.c b/source/blender/editors/space_view3d/view3d_gizmo_ruler.c index c202cc297f4..4b194d6687d 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_ruler.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_ruler.c @@ -19,9 +19,9 @@ */ #include "BLI_listbase.h" -#include "BLI_string.h" -#include "BLI_rect.h" #include "BLI_math.h" +#include "BLI_rect.h" +#include "BLI_string.h" #include "BLI_utildefines.h" #include "BLT_translation.h" @@ -31,13 +31,13 @@ #include "BKE_main.h" #include "BKE_report.h" +#include "BKE_material.h" #include "BKE_object.h" #include "BKE_unit.h" -#include "BKE_material.h" +#include "DNA_gpencil_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "DNA_gpencil_types.h" #include "DNA_view3d_types.h" #include "ED_gizmo_utils.h" @@ -46,16 +46,16 @@ #include "ED_transform_snap_object_context.h" #include "ED_view3d.h" -#include "UI_resources.h" #include "UI_interface.h" +#include "UI_resources.h" #include "MEM_guardedalloc.h" #include "RNA_access.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "view3d_intern.h" /* own include */ diff --git a/source/blender/editors/space_view3d/view3d_gizmo_tool_generic.c b/source/blender/editors/space_view3d/view3d_gizmo_tool_generic.c index 2a07128b227..18617b4368f 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_tool_generic.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_tool_generic.c @@ -24,10 +24,10 @@ #include "BKE_context.h" #include "BKE_global.h" -#include "ED_screen.h" -#include "ED_transform.h" #include "ED_gizmo_library.h" #include "ED_gizmo_utils.h" +#include "ED_screen.h" +#include "ED_transform.h" #include "UI_resources.h" @@ -38,9 +38,9 @@ #include "RNA_access.h" #include "WM_api.h" -#include "WM_types.h" -#include "WM_toolsystem.h" #include "WM_message.h" +#include "WM_toolsystem.h" +#include "WM_types.h" #include "view3d_intern.h" /* own include */ diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index 200cc12a6c1..57989680705 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -21,13 +21,13 @@ * \ingroup spview3d */ -#include #include #include +#include -#include "DNA_scene_types.h" -#include "DNA_object_types.h" #include "DNA_gpencil_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BLI_math_base.h" #include "BLI_utildefines.h" @@ -47,8 +47,8 @@ #include "WM_types.h" #include "ED_mesh.h" -#include "ED_undo.h" #include "ED_screen.h" +#include "ED_undo.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/space_view3d/view3d_iterators.c b/source/blender/editors/space_view3d/view3d_iterators.c index b446ba74b56..d8e1c8c1c72 100644 --- a/source/blender/editors/space_view3d/view3d_iterators.c +++ b/source/blender/editors/space_view3d/view3d_iterators.c @@ -18,27 +18,27 @@ * \ingroup spview3d */ +#include "DNA_armature_types.h" #include "DNA_curve_types.h" #include "DNA_lattice_types.h" -#include "DNA_meta_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_armature_types.h" +#include "DNA_meta_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_utildefines.h" -#include "BLI_rect.h" #include "BLI_math_geom.h" +#include "BLI_rect.h" +#include "BLI_utildefines.h" +#include "BKE_DerivedMesh.h" #include "BKE_action.h" #include "BKE_armature.h" #include "BKE_curve.h" -#include "BKE_DerivedMesh.h" #include "BKE_displist.h" #include "BKE_editmesh.h" -#include "BKE_mesh_runtime.h" #include "BKE_mesh_iterators.h" +#include "BKE_mesh_runtime.h" #include "BKE_modifier.h" #include "DEG_depsgraph.h" @@ -46,8 +46,8 @@ #include "bmesh.h" -#include "ED_screen.h" #include "ED_armature.h" +#include "ED_screen.h" #include "ED_view3d.h" typedef struct foreachScreenObjectVert_userData { diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c index be8824971cb..a53262df267 100644 --- a/source/blender/editors/space_view3d/view3d_ops.c +++ b/source/blender/editors/space_view3d/view3d_ops.c @@ -21,8 +21,8 @@ * \ingroup spview3d */ -#include #include +#include #include "DNA_collection_types.h" #include "DNA_object_types.h" diff --git a/source/blender/editors/space_view3d/view3d_project.c b/source/blender/editors/space_view3d/view3d_project.c index 10791bd1c9f..3a0f0f468fc 100644 --- a/source/blender/editors/space_view3d/view3d_project.c +++ b/source/blender/editors/space_view3d/view3d_project.c @@ -23,8 +23,8 @@ #include "DNA_camera_types.h" #include "DNA_object_types.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" #include "DNA_view3d_types.h" #include "BLI_sys_types.h" /* int64_t */ diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index bfbc9b6825b..8fdef585fa2 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -21,32 +21,32 @@ * \ingroup spview3d */ -#include -#include -#include -#include #include +#include +#include +#include +#include #include "DNA_action_types.h" #include "DNA_armature_types.h" #include "DNA_curve_types.h" -#include "DNA_meta_types.h" +#include "DNA_gpencil_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "DNA_meta_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_tracking_types.h" -#include "DNA_gpencil_types.h" #include "MEM_guardedalloc.h" #include "BLI_array.h" #include "BLI_bitmap.h" -#include "BLI_math.h" #include "BLI_lasso_2d.h" -#include "BLI_rect.h" #include "BLI_linklist.h" #include "BLI_listbase.h" +#include "BLI_math.h" +#include "BLI_rect.h" #include "BLI_string.h" #include "BLI_utildefines.h" @@ -55,20 +55,20 @@ #endif /* vertex box select */ -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "BKE_global.h" #include "BKE_main.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "BKE_armature.h" #include "BKE_context.h" #include "BKE_curve.h" +#include "BKE_editmesh.h" #include "BKE_layer.h" #include "BKE_mball.h" #include "BKE_mesh.h" #include "BKE_object.h" #include "BKE_paint.h" -#include "BKE_editmesh.h" #include "BKE_scene.h" #include "BKE_tracking.h" #include "BKE_workspace.h" @@ -84,16 +84,16 @@ #include "ED_armature.h" #include "ED_curve.h" +#include "ED_gpencil.h" #include "ED_lattice.h" -#include "ED_particle.h" +#include "ED_mball.h" #include "ED_mesh.h" #include "ED_object.h" #include "ED_outliner.h" +#include "ED_particle.h" #include "ED_screen.h" -#include "ED_select_utils.h" #include "ED_sculpt.h" -#include "ED_mball.h" -#include "ED_gpencil.h" +#include "ED_select_utils.h" #include "UI_interface.h" diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index f7c8e814644..437c0dd4035 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -28,8 +28,8 @@ #include "BLI_array.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_action.h" #include "BKE_armature.h" @@ -52,10 +52,10 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "ED_object.h" -#include "ED_transverts.h" #include "ED_keyframing.h" +#include "ED_object.h" #include "ED_screen.h" +#include "ED_transverts.h" #include "view3d_intern.h" diff --git a/source/blender/editors/space_view3d/view3d_utils.c b/source/blender/editors/space_view3d/view3d_utils.c index 55778db7353..2637fb6d1db 100644 --- a/source/blender/editors/space_view3d/view3d_utils.c +++ b/source/blender/editors/space_view3d/view3d_utils.c @@ -23,10 +23,10 @@ * 3D View checks and manipulation (no operators). */ -#include -#include -#include #include +#include +#include +#include #include "DNA_camera_types.h" #include "DNA_curve_types.h" @@ -44,8 +44,8 @@ #include "BKE_camera.h" #include "BKE_context.h" #include "BKE_object.h" -#include "BKE_screen.h" #include "BKE_scene.h" +#include "BKE_screen.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 159ea249337..6e1533e50fd 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -22,26 +22,26 @@ */ #include "DNA_camera_types.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "MEM_guardedalloc.h" +#include "BLI_linklist.h" #include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_rect.h" #include "BLI_utildefines.h" -#include "BLI_linklist.h" #include "BKE_action.h" #include "BKE_camera.h" #include "BKE_context.h" -#include "BKE_idprop.h" -#include "BKE_object.h" #include "BKE_global.h" +#include "BKE_idprop.h" #include "BKE_layer.h" #include "BKE_main.h" #include "BKE_modifier.h" +#include "BKE_object.h" #include "BKE_report.h" #include "BKE_scene.h" @@ -51,8 +51,8 @@ #include "UI_resources.h" #include "GPU_glew.h" -#include "GPU_select.h" #include "GPU_matrix.h" +#include "GPU_select.h" #include "GPU_state.h" #include "WM_api.h" diff --git a/source/blender/editors/space_view3d/view3d_walk.c b/source/blender/editors/space_view3d/view3d_walk.c index e25f8b4b8ad..89b5618075a 100644 --- a/source/blender/editors/space_view3d/view3d_walk.c +++ b/source/blender/editors/space_view3d/view3d_walk.c @@ -20,14 +20,14 @@ /* defines VIEW3D_OT_navigate - walk modal operator */ -#include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_kdopbvh.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 260748ce953..0ea355e9b6e 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -32,8 +32,8 @@ #include "BLI_math.h" #include "BLI_rect.h" -#include "BKE_editmesh.h" #include "BKE_context.h" +#include "BKE_editmesh.h" #include "BKE_mask.h" #include "BKE_scene.h" @@ -43,10 +43,10 @@ #include "ED_gpencil.h" #include "ED_image.h" #include "ED_keyframing.h" +#include "ED_node.h" #include "ED_screen.h" #include "ED_sculpt.h" #include "ED_space_api.h" -#include "ED_node.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index 2a4268ad939..a2c8caba0f5 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -24,8 +24,8 @@ #ifndef __TRANSFORM_H__ #define __TRANSFORM_H__ -#include "ED_transform.h" #include "ED_numinput.h" +#include "ED_transform.h" #include "ED_view3d.h" #include "RE_engine.h" diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c index 1db2ffa0ed4..4b6932d977d 100644 --- a/source/blender/editors/transform/transform_constraints.c +++ b/source/blender/editors/transform/transform_constraints.c @@ -21,10 +21,10 @@ * \ingroup edtransform */ -#include -#include -#include #include +#include +#include +#include #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -37,9 +37,9 @@ #include "GPU_state.h" #include "BLI_math.h" -#include "BLI_utildefines.h" -#include "BLI_string.h" #include "BLI_rect.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/editors/transform/transform_convert.c b/source/blender/editors/transform/transform_convert.c index 0a2e05e6f49..09ee9081baf 100644 --- a/source/blender/editors/transform/transform_convert.c +++ b/source/blender/editors/transform/transform_convert.c @@ -23,51 +23,51 @@ #include "DNA_anim_types.h" #include "DNA_armature_types.h" -#include "DNA_space_types.h" #include "DNA_constraint_types.h" #include "DNA_gpencil_types.h" #include "DNA_mask_types.h" +#include "DNA_space_types.h" #include "MEM_guardedalloc.h" -#include "BLI_math.h" -#include "BLI_listbase.h" -#include "BLI_string.h" #include "BLI_kdtree.h" +#include "BLI_listbase.h" +#include "BLI_math.h" +#include "BLI_string.h" #include "BKE_animsys.h" #include "BKE_armature.h" #include "BKE_context.h" +#include "BKE_editmesh.h" #include "BKE_fcurve.h" #include "BKE_global.h" #include "BKE_gpencil.h" -#include "BKE_layer.h" #include "BKE_key.h" +#include "BKE_layer.h" #include "BKE_main.h" +#include "BKE_mask.h" #include "BKE_modifier.h" #include "BKE_nla.h" #include "BKE_node.h" #include "BKE_pointcache.h" #include "BKE_rigidbody.h" #include "BKE_scene.h" -#include "BKE_editmesh.h" #include "BKE_tracking.h" -#include "BKE_mask.h" #include "BIK_api.h" #include "ED_anim_api.h" #include "ED_armature.h" -#include "ED_particle.h" +#include "ED_clip.h" #include "ED_image.h" -#include "ED_keyframing.h" #include "ED_keyframes_edit.h" -#include "ED_object.h" +#include "ED_keyframing.h" #include "ED_markers.h" +#include "ED_mask.h" #include "ED_mesh.h" #include "ED_node.h" -#include "ED_clip.h" -#include "ED_mask.h" +#include "ED_object.h" +#include "ED_particle.h" #include "UI_view2d.h" diff --git a/source/blender/editors/transform/transform_convert_action.c b/source/blender/editors/transform/transform_convert_action.c index f1bc54f12d1..c9273121df5 100644 --- a/source/blender/editors/transform/transform_convert_action.c +++ b/source/blender/editors/transform/transform_convert_action.c @@ -30,8 +30,8 @@ #include "BLI_math.h" #include "BLI_rect.h" -#include "BKE_nla.h" #include "BKE_context.h" +#include "BKE_nla.h" #include "BKE_report.h" #include "ED_anim_api.h" diff --git a/source/blender/editors/transform/transform_convert_mesh.c b/source/blender/editors/transform/transform_convert_mesh.c index 14f07387046..29a74be8e2b 100644 --- a/source/blender/editors/transform/transform_convert_mesh.c +++ b/source/blender/editors/transform/transform_convert_mesh.c @@ -29,9 +29,9 @@ #include "BLI_alloca.h" #include "BLI_bitmap.h" +#include "BLI_linklist_stack.h" #include "BLI_math.h" #include "BLI_memarena.h" -#include "BLI_linklist_stack.h" #include "BKE_context.h" #include "BKE_crazyspace.h" diff --git a/source/blender/editors/transform/transform_convert_nla.c b/source/blender/editors/transform/transform_convert_nla.c index 7c34c583210..580a8d79d7a 100644 --- a/source/blender/editors/transform/transform_convert_nla.c +++ b/source/blender/editors/transform/transform_convert_nla.c @@ -26,11 +26,11 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" -#include "BKE_nla.h" #include "BKE_context.h" +#include "BKE_nla.h" #include "BKE_report.h" #include "ED_anim_api.h" diff --git a/source/blender/editors/transform/transform_convert_particle.c b/source/blender/editors/transform/transform_convert_particle.c index 9054897b7dd..4e1fc6ae1fa 100644 --- a/source/blender/editors/transform/transform_convert_particle.c +++ b/source/blender/editors/transform/transform_convert_particle.c @@ -21,8 +21,8 @@ * \ingroup edtransform */ -#include "DNA_particle_types.h" #include "DNA_modifier_types.h" +#include "DNA_particle_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/transform/transform_convert_sculpt.c b/source/blender/editors/transform/transform_convert_sculpt.c index 600c51dc0d7..55dc36e9693 100644 --- a/source/blender/editors/transform/transform_convert_sculpt.c +++ b/source/blender/editors/transform/transform_convert_sculpt.c @@ -26,8 +26,8 @@ #include "BLI_math.h" #include "BKE_context.h" -#include "BKE_report.h" #include "BKE_paint.h" +#include "BKE_report.h" #include "transform.h" #include "transform_convert.h" diff --git a/source/blender/editors/transform/transform_convert_sequencer.c b/source/blender/editors/transform/transform_convert_sequencer.c index a35c814ee23..f6dc9b9c412 100644 --- a/source/blender/editors/transform/transform_convert_sequencer.c +++ b/source/blender/editors/transform/transform_convert_sequencer.c @@ -28,8 +28,8 @@ #include "BLI_math.h" #include "BKE_context.h" -#include "BKE_sequencer.h" #include "BKE_report.h" +#include "BKE_sequencer.h" #include "transform.h" #include "transform_convert.h" diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 716df24f195..ca0eb40e7b1 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -21,8 +21,8 @@ * \ingroup edtransform */ -#include #include +#include #include "MEM_guardedalloc.h" @@ -34,20 +34,20 @@ #include "DNA_constraint_types.h" #include "DNA_gpencil_types.h" #include "DNA_lattice_types.h" +#include "DNA_mask_types.h" +#include "DNA_mesh_types.h" +#include "DNA_meta_types.h" +#include "DNA_modifier_types.h" +#include "DNA_movieclip_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_sequence_types.h" #include "DNA_space_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_mesh_types.h" #include "DNA_view3d_types.h" -#include "DNA_modifier_types.h" -#include "DNA_movieclip_types.h" -#include "DNA_mask_types.h" -#include "DNA_meta_types.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_rand.h" #include "BLI_utildefines.h" @@ -86,24 +86,24 @@ #include "ED_anim_api.h" #include "ED_armature.h" +#include "ED_clip.h" +#include "ED_curve.h" /* for curve_editnurbs */ +#include "ED_gpencil.h" #include "ED_image.h" #include "ED_keyframing.h" #include "ED_markers.h" #include "ED_mesh.h" #include "ED_object.h" #include "ED_particle.h" +#include "ED_screen.h" #include "ED_screen_types.h" +#include "ED_sculpt.h" #include "ED_space_api.h" #include "ED_uvedit.h" #include "ED_view3d.h" -#include "ED_curve.h" /* for curve_editnurbs */ -#include "ED_clip.h" -#include "ED_screen.h" -#include "ED_gpencil.h" -#include "ED_sculpt.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "RE_engine.h" diff --git a/source/blender/editors/transform/transform_gizmo_2d.c b/source/blender/editors/transform/transform_gizmo_2d.c index 82d51141a8b..dce2625e8a1 100644 --- a/source/blender/editors/transform/transform_gizmo_2d.c +++ b/source/blender/editors/transform/transform_gizmo_2d.c @@ -42,15 +42,15 @@ #include "UI_view2d.h" #include "WM_api.h" +#include "WM_message.h" #include "WM_types.h" #include "wm.h" /* XXX */ -#include "WM_message.h" +#include "ED_gizmo_library.h" #include "ED_gizmo_utils.h" #include "ED_image.h" #include "ED_screen.h" #include "ED_uvedit.h" -#include "ED_gizmo_library.h" #include "transform.h" /* own include */ diff --git a/source/blender/editors/transform/transform_gizmo_3d.c b/source/blender/editors/transform/transform_gizmo_3d.c index 57f302e2d50..de7b2ec02de 100644 --- a/source/blender/editors/transform/transform_gizmo_3d.c +++ b/source/blender/editors/transform/transform_gizmo_3d.c @@ -22,58 +22,58 @@ * Used for 3D View */ +#include +#include #include #include -#include -#include #include "DNA_armature_types.h" #include "DNA_curve_types.h" #include "DNA_gpencil_types.h" #include "DNA_lattice_types.h" #include "DNA_meta_types.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" #include "DNA_view3d_types.h" #include "BLI_array_utils.h" #include "BLI_listbase.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BKE_action.h" #include "BKE_context.h" #include "BKE_curve.h" -#include "BKE_global.h" -#include "BKE_layer.h" -#include "BKE_particle.h" -#include "BKE_pointcache.h" #include "BKE_editmesh.h" -#include "BKE_lattice.h" +#include "BKE_global.h" #include "BKE_gpencil.h" -#include "BKE_scene.h" -#include "BKE_workspace.h" +#include "BKE_lattice.h" +#include "BKE_layer.h" #include "BKE_object.h" #include "BKE_paint.h" +#include "BKE_particle.h" +#include "BKE_pointcache.h" +#include "BKE_scene.h" +#include "BKE_workspace.h" #include "DEG_depsgraph.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "wm.h" #include "ED_armature.h" #include "ED_curve.h" -#include "ED_object.h" -#include "ED_particle.h" -#include "ED_view3d.h" -#include "ED_gpencil.h" -#include "ED_screen.h" #include "ED_gizmo_library.h" #include "ED_gizmo_utils.h" +#include "ED_gpencil.h" +#include "ED_object.h" +#include "ED_particle.h" +#include "ED_screen.h" +#include "ED_view3d.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/transform/transform_gizmo_extrude_3d.c b/source/blender/editors/transform/transform_gizmo_extrude_3d.c index 8b5db2b57ec..e6e74668c2c 100644 --- a/source/blender/editors/transform/transform_gizmo_extrude_3d.c +++ b/source/blender/editors/transform/transform_gizmo_extrude_3d.c @@ -18,10 +18,10 @@ * \ingroup edmesh */ -#include "BLI_utildefines.h" #include "BLI_array_utils.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_global.h" @@ -30,15 +30,15 @@ #include "RNA_define.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" +#include "ED_gizmo_library.h" +#include "ED_gizmo_utils.h" #include "ED_screen.h" #include "ED_transform.h" #include "ED_view3d.h" -#include "ED_gizmo_library.h" -#include "ED_gizmo_utils.h" #include "UI_resources.h" diff --git a/source/blender/editors/transform/transform_input.c b/source/blender/editors/transform/transform_input.c index fc71457171d..75463dcb7db 100644 --- a/source/blender/editors/transform/transform_input.c +++ b/source/blender/editors/transform/transform_input.c @@ -18,8 +18,8 @@ * \ingroup edtransform */ -#include #include +#include #include "DNA_screen_types.h" @@ -28,8 +28,8 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "transform.h" diff --git a/source/blender/editors/transform/transform_mode_baketime.c b/source/blender/editors/transform/transform_mode_baketime.c index b19fabfbb04..0feaa27d4ce 100644 --- a/source/blender/editors/transform/transform_mode_baketime.c +++ b/source/blender/editors/transform/transform_mode_baketime.c @@ -36,8 +36,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Bake-Time) */ diff --git a/source/blender/editors/transform/transform_mode_bbone_resize.c b/source/blender/editors/transform/transform_mode_bbone_resize.c index 93d4bee4a12..1a32a550cb0 100644 --- a/source/blender/editors/transform/transform_mode_bbone_resize.c +++ b/source/blender/editors/transform/transform_mode_bbone_resize.c @@ -37,8 +37,8 @@ #include "transform.h" #include "transform_constraints.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (EditBone (B-bone) width scaling) */ diff --git a/source/blender/editors/transform/transform_mode_bend.c b/source/blender/editors/transform/transform_mode_bend.c index d4c39ac969b..bf80673fbb4 100644 --- a/source/blender/editors/transform/transform_mode_bend.c +++ b/source/blender/editors/transform/transform_mode_bend.c @@ -43,8 +43,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Bend) */ diff --git a/source/blender/editors/transform/transform_mode_boneenvelope.c b/source/blender/editors/transform/transform_mode_boneenvelope.c index 006cb1b0cc4..0886d4e01ef 100644 --- a/source/blender/editors/transform/transform_mode_boneenvelope.c +++ b/source/blender/editors/transform/transform_mode_boneenvelope.c @@ -36,8 +36,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Bone Envelope) */ diff --git a/source/blender/editors/transform/transform_mode_boneroll.c b/source/blender/editors/transform/transform_mode_boneroll.c index 37c7e2bdaf5..8e9d680f269 100644 --- a/source/blender/editors/transform/transform_mode_boneroll.c +++ b/source/blender/editors/transform/transform_mode_boneroll.c @@ -36,8 +36,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (EditBone Roll) */ diff --git a/source/blender/editors/transform/transform_mode_curveshrinkfatten.c b/source/blender/editors/transform/transform_mode_curveshrinkfatten.c index 17a2072bbfe..6ccb0e757c3 100644 --- a/source/blender/editors/transform/transform_mode_curveshrinkfatten.c +++ b/source/blender/editors/transform/transform_mode_curveshrinkfatten.c @@ -36,8 +36,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Curve Shrink/Fatten) */ diff --git a/source/blender/editors/transform/transform_mode_edge_bevelweight.c b/source/blender/editors/transform/transform_mode_edge_bevelweight.c index e75ebbdeca3..15a9e7384b1 100644 --- a/source/blender/editors/transform/transform_mode_edge_bevelweight.c +++ b/source/blender/editors/transform/transform_mode_edge_bevelweight.c @@ -36,8 +36,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Bevel Weight) */ diff --git a/source/blender/editors/transform/transform_mode_edge_crease.c b/source/blender/editors/transform/transform_mode_edge_crease.c index e4e8e07f95e..8865721bc7e 100644 --- a/source/blender/editors/transform/transform_mode_edge_crease.c +++ b/source/blender/editors/transform/transform_mode_edge_crease.c @@ -36,8 +36,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Crease) */ diff --git a/source/blender/editors/transform/transform_mode_edge_rotate_normal.c b/source/blender/editors/transform/transform_mode_edge_rotate_normal.c index 341c98c30d8..69cd909cff9 100644 --- a/source/blender/editors/transform/transform_mode_edge_rotate_normal.c +++ b/source/blender/editors/transform/transform_mode_edge_rotate_normal.c @@ -25,8 +25,8 @@ #include "BLI_math.h" -#include "BKE_editmesh.h" #include "BKE_context.h" +#include "BKE_editmesh.h" #include "BKE_mesh.h" #include "BKE_unit.h" @@ -35,8 +35,8 @@ #include "UI_interface.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Normal Rotation) */ diff --git a/source/blender/editors/transform/transform_mode_edge_seq_slide.c b/source/blender/editors/transform/transform_mode_edge_seq_slide.c index 0b6b72d9eee..e23e5c188c8 100644 --- a/source/blender/editors/transform/transform_mode_edge_seq_slide.c +++ b/source/blender/editors/transform/transform_mode_edge_seq_slide.c @@ -38,8 +38,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Sequencer Slide) */ diff --git a/source/blender/editors/transform/transform_mode_edge_slide.c b/source/blender/editors/transform/transform_mode_edge_slide.c index a012d89d107..b54e6afc9a1 100644 --- a/source/blender/editors/transform/transform_mode_edge_slide.c +++ b/source/blender/editors/transform/transform_mode_edge_slide.c @@ -51,8 +51,8 @@ #include "transform.h" #include "transform_convert.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Edge Slide) */ diff --git a/source/blender/editors/transform/transform_mode_gpopacity.c b/source/blender/editors/transform/transform_mode_gpopacity.c index 0d8b5d2a5c9..460e2b41da8 100644 --- a/source/blender/editors/transform/transform_mode_gpopacity.c +++ b/source/blender/editors/transform/transform_mode_gpopacity.c @@ -36,8 +36,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (GPencil Opacity) */ diff --git a/source/blender/editors/transform/transform_mode_gpshrinkfatten.c b/source/blender/editors/transform/transform_mode_gpshrinkfatten.c index 84ea3f5f684..edb353b343d 100644 --- a/source/blender/editors/transform/transform_mode_gpshrinkfatten.c +++ b/source/blender/editors/transform/transform_mode_gpshrinkfatten.c @@ -36,8 +36,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (GPencil Shrink/Fatten) */ diff --git a/source/blender/editors/transform/transform_mode_maskshrinkfatten.c b/source/blender/editors/transform/transform_mode_maskshrinkfatten.c index 9405a66162a..b6719067f5b 100644 --- a/source/blender/editors/transform/transform_mode_maskshrinkfatten.c +++ b/source/blender/editors/transform/transform_mode_maskshrinkfatten.c @@ -36,8 +36,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Mask Shrink/Fatten) */ diff --git a/source/blender/editors/transform/transform_mode_push_pull.c b/source/blender/editors/transform/transform_mode_push_pull.c index c3edcdcf65c..890fc820cd5 100644 --- a/source/blender/editors/transform/transform_mode_push_pull.c +++ b/source/blender/editors/transform/transform_mode_push_pull.c @@ -37,8 +37,8 @@ #include "transform.h" #include "transform_constraints.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Push/Pull) */ diff --git a/source/blender/editors/transform/transform_mode_resize.c b/source/blender/editors/transform/transform_mode_resize.c index 3071c8f351e..59f2ab5c294 100644 --- a/source/blender/editors/transform/transform_mode_resize.c +++ b/source/blender/editors/transform/transform_mode_resize.c @@ -35,8 +35,8 @@ #include "transform.h" #include "transform_constraints.h" #include "transform_convert.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Resize) */ diff --git a/source/blender/editors/transform/transform_mode_rotate.c b/source/blender/editors/transform/transform_mode_rotate.c index 8a6024bb8fb..bea039194d0 100644 --- a/source/blender/editors/transform/transform_mode_rotate.c +++ b/source/blender/editors/transform/transform_mode_rotate.c @@ -33,8 +33,8 @@ #include "UI_interface.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Rotation) */ diff --git a/source/blender/editors/transform/transform_mode_shear.c b/source/blender/editors/transform/transform_mode_shear.c index c3313046a11..8b7dc12f41b 100644 --- a/source/blender/editors/transform/transform_mode_shear.c +++ b/source/blender/editors/transform/transform_mode_shear.c @@ -40,8 +40,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Shear) */ diff --git a/source/blender/editors/transform/transform_mode_shrink_fatten.c b/source/blender/editors/transform/transform_mode_shrink_fatten.c index 0679057de26..e24e63f445c 100644 --- a/source/blender/editors/transform/transform_mode_shrink_fatten.c +++ b/source/blender/editors/transform/transform_mode_shrink_fatten.c @@ -38,8 +38,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Shrink-Fatten) */ diff --git a/source/blender/editors/transform/transform_mode_skin_resize.c b/source/blender/editors/transform/transform_mode_skin_resize.c index 0cb774bc4a0..23ba9a07f3e 100644 --- a/source/blender/editors/transform/transform_mode_skin_resize.c +++ b/source/blender/editors/transform/transform_mode_skin_resize.c @@ -34,8 +34,8 @@ #include "transform.h" #include "transform_constraints.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Skin) */ diff --git a/source/blender/editors/transform/transform_mode_tilt.c b/source/blender/editors/transform/transform_mode_tilt.c index c57c5e83de8..9ae0cfdf805 100644 --- a/source/blender/editors/transform/transform_mode_tilt.c +++ b/source/blender/editors/transform/transform_mode_tilt.c @@ -36,8 +36,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Tilt) */ diff --git a/source/blender/editors/transform/transform_mode_timetranslate.c b/source/blender/editors/transform/transform_mode_timetranslate.c index 3ea97d152ef..494609cafb0 100644 --- a/source/blender/editors/transform/transform_mode_timetranslate.c +++ b/source/blender/editors/transform/transform_mode_timetranslate.c @@ -40,8 +40,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Animation Translation) */ diff --git a/source/blender/editors/transform/transform_mode_tosphere.c b/source/blender/editors/transform/transform_mode_tosphere.c index d198cd6eeb2..5a3b138823c 100644 --- a/source/blender/editors/transform/transform_mode_tosphere.c +++ b/source/blender/editors/transform/transform_mode_tosphere.c @@ -36,8 +36,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (ToSphere) */ diff --git a/source/blender/editors/transform/transform_mode_trackball.c b/source/blender/editors/transform/transform_mode_trackball.c index d3abf782eb8..758ee3b9cae 100644 --- a/source/blender/editors/transform/transform_mode_trackball.c +++ b/source/blender/editors/transform/transform_mode_trackball.c @@ -36,8 +36,8 @@ #include "BLT_translation.h" #include "transform.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Rotation - Trackball) */ diff --git a/source/blender/editors/transform/transform_mode_translate.c b/source/blender/editors/transform/transform_mode_translate.c index 978b36835cd..aef5a999d18 100644 --- a/source/blender/editors/transform/transform_mode_translate.c +++ b/source/blender/editors/transform/transform_mode_translate.c @@ -44,8 +44,8 @@ #include "transform.h" #include "transform_convert.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Translation) */ diff --git a/source/blender/editors/transform/transform_mode_vert_slide.c b/source/blender/editors/transform/transform_mode_vert_slide.c index 15f999d37ec..2325c4d1d26 100644 --- a/source/blender/editors/transform/transform_mode_vert_slide.c +++ b/source/blender/editors/transform/transform_mode_vert_slide.c @@ -48,8 +48,8 @@ #include "transform.h" #include "transform_convert.h" -#include "transform_snap.h" #include "transform_mode.h" +#include "transform_snap.h" /* -------------------------------------------------------------------- */ /* Transform (Vert Slide) */ diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c index ee1353a28fa..aaf7fbc3108 100644 --- a/source/blender/editors/transform/transform_ops.c +++ b/source/blender/editors/transform/transform_ops.c @@ -30,10 +30,10 @@ #include "BLT_translation.h" #include "BKE_context.h" -#include "BKE_global.h" -#include "BKE_report.h" #include "BKE_editmesh.h" +#include "BKE_global.h" #include "BKE_layer.h" +#include "BKE_report.h" #include "BKE_scene.h" #include "RNA_access.h" @@ -42,8 +42,8 @@ #include "WM_api.h" #include "WM_message.h" -#include "WM_types.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index 3f08f795d32..5cc1feddf7a 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -18,9 +18,9 @@ * \ingroup edtransform */ -#include -#include #include +#include +#include #include "MEM_guardedalloc.h" @@ -34,15 +34,15 @@ #include "DNA_view3d_types.h" #include "DNA_workspace_types.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_string.h" #include "BLI_string_utils.h" #include "BLI_utildefines.h" #include "BKE_action.h" -#include "BKE_curve.h" #include "BKE_context.h" +#include "BKE_curve.h" #include "BKE_editmesh.h" #include "BKE_layer.h" #include "BKE_report.h" diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 0a0a6ffd62f..86e99c986f8 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -21,36 +21,36 @@ * \ingroup edtransform */ -#include -#include #include +#include #include +#include #include "PIL_time.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" #include "DNA_meshdata_types.h" /* Temporary, for snapping to other unselected meshes */ #include "DNA_node_types.h" -#include "DNA_space_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "DNA_screen_types.h" +#include "DNA_space_types.h" #include "DNA_view3d_types.h" #include "DNA_windowmanager_types.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "GPU_immediate.h" #include "GPU_state.h" -#include "BKE_layer.h" -#include "BKE_object.h" #include "BKE_anim.h" /* for duplis */ #include "BKE_context.h" #include "BKE_editmesh.h" -#include "BKE_sequencer.h" +#include "BKE_layer.h" #include "BKE_main.h" +#include "BKE_object.h" +#include "BKE_sequencer.h" #include "RNA_access.h" @@ -59,9 +59,9 @@ #include "ED_image.h" #include "ED_markers.h" #include "ED_node.h" +#include "ED_transform_snap_object_context.h" #include "ED_uvedit.h" #include "ED_view3d.h" -#include "ED_transform_snap_object_context.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c index af2804a9161..f55c73fd15e 100644 --- a/source/blender/editors/transform/transform_snap_object.c +++ b/source/blender/editors/transform/transform_snap_object.c @@ -22,11 +22,11 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" -#include "BLI_kdopbvh.h" -#include "BLI_memarena.h" #include "BLI_ghash.h" +#include "BLI_kdopbvh.h" #include "BLI_listbase.h" +#include "BLI_math.h" +#include "BLI_memarena.h" #include "BLI_utildefines.h" #include "DNA_armature_types.h" @@ -38,23 +38,23 @@ #include "DNA_screen_types.h" #include "DNA_view3d_types.h" -#include "BKE_bvhutils.h" -#include "BKE_armature.h" -#include "BKE_curve.h" -#include "BKE_object.h" #include "BKE_anim.h" /* for duplis */ +#include "BKE_armature.h" +#include "BKE_bvhutils.h" +#include "BKE_curve.h" #include "BKE_editmesh.h" #include "BKE_layer.h" #include "BKE_main.h" -#include "BKE_tracking.h" #include "BKE_mesh.h" #include "BKE_mesh_runtime.h" +#include "BKE_object.h" +#include "BKE_tracking.h" #include "DEG_depsgraph_query.h" +#include "ED_armature.h" #include "ED_transform_snap_object_context.h" #include "ED_view3d.h" -#include "ED_armature.h" #include "ED_transform.h" diff --git a/source/blender/editors/undo/ed_undo.c b/source/blender/editors/undo/ed_undo.c index cb4f4dfa46c..123fd5f35da 100644 --- a/source/blender/editors/undo/ed_undo.c +++ b/source/blender/editors/undo/ed_undo.c @@ -27,11 +27,11 @@ #include "CLG_log.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" -#include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -39,27 +39,27 @@ #include "BKE_callbacks.h" #include "BKE_context.h" #include "BKE_global.h" +#include "BKE_layer.h" #include "BKE_main.h" +#include "BKE_paint.h" #include "BKE_report.h" #include "BKE_scene.h" #include "BKE_screen.h" -#include "BKE_layer.h" #include "BKE_undo_system.h" #include "BKE_workspace.h" -#include "BKE_paint.h" #include "BLO_blend_validate.h" #include "ED_gpencil.h" -#include "ED_render.h" #include "ED_object.h" #include "ED_outliner.h" +#include "ED_render.h" #include "ED_screen.h" #include "ED_undo.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/undo/memfile_undo.c b/source/blender/editors/undo/memfile_undo.c index f9235938eb7..086aa6c4c9d 100644 --- a/source/blender/editors/undo/memfile_undo.c +++ b/source/blender/editors/undo/memfile_undo.c @@ -20,8 +20,8 @@ * Wrapper between 'ED_undo.h' and 'BKE_undo_system.h' API's. */ -#include "BLI_utildefines.h" #include "BLI_sys_types.h" +#include "BLI_utildefines.h" #include "BLI_ghash.h" diff --git a/source/blender/editors/util/ed_transverts.c b/source/blender/editors/util/ed_transverts.c index f054d09094d..67a62473dc0 100644 --- a/source/blender/editors/util/ed_transverts.c +++ b/source/blender/editors/util/ed_transverts.c @@ -27,18 +27,18 @@ #include "DNA_curve_types.h" #include "DNA_lattice_types.h" #include "DNA_meta_types.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" -#include "BKE_curve.h" -#include "BKE_lattice.h" -#include "BKE_editmesh.h" #include "BKE_DerivedMesh.h" #include "BKE_context.h" +#include "BKE_curve.h" +#include "BKE_editmesh.h" +#include "BKE_lattice.h" #include "BKE_mesh_iterators.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c index e7d58c8f84b..10b8851f157 100644 --- a/source/blender/editors/util/ed_util.c +++ b/source/blender/editors/util/ed_util.c @@ -21,23 +21,23 @@ * \ingroup edutil */ +#include #include #include -#include #include "MEM_guardedalloc.h" #include "DNA_armature_types.h" #include "DNA_mesh_types.h" #include "DNA_object_types.h" +#include "DNA_packedFile_types.h" +#include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "DNA_scene_types.h" -#include "DNA_packedFile_types.h" -#include "BLI_utildefines.h" -#include "BLI_string.h" #include "BLI_path_util.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -45,6 +45,7 @@ #include "BKE_global.h" #include "BKE_layer.h" #include "BKE_main.h" +#include "BKE_material.h" #include "BKE_multires.h" #include "BKE_object.h" #include "BKE_packedFile.h" @@ -52,7 +53,6 @@ #include "BKE_screen.h" #include "BKE_undo_system.h" #include "BKE_workspace.h" -#include "BKE_material.h" #include "DEG_depsgraph.h" @@ -73,9 +73,9 @@ #include "UI_interface.h" #include "UI_resources.h" -#include "WM_types.h" -#include "WM_api.h" #include "RNA_access.h" +#include "WM_api.h" +#include "WM_types.h" /* ********* general editor util funcs, not BKE stuff please! ********* */ diff --git a/source/blender/editors/util/gizmo_utils.c b/source/blender/editors/util/gizmo_utils.c index b856c831424..85a7cc94ae3 100644 --- a/source/blender/editors/util/gizmo_utils.c +++ b/source/blender/editors/util/gizmo_utils.c @@ -28,9 +28,9 @@ #include "DNA_workspace_types.h" -#include "WM_types.h" #include "WM_api.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "ED_gizmo_utils.h" diff --git a/source/blender/editors/util/numinput.c b/source/blender/editors/util/numinput.c index 88b1bbe3f4b..3c0d0beebe3 100644 --- a/source/blender/editors/util/numinput.c +++ b/source/blender/editors/util/numinput.c @@ -20,11 +20,11 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_math.h" #include "BLI_string.h" -#include "BLI_string_utf8.h" #include "BLI_string_cursor_utf8.h" +#include "BLI_string_utf8.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_scene.h" diff --git a/source/blender/editors/util/select_utils.c b/source/blender/editors/util/select_utils.c index a26579b0d84..85f48e6d397 100644 --- a/source/blender/editors/util/select_utils.c +++ b/source/blender/editors/util/select_utils.c @@ -18,9 +18,9 @@ * \ingroup edutil */ -#include "BLI_utildefines.h" #include "BLI_kdtree.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "ED_select_utils.h" diff --git a/source/blender/editors/uvedit/uvedit_buttons.c b/source/blender/editors/uvedit/uvedit_buttons.c index 44bffc76859..887ce274680 100644 --- a/source/blender/editors/uvedit/uvedit_buttons.c +++ b/source/blender/editors/uvedit/uvedit_buttons.c @@ -21,8 +21,8 @@ * \ingroup eduv */ -#include #include +#include #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c index d9345808d28..e3504e20464 100644 --- a/source/blender/editors/uvedit/uvedit_draw.c +++ b/source/blender/editors/uvedit/uvedit_draw.c @@ -43,8 +43,8 @@ #include "BKE_deform.h" #include "BKE_editmesh.h" -#include "BKE_material.h" #include "BKE_layer.h" +#include "BKE_material.h" #include "BKE_scene.h" @@ -61,8 +61,8 @@ #include "ED_mesh.h" #include "ED_uvedit.h" -#include "UI_resources.h" #include "UI_interface.h" +#include "UI_resources.h" #include "UI_view2d.h" #include "uvedit_intern.h" diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 4623cc61d29..b805681cfd3 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -21,32 +21,31 @@ * \ingroup eduv */ -#include -#include #include +#include #include #include "MEM_guardedalloc.h" -#include "DNA_object_types.h" +#include "DNA_image_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_node_types.h" -#include "DNA_image_types.h" -#include "DNA_space_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "DNA_space_types.h" -#include "BLI_utildefines.h" #include "BLI_alloca.h" -#include "BLI_math.h" -#include "BLI_lasso_2d.h" -#include "BLI_blenlib.h" #include "BLI_array.h" +#include "BLI_blenlib.h" #include "BLI_hash.h" -#include "BLI_kdtree.h" #include "BLI_kdopbvh.h" +#include "BLI_kdtree.h" +#include "BLI_lasso_2d.h" +#include "BLI_math.h" #include "BLI_polyfill_2d.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -69,19 +68,19 @@ #include "ED_image.h" #include "ED_mesh.h" #include "ED_node.h" -#include "ED_uvedit.h" #include "ED_object.h" #include "ED_screen.h" #include "ED_select_utils.h" #include "ED_transform.h" +#include "ED_uvedit.h" #include "RNA_access.h" #include "RNA_define.h" #include "RNA_enum_types.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c index 91e8c36ea35..5a36c83b62e 100644 --- a/source/blender/editors/uvedit/uvedit_parametrizer.c +++ b/source/blender/editors/uvedit/uvedit_parametrizer.c @@ -20,21 +20,21 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_memarena.h" -#include "BLI_math.h" -#include "BLI_rand.h" -#include "BLI_heap.h" #include "BLI_boxpack_2d.h" #include "BLI_convexhull_2d.h" +#include "BLI_heap.h" +#include "BLI_math.h" +#include "BLI_memarena.h" #include "BLI_polyfill_2d.h" #include "BLI_polyfill_2d_beautify.h" +#include "BLI_rand.h" +#include "BLI_utildefines.h" #include "uvedit_parametrizer.h" #include -#include #include +#include #include #include "BLI_sys_types.h" /* for intptr_t support */ diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c index d6652aca216..cf23cac38a7 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.c +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c @@ -21,38 +21,38 @@ * \ingroup eduv */ +#include #include #include -#include #include "MEM_guardedalloc.h" -#include "DNA_object_types.h" #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_math.h" #include "BLI_math_vector.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" #include "BKE_context.h" #include "BKE_customdata.h" -#include "BKE_mesh_mapping.h" #include "BKE_editmesh.h" #include "BKE_layer.h" +#include "BKE_mesh_mapping.h" #include "DEG_depsgraph.h" #include "UI_interface.h" #include "ED_mesh.h" -#include "ED_uvedit.h" #include "ED_screen.h" #include "ED_space_api.h" +#include "ED_uvedit.h" #include "GPU_batch.h" #include "GPU_state.h" @@ -63,8 +63,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "UI_view2d.h" #include "UI_resources.h" +#include "UI_view2d.h" #include "uvedit_intern.h" diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c index 7f42eeb5dd7..84d38a88902 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c @@ -21,40 +21,40 @@ * \ingroup eduv */ -#include -#include #include +#include +#include #include "MEM_guardedalloc.h" #include "DNA_camera_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "DNA_modifier_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_modifier_types.h" -#include "BLI_utildefines.h" #include "BLI_alloca.h" #include "BLI_math.h" -#include "BLI_uvproject.h" #include "BLI_string.h" +#include "BLI_utildefines.h" +#include "BLI_uvproject.h" #include "BLT_translation.h" #include "BKE_cdderivedmesh.h" -#include "BKE_subsurf.h" #include "BKE_context.h" #include "BKE_customdata.h" -#include "BKE_image.h" -#include "BKE_main.h" -#include "BKE_material.h" -#include "BKE_report.h" -#include "BKE_scene.h" #include "BKE_editmesh.h" +#include "BKE_image.h" #include "BKE_layer.h" #include "BKE_lib_id.h" +#include "BKE_main.h" +#include "BKE_material.h" #include "BKE_mesh.h" +#include "BKE_report.h" +#include "BKE_scene.h" +#include "BKE_subsurf.h" #include "DEG_depsgraph.h" diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp index ab8d77e8194..427e4198e5c 100644 --- a/source/blender/freestyle/intern/python/BPy_Convert.cpp +++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp @@ -25,24 +25,24 @@ #include "BPy_Id.h" #include "BPy_IntegrationType.h" #include "BPy_Interface0D.h" +#include "BPy_Interface1D.h" +#include "BPy_MediumType.h" +#include "BPy_Nature.h" +#include "BPy_SShape.h" +#include "BPy_StrokeAttribute.h" +#include "BPy_ViewShape.h" #include "Interface0D/BPy_CurvePoint.h" -#include "Interface0D/CurvePoint/BPy_StrokeVertex.h" #include "Interface0D/BPy_SVertex.h" #include "Interface0D/BPy_ViewVertex.h" +#include "Interface0D/CurvePoint/BPy_StrokeVertex.h" #include "Interface0D/ViewVertex/BPy_NonTVertex.h" #include "Interface0D/ViewVertex/BPy_TVertex.h" -#include "BPy_Interface1D.h" #include "Interface1D/BPy_FEdge.h" #include "Interface1D/BPy_Stroke.h" #include "Interface1D/BPy_ViewEdge.h" #include "Interface1D/Curve/BPy_Chain.h" #include "Interface1D/FEdge/BPy_FEdgeSharp.h" #include "Interface1D/FEdge/BPy_FEdgeSmooth.h" -#include "BPy_Nature.h" -#include "BPy_MediumType.h" -#include "BPy_SShape.h" -#include "BPy_StrokeAttribute.h" -#include "BPy_ViewShape.h" #include "Iterator/BPy_AdjacencyIterator.h" #include "Iterator/BPy_ChainPredicateIterator.h" diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h index fffe25fde60..19e0879beff 100644 --- a/source/blender/freestyle/intern/python/BPy_Convert.h +++ b/source/blender/freestyle/intern/python/BPy_Convert.h @@ -87,8 +87,8 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include "mathutils/mathutils.h" #include "generic/python_utildefines.h" +#include "mathutils/mathutils.h" //============================== // C++ => Python diff --git a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp index a6512a64776..e7fe660cf93 100644 --- a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp +++ b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp @@ -53,10 +53,10 @@ extern "C" { //------------------------ MODULE FUNCTIONS ---------------------------------- -#include "FRS_freestyle.h" -#include "RNA_access.h" #include "BKE_appdir.h" #include "DNA_scene_types.h" +#include "FRS_freestyle.h" +#include "RNA_access.h" #include "bpy_rna.h" /* pyrna_struct_CreatePyObject() */ static char Freestyle_getCurrentScene___doc__[] = @@ -228,8 +228,8 @@ static PyObject *Freestyle_evaluateColorRamp(PyObject * /*self*/, PyObject *args return Vector_CreatePyObject(out, 4, NULL); } -#include "DNA_color_types.h" #include "BKE_colortools.h" /* BKE_curvemapping_evaluateF() */ +#include "DNA_color_types.h" static char Freestyle_evaluateCurveMappingF___doc__[] = ".. function:: evaluateCurveMappingF(cumap, cur, value)\n" diff --git a/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp b/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp index 0286932146c..98b0099bcad 100644 --- a/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp +++ b/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp @@ -21,10 +21,10 @@ #include "BPy_IntegrationType.h" #include "BPy_Convert.h" +#include "Iterator/BPy_Interface0DIterator.h" #include "UnaryFunction0D/BPy_UnaryFunction0DDouble.h" #include "UnaryFunction0D/BPy_UnaryFunction0DFloat.h" #include "UnaryFunction0D/BPy_UnaryFunction0DUnsigned.h" -#include "Iterator/BPy_Interface0DIterator.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp index 628a9d43b6c..18e11c55bc4 100644 --- a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp +++ b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp @@ -21,14 +21,14 @@ #include "BPy_Interface0D.h" #include "BPy_Convert.h" +#include "BPy_Nature.h" #include "Interface0D/BPy_CurvePoint.h" -#include "Interface0D/CurvePoint/BPy_StrokeVertex.h" #include "Interface0D/BPy_SVertex.h" #include "Interface0D/BPy_ViewVertex.h" +#include "Interface0D/CurvePoint/BPy_StrokeVertex.h" #include "Interface0D/ViewVertex/BPy_NonTVertex.h" #include "Interface0D/ViewVertex/BPy_TVertex.h" #include "Interface1D/BPy_FEdge.h" -#include "BPy_Nature.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp index af1f8d2d549..423b97fe3cd 100644 --- a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp +++ b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp @@ -21,13 +21,13 @@ #include "BPy_Interface1D.h" #include "BPy_Convert.h" -#include "Interface1D/BPy_FrsCurve.h" -#include "Interface1D/Curve/BPy_Chain.h" #include "Interface1D/BPy_FEdge.h" -#include "Interface1D/FEdge/BPy_FEdgeSharp.h" -#include "Interface1D/FEdge/BPy_FEdgeSmooth.h" +#include "Interface1D/BPy_FrsCurve.h" #include "Interface1D/BPy_Stroke.h" #include "Interface1D/BPy_ViewEdge.h" +#include "Interface1D/Curve/BPy_Chain.h" +#include "Interface1D/FEdge/BPy_FEdgeSharp.h" +#include "Interface1D/FEdge/BPy_FEdgeSmooth.h" #include "BPy_MediumType.h" diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.cpp b/source/blender/freestyle/intern/python/BPy_Iterator.cpp index daa2bdbef81..6e00a05b969 100644 --- a/source/blender/freestyle/intern/python/BPy_Iterator.cpp +++ b/source/blender/freestyle/intern/python/BPy_Iterator.cpp @@ -22,15 +22,15 @@ #include "BPy_Convert.h" #include "Iterator/BPy_AdjacencyIterator.h" -#include "Iterator/BPy_Interface0DIterator.h" -#include "Iterator/BPy_CurvePointIterator.h" -#include "Iterator/BPy_StrokeVertexIterator.h" -#include "Iterator/BPy_SVertexIterator.h" -#include "Iterator/BPy_orientedViewEdgeIterator.h" -#include "Iterator/BPy_ViewEdgeIterator.h" -#include "Iterator/BPy_ChainingIterator.h" #include "Iterator/BPy_ChainPredicateIterator.h" #include "Iterator/BPy_ChainSilhouetteIterator.h" +#include "Iterator/BPy_ChainingIterator.h" +#include "Iterator/BPy_CurvePointIterator.h" +#include "Iterator/BPy_Interface0DIterator.h" +#include "Iterator/BPy_SVertexIterator.h" +#include "Iterator/BPy_StrokeVertexIterator.h" +#include "Iterator/BPy_ViewEdgeIterator.h" +#include "Iterator/BPy_orientedViewEdgeIterator.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/freestyle/intern/python/BPy_Operators.cpp b/source/blender/freestyle/intern/python/BPy_Operators.cpp index 2892d1e9400..510e823ba55 100644 --- a/source/blender/freestyle/intern/python/BPy_Operators.cpp +++ b/source/blender/freestyle/intern/python/BPy_Operators.cpp @@ -21,14 +21,14 @@ #include "BPy_Operators.h" #include "BPy_BinaryPredicate1D.h" +#include "BPy_Convert.h" +#include "BPy_StrokeShader.h" #include "BPy_UnaryPredicate0D.h" #include "BPy_UnaryPredicate1D.h" +#include "Iterator/BPy_ChainingIterator.h" +#include "Iterator/BPy_ViewEdgeIterator.h" #include "UnaryFunction0D/BPy_UnaryFunction0DDouble.h" #include "UnaryFunction1D/BPy_UnaryFunction1DVoid.h" -#include "Iterator/BPy_ViewEdgeIterator.h" -#include "Iterator/BPy_ChainingIterator.h" -#include "BPy_StrokeShader.h" -#include "BPy_Convert.h" #include diff --git a/source/blender/freestyle/intern/python/BPy_SShape.cpp b/source/blender/freestyle/intern/python/BPy_SShape.cpp index d4b5f426a8b..9712dccfa5e 100644 --- a/source/blender/freestyle/intern/python/BPy_SShape.cpp +++ b/source/blender/freestyle/intern/python/BPy_SShape.cpp @@ -20,8 +20,8 @@ #include "BPy_SShape.h" -#include "BPy_Convert.h" #include "BPy_BBox.h" +#include "BPy_Convert.h" #include "BPy_Id.h" #include "Interface0D/BPy_SVertex.h" #include "Interface1D/BPy_FEdge.h" diff --git a/source/blender/freestyle/intern/python/BPy_ViewMap.cpp b/source/blender/freestyle/intern/python/BPy_ViewMap.cpp index 1f162997c44..b7b425abe23 100644 --- a/source/blender/freestyle/intern/python/BPy_ViewMap.cpp +++ b/source/blender/freestyle/intern/python/BPy_ViewMap.cpp @@ -20,8 +20,8 @@ #include "BPy_ViewMap.h" -#include "BPy_Convert.h" #include "BPy_BBox.h" +#include "BPy_Convert.h" #include "Interface1D/BPy_FEdge.h" #include "Interface1D/BPy_ViewEdge.h" diff --git a/source/blender/freestyle/intern/python/BPy_ViewShape.cpp b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp index c08e7eea7b9..f59ae15ae01 100644 --- a/source/blender/freestyle/intern/python/BPy_ViewShape.cpp +++ b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp @@ -21,9 +21,9 @@ #include "BPy_ViewShape.h" #include "BPy_Convert.h" +#include "BPy_SShape.h" #include "Interface0D/BPy_ViewVertex.h" #include "Interface1D/BPy_ViewEdge.h" -#include "BPy_SShape.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/freestyle/intern/python/Director.cpp b/source/blender/freestyle/intern/python/Director.cpp index c931a246961..0769b30ebb7 100644 --- a/source/blender/freestyle/intern/python/Director.cpp +++ b/source/blender/freestyle/intern/python/Director.cpp @@ -26,16 +26,16 @@ #include "BPy_BinaryPredicate1D.h" #include "BPy_FrsMaterial.h" #include "BPy_Id.h" +#include "BPy_StrokeShader.h" #include "BPy_UnaryFunction0D.h" #include "BPy_UnaryFunction1D.h" #include "BPy_UnaryPredicate0D.h" #include "BPy_UnaryPredicate1D.h" -#include "BPy_StrokeShader.h" -#include "Iterator/BPy_ChainingIterator.h" -#include "Iterator/BPy_Interface0DIterator.h" +#include "BPy_ViewShape.h" #include "Interface1D/BPy_Stroke.h" #include "Interface1D/BPy_ViewEdge.h" -#include "BPy_ViewShape.h" +#include "Iterator/BPy_ChainingIterator.h" +#include "Iterator/BPy_Interface0DIterator.h" #include "UnaryFunction0D/BPy_UnaryFunction0DDouble.h" #include "UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.h" diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp index 5ddb8a605ff..c947f37397b 100644 --- a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp @@ -21,8 +21,8 @@ #include "BPy_ViewVertex.h" #include "../BPy_Convert.h" -#include "../Interface1D/BPy_ViewEdge.h" #include "../BPy_Nature.h" +#include "../Interface1D/BPy_ViewEdge.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp index 07373c91726..b4c08714af0 100644 --- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp @@ -20,8 +20,8 @@ #include "BPy_StrokeVertex.h" -#include "../../BPy_Freestyle.h" #include "../../BPy_Convert.h" +#include "../../BPy_Freestyle.h" #include "../../BPy_StrokeAttribute.h" #include "../../Interface0D/BPy_SVertex.h" diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp index 8fa48e54b55..61755b4bbd8 100644 --- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp @@ -21,10 +21,10 @@ #include "BPy_TVertex.h" #include "../../BPy_Convert.h" -#include "../BPy_SVertex.h" #include "../../BPy_Id.h" #include "../../Interface1D/BPy_FEdge.h" #include "../../Interface1D/BPy_ViewEdge.h" +#include "../BPy_SVertex.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp index adbf01cd777..8a09e7722ea 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp @@ -22,9 +22,9 @@ #include "../BPy_Convert.h" #include "../BPy_Id.h" +#include "../BPy_Nature.h" #include "../Interface0D/BPy_SVertex.h" #include "../Interface1D/BPy_ViewEdge.h" -#include "../BPy_Nature.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp index 661d9238edb..3a25ddb0252 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp @@ -22,10 +22,10 @@ #include "../BPy_Convert.h" #include "../BPy_Id.h" +#include "../BPy_MediumType.h" #include "../Interface0D/BPy_SVertex.h" #include "../Interface0D/CurvePoint/BPy_StrokeVertex.h" #include "../Iterator/BPy_StrokeVertexIterator.h" -#include "../BPy_MediumType.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp index 0570d9790ab..58c2ba69c79 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp @@ -22,11 +22,11 @@ #include "../BPy_Convert.h" #include "../BPy_Id.h" +#include "../BPy_Nature.h" +#include "../BPy_ViewShape.h" #include "../Interface0D/BPy_ViewVertex.h" #include "../Interface1D/BPy_FEdge.h" #include "../Interface1D/BPy_ViewEdge.h" -#include "../BPy_Nature.h" -#include "../BPy_ViewShape.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp index 28b8e9d7c0a..164e1646934 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp @@ -20,10 +20,10 @@ #include "BPy_ChainPredicateIterator.h" -#include "../BPy_Convert.h" #include "../BPy_BinaryPredicate1D.h" -#include "../Interface1D/BPy_ViewEdge.h" +#include "../BPy_Convert.h" #include "../BPy_UnaryPredicate1D.h" +#include "../Interface1D/BPy_ViewEdge.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h index 586f7ec40e5..4f559a09ba9 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h @@ -23,8 +23,8 @@ #include "../BPy_UnaryFunction0D.h" -#include #include "../../view_map/ViewMap.h" +#include #ifdef __cplusplus extern "C" { diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp index 543375fa85b..fb887371c3a 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp @@ -21,8 +21,8 @@ #include "BPy_UnaryFunction1DDouble.h" #include "../BPy_Convert.h" -#include "../BPy_Interface1D.h" #include "../BPy_IntegrationType.h" +#include "../BPy_Interface1D.h" #include "UnaryFunction1D_double/BPy_Curvature2DAngleF1D.h" #include "UnaryFunction1D_double/BPy_DensityF1D.h" diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp index fcc72cf7b71..e2a55d49a06 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp @@ -21,8 +21,8 @@ #include "BPy_UnaryFunction1DEdgeNature.h" #include "../BPy_Convert.h" -#include "../BPy_Interface1D.h" #include "../BPy_IntegrationType.h" +#include "../BPy_Interface1D.h" #include "UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.h" diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp index ef4de9a77dc..2eb4f9349da 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp @@ -21,8 +21,8 @@ #include "BPy_UnaryFunction1DFloat.h" #include "../BPy_Convert.h" -#include "../BPy_Interface1D.h" #include "../BPy_IntegrationType.h" +#include "../BPy_Interface1D.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp index 5be9e2dee28..ff306652036 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp @@ -21,8 +21,8 @@ #include "BPy_UnaryFunction1DUnsigned.h" #include "../BPy_Convert.h" -#include "../BPy_Interface1D.h" #include "../BPy_IntegrationType.h" +#include "../BPy_Interface1D.h" #include "UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.h" diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp index 58ab705e8c1..1469b0a6e33 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp @@ -21,8 +21,8 @@ #include "BPy_UnaryFunction1DVec2f.h" #include "../BPy_Convert.h" -#include "../BPy_Interface1D.h" #include "../BPy_IntegrationType.h" +#include "../BPy_Interface1D.h" #include "UnaryFunction1D_Vec2f/BPy_Normal2DF1D.h" #include "UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.h" diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp index e1f64e7cd82..63cd0584adb 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp @@ -21,8 +21,8 @@ #include "BPy_UnaryFunction1DVec3f.h" #include "../BPy_Convert.h" -#include "../BPy_Interface1D.h" #include "../BPy_IntegrationType.h" +#include "../BPy_Interface1D.h" #include "UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.h" diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp index 12b985bc707..cb94d6b75e2 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp @@ -21,8 +21,8 @@ #include "BPy_UnaryFunction1DVectorViewShape.h" #include "../BPy_Convert.h" -#include "../BPy_Interface1D.h" #include "../BPy_IntegrationType.h" +#include "../BPy_Interface1D.h" #include "UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.h" #include "UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.h" diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h index 2869b364ea6..80511e7c145 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h @@ -23,8 +23,8 @@ #include "../BPy_UnaryFunction1D.h" -#include #include "../../view_map/ViewMap.h" +#include #ifdef __cplusplus extern "C" { diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp index 3b55a20939e..216b1305556 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp @@ -21,8 +21,8 @@ #include "BPy_UnaryFunction1DVoid.h" #include "../BPy_Convert.h" -#include "../BPy_Interface1D.h" #include "../BPy_IntegrationType.h" +#include "../BPy_Interface1D.h" #include "UnaryFunction1D_void/BPy_ChainingTimeStampF1D.h" #include "UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h" diff --git a/source/blender/freestyle/intern/scene_graph/SceneHash.h b/source/blender/freestyle/intern/scene_graph/SceneHash.h index cf24c5a21fb..53d1381da60 100644 --- a/source/blender/freestyle/intern/scene_graph/SceneHash.h +++ b/source/blender/freestyle/intern/scene_graph/SceneHash.h @@ -22,8 +22,8 @@ */ #include "IndexedFaceSet.h" -#include "NodeViewLayer.h" #include "NodeCamera.h" +#include "NodeViewLayer.h" #include "SceneVisitor.h" #include "BLI_sys_types.h" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c index 6c3815d7c0e..7df0440aa85 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c @@ -31,20 +31,20 @@ #include "BLI_ghash.h" #include "BLI_math_vector.h" -#include "DNA_meshdata_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_gpencil_types.h" #include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" +#include "BKE_colortools.h" #include "BKE_deform.h" -#include "BKE_main.h" -#include "BKE_object.h" -#include "BKE_lattice.h" -#include "BKE_material.h" #include "BKE_gpencil.h" #include "BKE_gpencil_modifier.h" -#include "BKE_colortools.h" +#include "BKE_lattice.h" +#include "BKE_main.h" +#include "BKE_material.h" +#include "BKE_object.h" #include "DEG_depsgraph.h" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c index a8aad763422..09027c16619 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c @@ -29,25 +29,25 @@ #include "BLI_math.h" #include "DNA_armature_types.h" -#include "DNA_meshdata_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_gpencil_types.h" #include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" -#include "BKE_lattice.h" #include "BKE_gpencil.h" #include "BKE_gpencil_modifier.h" -#include "BKE_modifier.h" +#include "BKE_lattice.h" #include "BKE_lib_query.h" -#include "BKE_scene.h" #include "BKE_main.h" +#include "BKE_modifier.h" +#include "BKE_scene.h" #include "MEM_guardedalloc.h" -#include "MOD_gpencil_util.h" #include "MOD_gpencil_modifiertypes.h" +#include "MOD_gpencil_util.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c index 1fc8c19b542..68bac0ff701 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c @@ -32,31 +32,31 @@ #include "BLI_rand.h" #include "BLI_blenlib.h" -#include "BLI_rand.h" #include "BLI_math.h" +#include "BLI_rand.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_gpencil_types.h" #include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" +#include "BKE_collection.h" +#include "BKE_global.h" #include "BKE_gpencil.h" #include "BKE_gpencil_modifier.h" -#include "BKE_modifier.h" -#include "BKE_global.h" -#include "BKE_object.h" -#include "BKE_main.h" -#include "BKE_scene.h" #include "BKE_layer.h" #include "BKE_lib_query.h" -#include "BKE_collection.h" +#include "BKE_main.h" +#include "BKE_modifier.h" +#include "BKE_object.h" +#include "BKE_scene.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" #include "DEG_depsgraph_query.h" -#include "MOD_gpencil_util.h" #include "MOD_gpencil_modifiertypes.h" +#include "MOD_gpencil_util.h" typedef struct tmpStrokes { struct tmpStrokes *next, *prev; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c index 7e89d8e2d6f..56779c1e23c 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c @@ -30,11 +30,11 @@ #include "BLI_blenlib.h" #include "BLI_math.h" -#include "DNA_meshdata_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_gpencil_types.h" #include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BKE_gpencil.h" #include "BKE_gpencil_modifier.h" @@ -42,8 +42,8 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "MOD_gpencil_util.h" #include "MOD_gpencil_modifiertypes.h" +#include "MOD_gpencil_util.h" static void initData(GpencilModifierData *md) { diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c index 3a930b40c8b..d311e77b9e3 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c @@ -29,10 +29,10 @@ #include "BLI_math_color.h" #include "BLI_math_vector.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_gpencil_types.h" #include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BKE_colortools.h" #include "BKE_gpencil.h" @@ -42,8 +42,8 @@ #include "DEG_depsgraph.h" -#include "MOD_gpencil_util.h" #include "MOD_gpencil_modifiertypes.h" +#include "MOD_gpencil_util.h" static void initData(GpencilModifierData *md) { diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c index 41380ec4c68..97e3fca3f4d 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c @@ -28,28 +28,28 @@ #include "BLI_math.h" -#include "DNA_meshdata_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_gpencil_types.h" #include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BKE_action.h" #include "BKE_colortools.h" #include "BKE_deform.h" #include "BKE_gpencil.h" #include "BKE_gpencil_modifier.h" -#include "BKE_modifier.h" -#include "BKE_lib_query.h" -#include "BKE_scene.h" -#include "BKE_main.h" #include "BKE_layer.h" +#include "BKE_lib_query.h" +#include "BKE_main.h" +#include "BKE_modifier.h" +#include "BKE_scene.h" #include "MEM_guardedalloc.h" -#include "MOD_gpencil_util.h" #include "MOD_gpencil_modifiertypes.h" +#include "MOD_gpencil_util.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c index d87f3a8a199..2ef0cca97d4 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c @@ -26,26 +26,26 @@ #include "BLI_listbase.h" #include "BLI_utildefines.h" -#include "DNA_meshdata_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_gpencil_types.h" #include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BKE_deform.h" #include "BKE_gpencil.h" #include "BKE_gpencil_modifier.h" -#include "BKE_modifier.h" #include "BKE_lattice.h" -#include "BKE_lib_query.h" -#include "BKE_scene.h" -#include "BKE_main.h" #include "BKE_layer.h" +#include "BKE_lib_query.h" +#include "BKE_main.h" +#include "BKE_modifier.h" +#include "BKE_scene.h" #include "MEM_guardedalloc.h" -#include "MOD_gpencil_util.h" #include "MOD_gpencil_modifiertypes.h" +#include "MOD_gpencil_util.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c index 0f9b1034352..5fffe683e6e 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c @@ -28,25 +28,25 @@ #include "BLI_listbase.h" #include "BLI_math.h" -#include "DNA_meshdata_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_gpencil_types.h" #include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BKE_deform.h" #include "BKE_gpencil.h" #include "BKE_gpencil_modifier.h" -#include "BKE_modifier.h" -#include "BKE_lib_query.h" -#include "BKE_scene.h" -#include "BKE_main.h" #include "BKE_layer.h" +#include "BKE_lib_query.h" +#include "BKE_main.h" +#include "BKE_modifier.h" +#include "BKE_scene.h" #include "MEM_guardedalloc.h" -#include "MOD_gpencil_util.h" #include "MOD_gpencil_modifiertypes.h" +#include "MOD_gpencil_util.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c index 16b0c4a5e38..4b4d5e9b511 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c @@ -25,31 +25,31 @@ #include "MEM_guardedalloc.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_gpencil_types.h" #include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" -#include "BLI_blenlib.h" -#include "BLI_rand.h" -#include "BLI_math.h" -#include "BLI_utildefines.h" -#include "BLI_linklist.h" #include "BLI_alloca.h" +#include "BLI_blenlib.h" +#include "BLI_linklist.h" +#include "BLI_math.h" +#include "BLI_rand.h" +#include "BLI_utildefines.h" -#include "BKE_gpencil.h" -#include "BKE_gpencil_modifier.h" -#include "BKE_modifier.h" +#include "BKE_collection.h" #include "BKE_context.h" #include "BKE_global.h" -#include "BKE_object.h" -#include "BKE_main.h" -#include "BKE_scene.h" +#include "BKE_gpencil.h" +#include "BKE_gpencil_modifier.h" #include "BKE_layer.h" #include "BKE_lib_query.h" -#include "BKE_collection.h" +#include "BKE_main.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" +#include "BKE_modifier.h" +#include "BKE_object.h" +#include "BKE_scene.h" #include "bmesh.h" #include "bmesh_tools.h" @@ -58,8 +58,8 @@ #include "DEG_depsgraph_build.h" #include "DEG_depsgraph_query.h" -#include "MOD_gpencil_util.h" #include "MOD_gpencil_modifiertypes.h" +#include "MOD_gpencil_util.h" static void initData(GpencilModifierData *md) { diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c index b8009b8405e..f6537a1d1c0 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c @@ -26,18 +26,18 @@ #include "BLI_listbase.h" #include "BLI_utildefines.h" -#include "BLI_math_vector.h" #include "BLI_ghash.h" #include "BLI_hash.h" +#include "BLI_math_vector.h" #include "BLI_rand.h" #include "MEM_guardedalloc.h" -#include "DNA_meshdata_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_gpencil_types.h" #include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BKE_colortools.h" #include "BKE_deform.h" @@ -48,8 +48,8 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "MOD_gpencil_util.h" #include "MOD_gpencil_modifiertypes.h" +#include "MOD_gpencil_util.h" static void initData(GpencilModifierData *md) { diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c index 5a9a1b68361..67419add3ed 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c @@ -28,11 +28,11 @@ #include "BLI_math.h" -#include "DNA_meshdata_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_gpencil_types.h" #include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BKE_colortools.h" #include "BKE_deform.h" @@ -41,8 +41,8 @@ #include "DEG_depsgraph.h" -#include "MOD_gpencil_util.h" #include "MOD_gpencil_modifiertypes.h" +#include "MOD_gpencil_util.h" static void initData(GpencilModifierData *md) { diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c index 4b04e349067..12576b3d27f 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c @@ -28,23 +28,23 @@ #include "BLI_blenlib.h" #include "BLI_math_vector.h" -#include "DNA_meshdata_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_gpencil_types.h" #include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BKE_colortools.h" #include "BKE_deform.h" -#include "BKE_material.h" #include "BKE_gpencil.h" #include "BKE_gpencil_modifier.h" #include "BKE_main.h" +#include "BKE_material.h" #include "DEG_depsgraph.h" -#include "MOD_gpencil_util.h" #include "MOD_gpencil_modifiertypes.h" +#include "MOD_gpencil_util.h" static void initData(GpencilModifierData *md) { diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c index 60e26407b63..f6307253a49 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c @@ -26,10 +26,10 @@ #include "BLI_listbase.h" #include "BLI_utildefines.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_gpencil_types.h" #include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "DNA_vec_types.h" #include "BKE_gpencil.h" @@ -37,8 +37,8 @@ #include "DEG_depsgraph.h" -#include "MOD_gpencil_util.h" #include "MOD_gpencil_modifiertypes.h" +#include "MOD_gpencil_util.h" static void initData(GpencilModifierData *md) { diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c index 896333318aa..4533aad6fa3 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c @@ -26,10 +26,10 @@ #include "BLI_listbase.h" #include "BLI_utildefines.h" +#include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_gpencil_modifier_types.h" #include "BKE_colortools.h" #include "BKE_deform.h" @@ -38,8 +38,8 @@ #include "DEG_depsgraph.h" -#include "MOD_gpencil_util.h" #include "MOD_gpencil_modifiertypes.h" +#include "MOD_gpencil_util.h" static void initData(GpencilModifierData *md) { diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c index 25abf0b81eb..5d221904f1b 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c @@ -28,19 +28,19 @@ #include "BLI_listbase.h" #include "BLI_utildefines.h" -#include "DNA_meshdata_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_gpencil_types.h" #include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BKE_gpencil.h" #include "BKE_gpencil_modifier.h" #include "DEG_depsgraph.h" -#include "MOD_gpencil_util.h" #include "MOD_gpencil_modifiertypes.h" +#include "MOD_gpencil_util.h" static void initData(GpencilModifierData *md) { diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c index 894dff46ac2..0c5f47eb9d4 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c @@ -27,11 +27,11 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "DNA_meshdata_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_gpencil_types.h" #include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BKE_colortools.h" #include "BKE_deform.h" @@ -40,8 +40,8 @@ #include "DEG_depsgraph.h" -#include "MOD_gpencil_util.h" #include "MOD_gpencil_modifiertypes.h" +#include "MOD_gpencil_util.h" static void initData(GpencilModifierData *md) { diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c index e3ad5a64ac3..10463f865e2 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c @@ -26,11 +26,11 @@ #include "BLI_utildefines.h" -#include "DNA_meshdata_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_gpencil_types.h" #include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BKE_colortools.h" #include "BKE_deform.h" @@ -39,8 +39,8 @@ #include "DEG_depsgraph.h" -#include "MOD_gpencil_util.h" #include "MOD_gpencil_modifiertypes.h" +#include "MOD_gpencil_util.h" static void initData(GpencilModifierData *md) { diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c index 6aaa37d494b..95a7fb53018 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c @@ -25,15 +25,15 @@ #include "BLI_utildefines.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" -#include "DNA_meshdata_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_gpencil_types.h" #include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BKE_action.h" #include "BKE_colorband.h" @@ -50,8 +50,8 @@ #include "MEM_guardedalloc.h" -#include "MOD_gpencil_util.h" #include "MOD_gpencil_modifiertypes.h" +#include "MOD_gpencil_util.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/gpu/GPU_batch.h b/source/blender/gpu/GPU_batch.h index bc5f0ac1971..5f55b512695 100644 --- a/source/blender/gpu/GPU_batch.h +++ b/source/blender/gpu/GPU_batch.h @@ -27,10 +27,10 @@ #ifndef __GPU_BATCH_H__ #define __GPU_BATCH_H__ -#include "GPU_vertex_buffer.h" #include "GPU_element.h" -#include "GPU_shader_interface.h" #include "GPU_shader.h" +#include "GPU_shader_interface.h" +#include "GPU_vertex_buffer.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/gpu/GPU_common.h b/source/blender/gpu/GPU_common.h index a4bafe13500..dd580ebbdac 100644 --- a/source/blender/gpu/GPU_common.h +++ b/source/blender/gpu/GPU_common.h @@ -37,9 +37,9 @@ # include #endif +#include "BLI_sys_types.h" #include #include -#include "BLI_sys_types.h" #if TRUST_NO_ONE # include diff --git a/source/blender/gpu/GPU_context.h b/source/blender/gpu/GPU_context.h index ebeb104b7e8..dd7611fe2fc 100644 --- a/source/blender/gpu/GPU_context.h +++ b/source/blender/gpu/GPU_context.h @@ -30,8 +30,8 @@ extern "C" { #endif -#include "GPU_common.h" #include "GPU_batch.h" +#include "GPU_common.h" #include "GPU_shader_interface.h" typedef struct GPUContext GPUContext; diff --git a/source/blender/gpu/GPU_immediate.h b/source/blender/gpu/GPU_immediate.h index 39fa625f5cc..d1db1d5f3e7 100644 --- a/source/blender/gpu/GPU_immediate.h +++ b/source/blender/gpu/GPU_immediate.h @@ -26,12 +26,12 @@ #ifndef __GPU_IMMEDIATE_H__ #define __GPU_IMMEDIATE_H__ -#include "GPU_vertex_format.h" -#include "GPU_primitive.h" -#include "GPU_shader_interface.h" #include "GPU_batch.h" #include "GPU_immediate_util.h" +#include "GPU_primitive.h" #include "GPU_shader.h" +#include "GPU_shader_interface.h" +#include "GPU_vertex_format.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/gpu/GPU_vertex_format.h b/source/blender/gpu/GPU_vertex_format.h index f5717645bc1..7e384d0a692 100644 --- a/source/blender/gpu/GPU_vertex_format.h +++ b/source/blender/gpu/GPU_vertex_format.h @@ -26,9 +26,9 @@ #ifndef __GPU_VERTEX_FORMAT_H__ #define __GPU_VERTEX_FORMAT_H__ -#include "GPU_common.h" -#include "BLI_compiler_compat.h" #include "BLI_assert.h" +#include "BLI_compiler_compat.h" +#include "GPU_common.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/gpu/GPU_viewport.h b/source/blender/gpu/GPU_viewport.h index b7b8af9f90a..50d265feaad 100644 --- a/source/blender/gpu/GPU_viewport.h +++ b/source/blender/gpu/GPU_viewport.h @@ -26,8 +26,8 @@ #include -#include "DNA_vec_types.h" #include "DNA_scene_types.h" +#include "DNA_vec_types.h" #include "GPU_framebuffer.h" #include "GPU_texture.h" diff --git a/source/blender/gpu/intern/gpu_attr_binding_private.h b/source/blender/gpu/intern/gpu_attr_binding_private.h index bcd4ba1dbfc..301ec3333dd 100644 --- a/source/blender/gpu/intern/gpu_attr_binding_private.h +++ b/source/blender/gpu/intern/gpu_attr_binding_private.h @@ -26,8 +26,8 @@ #ifndef __GPU_ATTR_BINDING_PRIVATE_H__ #define __GPU_ATTR_BINDING_PRIVATE_H__ -#include "GPU_vertex_format.h" #include "GPU_shader_interface.h" +#include "GPU_vertex_format.h" void AttrBinding_clear(GPUAttrBinding *binding); diff --git a/source/blender/gpu/intern/gpu_batch.c b/source/blender/gpu/intern/gpu_batch.c index 731407a64f9..6bc3cd27130 100644 --- a/source/blender/gpu/intern/gpu_batch.c +++ b/source/blender/gpu/intern/gpu_batch.c @@ -29,8 +29,8 @@ #include "GPU_batch.h" #include "GPU_batch_presets.h" #include "GPU_extensions.h" -#include "GPU_platform.h" #include "GPU_matrix.h" +#include "GPU_platform.h" #include "GPU_shader.h" #include "gpu_batch_private.h" @@ -38,9 +38,9 @@ #include "gpu_primitive_private.h" #include "gpu_shader_private.h" +#include #include #include -#include static void batch_update_program_bindings(GPUBatch *batch, uint i_first); diff --git a/source/blender/gpu/intern/gpu_batch_presets.c b/source/blender/gpu/intern/gpu_batch_presets.c index 9018582f6dd..e00b6f78c2e 100644 --- a/source/blender/gpu/intern/gpu_batch_presets.c +++ b/source/blender/gpu/intern/gpu_batch_presets.c @@ -21,17 +21,17 @@ * \ingroup gpu */ -#include "BLI_utildefines.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_threads.h" -#include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "MEM_guardedalloc.h" #include "UI_interface.h" #include "GPU_batch.h" -#include "GPU_batch_utils.h" #include "GPU_batch_presets.h" /* own include */ +#include "GPU_batch_utils.h" #include "gpu_shader_private.h" /* Struct to store 3D Batches and their format */ diff --git a/source/blender/gpu/intern/gpu_batch_utils.c b/source/blender/gpu/intern/gpu_batch_utils.c index 825f72e175b..0660d4a1724 100644 --- a/source/blender/gpu/intern/gpu_batch_utils.c +++ b/source/blender/gpu/intern/gpu_batch_utils.c @@ -20,11 +20,11 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_rect.h" #include "BLI_math.h" #include "BLI_polyfill_2d.h" +#include "BLI_rect.h" #include "BLI_sort_utils.h" +#include "BLI_utildefines.h" #include "GPU_batch.h" #include "GPU_batch_utils.h" /* own include */ diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c index f21cd990a41..c377d196eb5 100644 --- a/source/blender/gpu/intern/gpu_buffers.c +++ b/source/blender/gpu/intern/gpu_buffers.c @@ -30,22 +30,22 @@ #include "MEM_guardedalloc.h" #include "BLI_bitmap.h" -#include "BLI_math_color.h" -#include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_hash.h" +#include "BLI_math.h" +#include "BLI_math_color.h" +#include "BLI_utildefines.h" #include "DNA_meshdata_types.h" -#include "BKE_ccg.h" #include "BKE_DerivedMesh.h" -#include "BKE_paint.h" +#include "BKE_ccg.h" #include "BKE_mesh.h" +#include "BKE_paint.h" #include "BKE_pbvh.h" -#include "GPU_buffers.h" #include "GPU_batch.h" +#include "GPU_buffers.h" #include "gpu_private.h" diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c index 066b8d633d2..211ae0b3897 100644 --- a/source/blender/gpu/intern/gpu_codegen.c +++ b/source/blender/gpu/intern/gpu_codegen.c @@ -29,12 +29,12 @@ #include "DNA_image_types.h" #include "BLI_blenlib.h" -#include "BLI_hash_mm2a.h" -#include "BLI_link_utils.h" -#include "BLI_utildefines.h" #include "BLI_dynstr.h" #include "BLI_ghash.h" +#include "BLI_hash_mm2a.h" +#include "BLI_link_utils.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include "PIL_time.h" @@ -53,8 +53,8 @@ #include "gpu_material_library.h" #include "gpu_node_graph.h" -#include #include +#include extern char datatoc_gpu_shader_common_obinfos_lib_glsl[]; extern char datatoc_common_view_lib_glsl[]; diff --git a/source/blender/gpu/intern/gpu_context.cpp b/source/blender/gpu/intern/gpu_context.cpp index 17b86e3eec8..0b9104e5349 100644 --- a/source/blender/gpu/intern/gpu_context.cpp +++ b/source/blender/gpu/intern/gpu_context.cpp @@ -38,11 +38,11 @@ #include "gpu_context_private.h" #include "gpu_matrix_private.h" -#include -#include -#include #include +#include +#include #include +#include #if TRUST_NO_ONE # if 0 diff --git a/source/blender/gpu/intern/gpu_debug.c b/source/blender/gpu/intern/gpu_debug.c index 8293aae5dfa..f7d6236071d 100644 --- a/source/blender/gpu/intern/gpu_debug.c +++ b/source/blender/gpu/intern/gpu_debug.c @@ -22,14 +22,14 @@ */ #include "BLI_compiler_attrs.h" -#include "BLI_utildefines.h" #include "BLI_sys_types.h" #include "BLI_system.h" +#include "BLI_utildefines.h" #include "BKE_global.h" -#include "GPU_glew.h" #include "GPU_debug.h" +#include "GPU_glew.h" #include "intern/gpu_private.h" #include diff --git a/source/blender/gpu/intern/gpu_draw_smoke.c b/source/blender/gpu/intern/gpu_draw_smoke.c index 546faadbda4..80c59ed47c9 100644 --- a/source/blender/gpu/intern/gpu_draw_smoke.c +++ b/source/blender/gpu/intern/gpu_draw_smoke.c @@ -28,8 +28,8 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "DNA_modifier_types.h" #include "DNA_fluid_types.h" +#include "DNA_modifier_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c index f497ed22bec..e3632b82778 100644 --- a/source/blender/gpu/intern/gpu_extensions.c +++ b/source/blender/gpu/intern/gpu_extensions.c @@ -24,9 +24,9 @@ * with checks for drivers and GPU support. */ -#include "BLI_utildefines.h" #include "BLI_math_base.h" #include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "BKE_global.h" #include "MEM_guardedalloc.h" @@ -34,13 +34,13 @@ #include "GPU_extensions.h" #include "GPU_framebuffer.h" #include "GPU_glew.h" -#include "GPU_texture.h" #include "GPU_platform.h" +#include "GPU_texture.h" #include "intern/gpu_private.h" -#include #include +#include #include #ifdef WIN32 diff --git a/source/blender/gpu/intern/gpu_framebuffer.c b/source/blender/gpu/intern/gpu_framebuffer.c index f254cce25e4..59d0be2cefb 100644 --- a/source/blender/gpu/intern/gpu_framebuffer.c +++ b/source/blender/gpu/intern/gpu_framebuffer.c @@ -24,8 +24,8 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math_base.h" +#include "BLI_utildefines.h" #include "GPU_batch.h" #include "GPU_draw.h" @@ -34,8 +34,8 @@ #include "GPU_shader.h" #include "GPU_texture.h" -#include "gpu_private.h" #include "gpu_context_private.h" +#include "gpu_private.h" typedef enum { GPU_FB_DEPTH_ATTACHMENT = 0, diff --git a/source/blender/gpu/intern/gpu_immediate.c b/source/blender/gpu/intern/gpu_immediate.c index 671335ca702..4523df8be7c 100644 --- a/source/blender/gpu/intern/gpu_immediate.c +++ b/source/blender/gpu/intern/gpu_immediate.c @@ -36,8 +36,8 @@ #include "gpu_shader_private.h" #include "gpu_vertex_format_private.h" -#include #include +#include /* necessary functions from matrix API */ extern void GPU_matrix_bind(const GPUShaderInterface *); diff --git a/source/blender/gpu/intern/gpu_immediate_util.c b/source/blender/gpu/intern/gpu_immediate_util.c index 45d9c40b3e6..28544d50ba1 100644 --- a/source/blender/gpu/intern/gpu_immediate_util.c +++ b/source/blender/gpu/intern/gpu_immediate_util.c @@ -23,8 +23,8 @@ #include #include -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" diff --git a/source/blender/gpu/intern/gpu_init_exit.c b/source/blender/gpu/intern/gpu_init_exit.c index 96dc437e10b..54ddb9351b9 100644 --- a/source/blender/gpu/intern/gpu_init_exit.c +++ b/source/blender/gpu/intern/gpu_init_exit.c @@ -21,12 +21,12 @@ * \ingroup gpu */ -#include "BLI_sys_types.h" -#include "GPU_buffers.h" #include "GPU_init_exit.h" /* interface */ -#include "GPU_immediate.h" -#include "GPU_batch.h" #include "BKE_global.h" +#include "BLI_sys_types.h" +#include "GPU_batch.h" +#include "GPU_buffers.h" +#include "GPU_immediate.h" #include "intern/gpu_codegen.h" #include "intern/gpu_material_library.h" diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index 8a4a88d0663..3e73d156440 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -32,12 +32,12 @@ #include "DNA_scene_types.h" #include "DNA_world_types.h" -#include "BLI_math.h" +#include "BLI_ghash.h" #include "BLI_listbase.h" -#include "BLI_utildefines.h" +#include "BLI_math.h" #include "BLI_string.h" #include "BLI_string_utils.h" -#include "BLI_ghash.h" +#include "BLI_utildefines.h" #include "BKE_main.h" #include "BKE_material.h" diff --git a/source/blender/gpu/intern/gpu_material_library.c b/source/blender/gpu/intern/gpu_material_library.c index 959e5ef7440..42cd9673ac2 100644 --- a/source/blender/gpu/intern/gpu_material_library.c +++ b/source/blender/gpu/intern/gpu_material_library.c @@ -27,10 +27,10 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_dynstr.h" #include "BLI_ghash.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "gpu_material_library.h" diff --git a/source/blender/gpu/intern/gpu_node_graph.c b/source/blender/gpu/intern/gpu_node_graph.c index 0eb62bf5b2f..953b2eb40d8 100644 --- a/source/blender/gpu/intern/gpu_node_graph.c +++ b/source/blender/gpu/intern/gpu_node_graph.c @@ -29,10 +29,10 @@ #include "DNA_node_types.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "gpu_material_library.h" #include "gpu_node_graph.h" diff --git a/source/blender/gpu/intern/gpu_node_graph.h b/source/blender/gpu/intern/gpu_node_graph.h index 8506c6a87e2..3067be1c485 100644 --- a/source/blender/gpu/intern/gpu_node_graph.h +++ b/source/blender/gpu/intern/gpu_node_graph.h @@ -29,8 +29,8 @@ #include "DNA_customdata_types.h" #include "DNA_listBase.h" -#include "GPU_material.h" #include "GPU_glew.h" +#include "GPU_material.h" #include "GPU_shader.h" struct GPUNode; diff --git a/source/blender/gpu/intern/gpu_select.c b/source/blender/gpu/intern/gpu_select.c index f12da9ce2f7..1776f0f391d 100644 --- a/source/blender/gpu/intern/gpu_select.c +++ b/source/blender/gpu/intern/gpu_select.c @@ -23,11 +23,11 @@ * Interface for accessing gpu-related methods for selection. The semantics are * similar to glRenderMode(GL_SELECT) from older OpenGL versions. */ -#include #include +#include -#include "GPU_select.h" #include "GPU_glew.h" +#include "GPU_select.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/gpu/intern/gpu_select_pick.c b/source/blender/gpu/intern/gpu_select_pick.c index 498de13e10f..56fe1e40d87 100644 --- a/source/blender/gpu/intern/gpu_select_pick.c +++ b/source/blender/gpu/intern/gpu_select_pick.c @@ -23,20 +23,20 @@ * Custom select code for picking small regions (not efficient for large regions). * `gpu_select_pick_*` API. */ -#include -#include #include +#include +#include -#include "GPU_immediate.h" #include "GPU_draw.h" +#include "GPU_glew.h" +#include "GPU_immediate.h" #include "GPU_select.h" #include "GPU_state.h" -#include "GPU_glew.h" #include "MEM_guardedalloc.h" -#include "BLI_rect.h" #include "BLI_listbase.h" +#include "BLI_rect.h" #include "BLI_utildefines.h" #include "gpu_select_private.h" diff --git a/source/blender/gpu/intern/gpu_select_sample_query.c b/source/blender/gpu/intern/gpu_select_sample_query.c index 578546f3af9..c82d1e17c66 100644 --- a/source/blender/gpu/intern/gpu_select_sample_query.c +++ b/source/blender/gpu/intern/gpu_select_sample_query.c @@ -26,9 +26,9 @@ #include +#include "GPU_glew.h" #include "GPU_select.h" #include "GPU_state.h" -#include "GPU_glew.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/gpu/intern/gpu_shader.c b/source/blender/gpu/intern/gpu_shader.c index 620f18629b5..21de07a62f1 100644 --- a/source/blender/gpu/intern/gpu_shader.c +++ b/source/blender/gpu/intern/gpu_shader.c @@ -23,12 +23,12 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_math_base.h" #include "BLI_math_vector.h" #include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_string_utils.h" +#include "BLI_utildefines.h" #include "BKE_appdir.h" #include "BKE_global.h" @@ -36,8 +36,8 @@ #include "DNA_space_types.h" #include "GPU_extensions.h" -#include "GPU_platform.h" #include "GPU_matrix.h" +#include "GPU_platform.h" #include "GPU_shader.h" #include "GPU_texture.h" #include "GPU_uniformbuffer.h" diff --git a/source/blender/gpu/intern/gpu_shader_interface.c b/source/blender/gpu/intern/gpu_shader_interface.c index f895993a27d..f23a0a438d6 100644 --- a/source/blender/gpu/intern/gpu_shader_interface.c +++ b/source/blender/gpu/intern/gpu_shader_interface.c @@ -23,16 +23,16 @@ * GPU shader interface (C --> GLSL) */ -#include "MEM_guardedalloc.h" #include "BKE_global.h" +#include "MEM_guardedalloc.h" #include "GPU_shader_interface.h" #include "gpu_batch_private.h" #include "gpu_context_private.h" -#include #include +#include #include #define DEBUG_SHADER_INTERFACE 0 diff --git a/source/blender/gpu/intern/gpu_state.c b/source/blender/gpu/intern/gpu_state.c index 6fd9b167599..d6f044a79e3 100644 --- a/source/blender/gpu/intern/gpu_state.c +++ b/source/blender/gpu/intern/gpu_state.c @@ -29,9 +29,9 @@ #include "BKE_global.h" +#include "GPU_extensions.h" #include "GPU_glew.h" #include "GPU_state.h" -#include "GPU_extensions.h" static GLenum gpu_get_gl_blendfunction(eGPUBlendFunction blend) { diff --git a/source/blender/gpu/intern/gpu_texture.c b/source/blender/gpu/intern/gpu_texture.c index 7b51b03096f..088cf912d6a 100644 --- a/source/blender/gpu/intern/gpu_texture.c +++ b/source/blender/gpu/intern/gpu_texture.c @@ -28,8 +28,8 @@ #include "DNA_image_types.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math_base.h" +#include "BLI_utildefines.h" #include "BKE_global.h" @@ -38,8 +38,8 @@ #include "GPU_debug.h" #include "GPU_draw.h" #include "GPU_extensions.h" -#include "GPU_glew.h" #include "GPU_framebuffer.h" +#include "GPU_glew.h" #include "GPU_platform.h" #include "GPU_texture.h" diff --git a/source/blender/gpu/intern/gpu_uniformbuffer.c b/source/blender/gpu/intern/gpu_uniformbuffer.c index 734b4fa7b92..943793956d1 100644 --- a/source/blender/gpu/intern/gpu_uniformbuffer.c +++ b/source/blender/gpu/intern/gpu_uniformbuffer.c @@ -21,8 +21,8 @@ * \ingroup gpu */ -#include #include "MEM_guardedalloc.h" +#include #include "BLI_blenlib.h" diff --git a/source/blender/gpu/intern/gpu_vertex_format.c b/source/blender/gpu/intern/gpu_vertex_format.c index 16d8f8f875b..8370bcf4beb 100644 --- a/source/blender/gpu/intern/gpu_vertex_format.c +++ b/source/blender/gpu/intern/gpu_vertex_format.c @@ -30,9 +30,9 @@ #include #include -#include "BLI_utildefines.h" -#include "BLI_string.h" #include "BLI_ghash.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" #define PACK_DEBUG 0 diff --git a/source/blender/gpu/intern/gpu_viewport.c b/source/blender/gpu/intern/gpu_viewport.c index 750db39d908..57efaf99b8b 100644 --- a/source/blender/gpu/intern/gpu_viewport.c +++ b/source/blender/gpu/intern/gpu_viewport.c @@ -26,24 +26,24 @@ #include #include "BLI_listbase.h" -#include "BLI_rect.h" #include "BLI_math_vector.h" #include "BLI_memblock.h" +#include "BLI_rect.h" #include "BKE_colortools.h" #include "IMB_colormanagement.h" -#include "DNA_vec_types.h" #include "DNA_userdef_types.h" +#include "DNA_vec_types.h" #include "GPU_framebuffer.h" #include "GPU_glew.h" #include "GPU_immediate.h" #include "GPU_matrix.h" #include "GPU_texture.h" -#include "GPU_viewport.h" #include "GPU_uniformbuffer.h" +#include "GPU_viewport.h" #include "DRW_engine.h" diff --git a/source/blender/ikplugin/intern/ikplugin_api.c b/source/blender/ikplugin/intern/ikplugin_api.c index f473bc02ce1..5e683d36408 100644 --- a/source/blender/ikplugin/intern/ikplugin_api.c +++ b/source/blender/ikplugin/intern/ikplugin_api.c @@ -24,8 +24,8 @@ #include "BIK_api.h" -#include "DNA_object_types.h" #include "DNA_action_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "ikplugin_api.h" diff --git a/source/blender/ikplugin/intern/iksolver_plugin.c b/source/blender/ikplugin/intern/iksolver_plugin.c index c4a0ee859f1..b72c32a8277 100644 --- a/source/blender/ikplugin/intern/iksolver_plugin.c +++ b/source/blender/ikplugin/intern/iksolver_plugin.c @@ -32,10 +32,10 @@ #include "BKE_armature.h" #include "BKE_constraint.h" -#include "DNA_object_types.h" #include "DNA_action_types.h" -#include "DNA_constraint_types.h" #include "DNA_armature_types.h" +#include "DNA_constraint_types.h" +#include "DNA_object_types.h" #include "IK_solver.h" #include "iksolver_plugin.h" diff --git a/source/blender/ikplugin/intern/itasc_plugin.cpp b/source/blender/ikplugin/intern/itasc_plugin.cpp index 35910bc32b7..19a4390598f 100644 --- a/source/blender/ikplugin/intern/itasc_plugin.cpp +++ b/source/blender/ikplugin/intern/itasc_plugin.cpp @@ -29,13 +29,13 @@ // iTaSC headers #ifdef WITH_IK_ITASC # include "Armature.hpp" -# include "MovingFrame.hpp" -# include "CopyPose.hpp" -# include "WSDLSSolver.hpp" -# include "WDLSSolver.hpp" -# include "Scene.hpp" # include "Cache.hpp" +# include "CopyPose.hpp" # include "Distance.hpp" +# include "MovingFrame.hpp" +# include "Scene.hpp" +# include "WDLSSolver.hpp" +# include "WSDLSSolver.hpp" #endif #include "MEM_guardedalloc.h" @@ -46,14 +46,14 @@ extern "C" { #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BKE_global.h" -#include "BKE_armature.h" #include "BKE_action.h" +#include "BKE_armature.h" #include "BKE_constraint.h" -#include "DNA_object_types.h" +#include "BKE_global.h" #include "DNA_action_types.h" -#include "DNA_constraint_types.h" #include "DNA_armature_types.h" +#include "DNA_constraint_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" }; diff --git a/source/blender/imbuf/IMB_colormanagement.h b/source/blender/imbuf/IMB_colormanagement.h index 5e5b3e85b38..5f149f0ab71 100644 --- a/source/blender/imbuf/IMB_colormanagement.h +++ b/source/blender/imbuf/IMB_colormanagement.h @@ -24,8 +24,8 @@ * \ingroup imbuf */ -#include "BLI_sys_types.h" #include "BLI_compiler_compat.h" +#include "BLI_sys_types.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/imbuf/IMB_moviecache.h b/source/blender/imbuf/IMB_moviecache.h index d26ec4d2c2d..175a18ef618 100644 --- a/source/blender/imbuf/IMB_moviecache.h +++ b/source/blender/imbuf/IMB_moviecache.h @@ -24,8 +24,8 @@ * \ingroup imbuf */ -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" /* Cache system for movie data - now supports storing ImBufs only * Supposed to provide unified cache system for movie clips, sequencer and diff --git a/source/blender/imbuf/intern/IMB_anim.h b/source/blender/imbuf/intern/IMB_anim.h index 9ad88f24693..3d1d99963c7 100644 --- a/source/blender/imbuf/intern/IMB_anim.h +++ b/source/blender/imbuf/intern/IMB_anim.h @@ -26,21 +26,21 @@ #ifdef _WIN32 # define INC_OLE2 +# include +# include +# include +# include # include # include -# include -# include -# include -# include # undef AVIIF_KEYFRAME // redefined in AVI_avi.h # undef AVIIF_LIST // redefined in AVI_avi.h #endif /* _WIN32 */ -#include #include -#include #include +#include +#include #ifdef _WIN32 # include @@ -54,14 +54,14 @@ # include "AVI_avi.h" #endif -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_allocimbuf.h" #ifdef WITH_FFMPEG -# include # include +# include # include #endif diff --git a/source/blender/imbuf/intern/IMB_colormanagement_intern.h b/source/blender/imbuf/intern/IMB_colormanagement_intern.h index a83f2d60b8c..f0e599c1375 100644 --- a/source/blender/imbuf/intern/IMB_colormanagement_intern.h +++ b/source/blender/imbuf/intern/IMB_colormanagement_intern.h @@ -24,8 +24,8 @@ * \ingroup imbuf */ -#include "DNA_listBase.h" #include "BLI_sys_types.h" +#include "DNA_listBase.h" struct ImBuf; struct OCIO_ConstProcessorRcPtr; diff --git a/source/blender/imbuf/intern/IMB_indexer.h b/source/blender/imbuf/intern/IMB_indexer.h index 4817518dab6..61bb50aff38 100644 --- a/source/blender/imbuf/intern/IMB_indexer.h +++ b/source/blender/imbuf/intern/IMB_indexer.h @@ -25,9 +25,9 @@ # include #endif -#include -#include #include "IMB_anim.h" +#include +#include /* * separate animation index files to solve the following problems: * diff --git a/source/blender/imbuf/intern/allocimbuf.c b/source/blender/imbuf/intern/allocimbuf.c index 381de9de610..6c17254e697 100644 --- a/source/blender/imbuf/intern/allocimbuf.c +++ b/source/blender/imbuf/intern/allocimbuf.c @@ -30,16 +30,16 @@ #include "IMB_imbuf_types.h" #include "IMB_allocimbuf.h" +#include "IMB_colormanagement_intern.h" #include "IMB_filetype.h" #include "IMB_metadata.h" -#include "IMB_colormanagement_intern.h" #include "imbuf.h" #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" static SpinLock refcounter_spin; diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index 6a5a97e24e4..e9ac40de442 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -41,21 +41,21 @@ #endif -#include #include -#include -#include -#include #include +#include +#include +#include +#include #ifndef _WIN32 # include #else # include #endif -#include "BLI_utildefines.h" -#include "BLI_string.h" #include "BLI_path_util.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" #include "MEM_guardedalloc.h" @@ -63,8 +63,8 @@ # include "AVI_avi.h" #endif -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" @@ -76,8 +76,8 @@ #ifdef WITH_FFMPEG # include "BKE_global.h" /* ENDIAN_ORDER */ -# include # include +# include # include # include diff --git a/source/blender/imbuf/intern/bmp.c b/source/blender/imbuf/intern/bmp.c index 58ecfce5a63..3cac0be7935 100644 --- a/source/blender/imbuf/intern/bmp.c +++ b/source/blender/imbuf/intern/bmp.c @@ -21,14 +21,14 @@ * \ingroup imbuf */ -#include "BLI_utildefines.h" #include "BLI_fileops.h" +#include "BLI_utildefines.h" #include "imbuf.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_filetype.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" diff --git a/source/blender/imbuf/intern/cache.c b/source/blender/imbuf/intern/cache.c index 7ddf4423bbf..176b41d2706 100644 --- a/source/blender/imbuf/intern/cache.c +++ b/source/blender/imbuf/intern/cache.c @@ -20,15 +20,15 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_memarena.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" +#include "IMB_filetype.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "IMB_filetype.h" #include "imbuf.h" diff --git a/source/blender/imbuf/intern/cineon/cineon_dpx.c b/source/blender/imbuf/intern/cineon/cineon_dpx.c index a8902baa54a..18942c9abb8 100644 --- a/source/blender/imbuf/intern/cineon/cineon_dpx.c +++ b/source/blender/imbuf/intern/cineon/cineon_dpx.c @@ -20,14 +20,14 @@ * \ingroup imbcineon */ +#include "logImageCore.h" +#include #include #include -#include -#include "logImageCore.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_filetype.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" diff --git a/source/blender/imbuf/intern/cineon/cineonlib.c b/source/blender/imbuf/intern/cineon/cineonlib.c index 63014919dfb..1223033f535 100644 --- a/source/blender/imbuf/intern/cineon/cineonlib.c +++ b/source/blender/imbuf/intern/cineon/cineonlib.c @@ -25,12 +25,12 @@ #include "cineonlib.h" #include "logmemfile.h" -#include #include +#include #include -#include -#include #include +#include +#include #include "BLI_fileops.h" #include "BLI_utildefines.h" diff --git a/source/blender/imbuf/intern/cineon/dpxlib.c b/source/blender/imbuf/intern/cineon/dpxlib.c index 00d59643967..8acfc23439f 100644 --- a/source/blender/imbuf/intern/cineon/dpxlib.c +++ b/source/blender/imbuf/intern/cineon/dpxlib.c @@ -25,12 +25,12 @@ #include "dpxlib.h" #include "logmemfile.h" -#include #include +#include #include -#include -#include #include +#include +#include #include "BLI_fileops.h" #include "BLI_utildefines.h" diff --git a/source/blender/imbuf/intern/cineon/logImageCore.c b/source/blender/imbuf/intern/cineon/logImageCore.c index 5d1623374d4..e9030496498 100644 --- a/source/blender/imbuf/intern/cineon/logImageCore.c +++ b/source/blender/imbuf/intern/cineon/logImageCore.c @@ -22,14 +22,14 @@ * Cineon image file format library routines. */ -#include "logmemfile.h" #include "logImageCore.h" -#include "dpxlib.h" #include "cineonlib.h" +#include "dpxlib.h" +#include "logmemfile.h" +#include #include #include -#include #include "BLI_fileops.h" #include "BLI_utildefines.h" diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c index a18764cd6ab..2a458ba5474 100644 --- a/source/blender/imbuf/intern/colormanagement.c +++ b/source/blender/imbuf/intern/colormanagement.c @@ -24,8 +24,8 @@ #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" -#include #include +#include #include "DNA_color_types.h" #include "DNA_image_types.h" @@ -33,21 +33,21 @@ #include "DNA_scene_types.h" #include "DNA_space_types.h" -#include "IMB_imbuf.h" -#include "IMB_imbuf_types.h" #include "IMB_filetype.h" #include "IMB_filter.h" -#include "IMB_moviecache.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_metadata.h" +#include "IMB_moviecache.h" #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" #include "BLI_math.h" #include "BLI_math_color.h" +#include "BLI_rect.h" #include "BLI_string.h" #include "BLI_threads.h" -#include "BLI_rect.h" #include "BKE_appdir.h" #include "BKE_colortools.h" diff --git a/source/blender/imbuf/intern/colormanagement_inline.c b/source/blender/imbuf/intern/colormanagement_inline.c index 42c90b8414f..e93fdd51040 100644 --- a/source/blender/imbuf/intern/colormanagement_inline.c +++ b/source/blender/imbuf/intern/colormanagement_inline.c @@ -24,8 +24,8 @@ #ifndef __IMB_COLORMANAGEMENT_INLINE_C__ #define __IMB_COLORMANAGEMENT_INLINE_C__ -#include "IMB_colormanagement_intern.h" #include "BLI_math_vector.h" +#include "IMB_colormanagement_intern.h" /* Convert a float RGB triplet to the correct luminance weighted average. * diff --git a/source/blender/imbuf/intern/dds/BlockDXT.cpp b/source/blender/imbuf/intern/dds/BlockDXT.cpp index b1ca6221753..4397c1febab 100644 --- a/source/blender/imbuf/intern/dds/BlockDXT.cpp +++ b/source/blender/imbuf/intern/dds/BlockDXT.cpp @@ -48,10 +48,10 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. +#include +#include #include #include -#include -#include /* --------------------------------------------------------------------------- * BlockDXT1 diff --git a/source/blender/imbuf/intern/dds/BlockDXT.h b/source/blender/imbuf/intern/dds/BlockDXT.h index b167fba71a2..16937bce042 100644 --- a/source/blender/imbuf/intern/dds/BlockDXT.h +++ b/source/blender/imbuf/intern/dds/BlockDXT.h @@ -51,9 +51,9 @@ #ifndef __BLOCKDXT_H__ #define __BLOCKDXT_H__ -#include #include #include +#include #include /// DXT1 block. diff --git a/source/blender/imbuf/intern/dds/ColorBlock.cpp b/source/blender/imbuf/intern/dds/ColorBlock.cpp index cbc85962a36..69757d797b5 100644 --- a/source/blender/imbuf/intern/dds/ColorBlock.cpp +++ b/source/blender/imbuf/intern/dds/ColorBlock.cpp @@ -28,8 +28,8 @@ // This code is in the public domain -- castanyo@yahoo.es #include -#include #include +#include #if 0 // Get approximate luminance. diff --git a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp index 3f222a096ac..ab68d933c6f 100644 --- a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp +++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp @@ -48,13 +48,13 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. -#include #include +#include #include +#include // sqrt #include // printf #include // malloc -#include // sqrt #include /*** declarations ***/ diff --git a/source/blender/imbuf/intern/dds/DirectDrawSurface.h b/source/blender/imbuf/intern/dds/DirectDrawSurface.h index 54bd1ad2dcd..f12c45d11df 100644 --- a/source/blender/imbuf/intern/dds/DirectDrawSurface.h +++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.h @@ -51,10 +51,10 @@ #ifndef __DIRECTDRAWSURFACE_H__ #define __DIRECTDRAWSURFACE_H__ -#include -#include #include +#include #include +#include struct DDSPixelFormat { uint size; diff --git a/source/blender/imbuf/intern/dds/FlipDXT.cpp b/source/blender/imbuf/intern/dds/FlipDXT.cpp index bfd19f40493..f5c937654b3 100644 --- a/source/blender/imbuf/intern/dds/FlipDXT.cpp +++ b/source/blender/imbuf/intern/dds/FlipDXT.cpp @@ -38,11 +38,11 @@ #include -#include -#include -#include #include +#include +#include #include +#include // A function that flips a DXTC block. typedef void (*FlipBlockFunction)(uint8_t *block); diff --git a/source/blender/imbuf/intern/dds/Image.h b/source/blender/imbuf/intern/dds/Image.h index 1aa60ef48ca..2922d5cfda3 100644 --- a/source/blender/imbuf/intern/dds/Image.h +++ b/source/blender/imbuf/intern/dds/Image.h @@ -30,8 +30,8 @@ #ifndef __IMAGE_H__ #define __IMAGE_H__ -#include "Common.h" #include "Color.h" +#include "Common.h" /// 32 bit RGBA image. class Image { diff --git a/source/blender/imbuf/intern/dds/dds_api.cpp b/source/blender/imbuf/intern/dds/dds_api.cpp index 098b695b8a3..832b380bbc2 100644 --- a/source/blender/imbuf/intern/dds/dds_api.cpp +++ b/source/blender/imbuf/intern/dds/dds_api.cpp @@ -22,13 +22,13 @@ extern "C" { #include "BLI_utildefines.h" } -#include -#include -#include #include #include -#include // printf +#include +#include #include +#include +#include // printf #if defined(WIN32) # include "utfconv.h" @@ -36,10 +36,10 @@ extern "C" { extern "C" { -#include "imbuf.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_allocimbuf.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" +#include "imbuf.h" #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" diff --git a/source/blender/imbuf/intern/divers.c b/source/blender/imbuf/intern/divers.c index 07bbec9e15c..e068a84aab0 100644 --- a/source/blender/imbuf/intern/divers.c +++ b/source/blender/imbuf/intern/divers.c @@ -25,10 +25,10 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "imbuf.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_filter.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" +#include "imbuf.h" #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" diff --git a/source/blender/imbuf/intern/filetype.c b/source/blender/imbuf/intern/filetype.c index c6f8bab325b..29430036182 100644 --- a/source/blender/imbuf/intern/filetype.c +++ b/source/blender/imbuf/intern/filetype.c @@ -22,9 +22,9 @@ #include "BLI_utildefines.h" +#include "IMB_filetype.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "IMB_filetype.h" #include "IMB_colormanagement.h" diff --git a/source/blender/imbuf/intern/filter.c b/source/blender/imbuf/intern/filter.c index e6b95968498..e36088f8eac 100644 --- a/source/blender/imbuf/intern/filter.c +++ b/source/blender/imbuf/intern/filter.c @@ -24,12 +24,12 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_math_base.h" +#include "BLI_utildefines.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_filter.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "imbuf.h" diff --git a/source/blender/imbuf/intern/imageprocess.c b/source/blender/imbuf/intern/imageprocess.c index 4cd47d19e62..523b57cc162 100644 --- a/source/blender/imbuf/intern/imageprocess.c +++ b/source/blender/imbuf/intern/imageprocess.c @@ -31,13 +31,13 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_task.h" #include "BLI_math.h" +#include "BLI_task.h" +#include "BLI_utildefines.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_colormanagement.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include /* Only this one is used liberally here, and in imbuf */ diff --git a/source/blender/imbuf/intern/imbuf.h b/source/blender/imbuf/intern/imbuf.h index 514b6a24cf0..912c25f2616 100644 --- a/source/blender/imbuf/intern/imbuf.h +++ b/source/blender/imbuf/intern/imbuf.h @@ -24,18 +24,18 @@ #ifndef __IMBUF_H__ #define __IMBUF_H__ +#include #include #include -#include #ifndef WIN32 # include #endif #include -#include -#include #include +#include +#include #ifndef WIN32 # include diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c index 6589b784ec0..985a8e977ca 100644 --- a/source/blender/imbuf/intern/indexer.c +++ b/source/blender/imbuf/intern/indexer.c @@ -24,18 +24,18 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_endian_switch.h" -#include "BLI_path_util.h" -#include "BLI_string.h" #include "BLI_fileops.h" #include "BLI_ghash.h" +#include "BLI_path_util.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" #ifdef _WIN32 # include "BLI_winstuff.h" #endif -#include "IMB_indexer.h" #include "IMB_anim.h" +#include "IMB_indexer.h" #include "imbuf.h" #include "BKE_global.h" diff --git a/source/blender/imbuf/intern/iris.c b/source/blender/imbuf/intern/iris.c index 4b23443933a..bfcd1ec2cee 100644 --- a/source/blender/imbuf/intern/iris.c +++ b/source/blender/imbuf/intern/iris.c @@ -23,15 +23,15 @@ #include -#include "BLI_utildefines.h" #include "BLI_fileops.h" +#include "BLI_utildefines.h" #include "MEM_guardedalloc.h" -#include "imbuf.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_filetype.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" +#include "imbuf.h" #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c index e361df1304a..5154f50c7e8 100644 --- a/source/blender/imbuf/intern/jp2.c +++ b/source/blender/imbuf/intern/jp2.c @@ -20,12 +20,12 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_fileops.h" +#include "BLI_math.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_filetype.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" diff --git a/source/blender/imbuf/intern/jpeg.c b/source/blender/imbuf/intern/jpeg.c index 8fa6b1722ad..fe74d9bc23f 100644 --- a/source/blender/imbuf/intern/jpeg.c +++ b/source/blender/imbuf/intern/jpeg.c @@ -22,24 +22,24 @@ */ /* This little block needed for linking to Blender... */ -#include #include +#include #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_string.h" #include "BLI_fileops.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" #include "BKE_idprop.h" -#include "imbuf.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" -#include "IMB_metadata.h" #include "IMB_filetype.h" -#include "jpeglib.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" +#include "IMB_metadata.h" +#include "imbuf.h" #include "jerror.h" +#include "jpeglib.h" #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" diff --git a/source/blender/imbuf/intern/metadata.c b/source/blender/imbuf/intern/metadata.c index ac31f7db791..28f09c38a96 100644 --- a/source/blender/imbuf/intern/metadata.c +++ b/source/blender/imbuf/intern/metadata.c @@ -24,15 +24,15 @@ #include #include -#include "BLI_utildefines.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BKE_idprop.h" #include "MEM_guardedalloc.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_metadata.h" diff --git a/source/blender/imbuf/intern/module.c b/source/blender/imbuf/intern/module.c index dc3d4cfbb62..00c53c37bb1 100644 --- a/source/blender/imbuf/intern/module.c +++ b/source/blender/imbuf/intern/module.c @@ -23,9 +23,9 @@ #include "BLI_utildefines.h" #include "IMB_allocimbuf.h" -#include "IMB_imbuf.h" -#include "IMB_filetype.h" #include "IMB_colormanagement_intern.h" +#include "IMB_filetype.h" +#include "IMB_imbuf.h" void IMB_init(void) { diff --git a/source/blender/imbuf/intern/moviecache.c b/source/blender/imbuf/intern/moviecache.c index fbe074d0fd5..f3b76288831 100644 --- a/source/blender/imbuf/intern/moviecache.c +++ b/source/blender/imbuf/intern/moviecache.c @@ -23,22 +23,22 @@ #undef DEBUG_MESSAGES -#include /* for qsort */ #include +#include /* for qsort */ -#include "MEM_guardedalloc.h" #include "MEM_CacheLimiterC-Api.h" +#include "MEM_guardedalloc.h" -#include "BLI_string.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_mempool.h" +#include "BLI_string.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include "IMB_moviecache.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #ifdef DEBUG_MESSAGES # if defined __GNUC__ diff --git a/source/blender/imbuf/intern/oiio/openimageio_api.cpp b/source/blender/imbuf/intern/oiio/openimageio_api.cpp index 4746cec41d4..6d3234771e7 100644 --- a/source/blender/imbuf/intern/oiio/openimageio_api.cpp +++ b/source/blender/imbuf/intern/oiio/openimageio_api.cpp @@ -29,20 +29,20 @@ #endif // NOTE: Keep first, BLI_path_util conflicts with OIIO's format. -#include #include "openimageio_api.h" #include +#include #include "MEM_guardedalloc.h" extern "C" { #include "BLI_blenlib.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_allocimbuf.h" #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" } OIIO_NAMESPACE_USING diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index 9fa2c7a28c5..8f001c9031f 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -21,41 +21,41 @@ * \ingroup openexr */ -#include -#include +#include +#include +#include +#include +#include #include #include -#include +#include +#include #include -#include -#include -#include -#include -#include #include -#include #include #include -#include #include -#include -#include -#include #include #include -#include +#include +#include +#include +#include #include +#include +#include +#include /* multiview/multipart */ -#include -#include #include -#include +#include #include -#include -#include +#include +#include #include +#include +#include #include "DNA_scene_types.h" /* For OpenEXR compression constants */ @@ -83,9 +83,9 @@ _CRTIMP void __cdecl _invalid_parameter_noinfo(void) #include "BKE_idprop.h" #include "BKE_image.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_allocimbuf.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_metadata.h" #include "openexr_multi.h" diff --git a/source/blender/imbuf/intern/png.c b/source/blender/imbuf/intern/png.c index 68504f5c0dc..d6d185ef59b 100644 --- a/source/blender/imbuf/intern/png.c +++ b/source/blender/imbuf/intern/png.c @@ -25,21 +25,21 @@ #include "png.h" -#include "BLI_utildefines.h" #include "BLI_fileops.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_global.h" #include "BKE_idprop.h" #include "MEM_guardedalloc.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_allocimbuf.h" -#include "IMB_metadata.h" #include "IMB_filetype.h" +#include "IMB_metadata.h" #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" diff --git a/source/blender/imbuf/intern/radiance_hdr.c b/source/blender/imbuf/intern/radiance_hdr.c index 5e81b716619..46d07e74ce3 100644 --- a/source/blender/imbuf/intern/radiance_hdr.c +++ b/source/blender/imbuf/intern/radiance_hdr.c @@ -36,8 +36,8 @@ #include "imbuf.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_allocimbuf.h" #include "IMB_filetype.h" diff --git a/source/blender/imbuf/intern/readimage.c b/source/blender/imbuf/intern/readimage.c index d9f3c7ec6bb..7be2bc48a4d 100644 --- a/source/blender/imbuf/intern/readimage.c +++ b/source/blender/imbuf/intern/readimage.c @@ -23,23 +23,23 @@ */ #ifdef _WIN32 +# include "mmap_win.h" # include # include # include -# include "mmap_win.h" #endif -#include -#include "BLI_utildefines.h" -#include "BLI_string.h" -#include "BLI_path_util.h" #include "BLI_fileops.h" +#include "BLI_path_util.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" +#include -#include "imbuf.h" #include "IMB_allocimbuf.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_filetype.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" +#include "imbuf.h" #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" diff --git a/source/blender/imbuf/intern/rectop.c b/source/blender/imbuf/intern/rectop.c index e5396b4551b..91787d64525 100644 --- a/source/blender/imbuf/intern/rectop.c +++ b/source/blender/imbuf/intern/rectop.c @@ -24,15 +24,15 @@ #include -#include "BLI_utildefines.h" -#include "BLI_rect.h" #include "BLI_math_base.h" #include "BLI_math_color.h" #include "BLI_math_color_blend.h" #include "BLI_math_vector.h" +#include "BLI_rect.h" +#include "BLI_utildefines.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_colormanagement.h" diff --git a/source/blender/imbuf/intern/rotate.c b/source/blender/imbuf/intern/rotate.c index e387901aaab..17b485b5171 100644 --- a/source/blender/imbuf/intern/rotate.c +++ b/source/blender/imbuf/intern/rotate.c @@ -26,9 +26,9 @@ #include "MEM_guardedalloc.h" -#include "imbuf.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" +#include "imbuf.h" void IMB_flipy(struct ImBuf *ibuf) { diff --git a/source/blender/imbuf/intern/scaling.c b/source/blender/imbuf/intern/scaling.c index 46ddee25b0f..95f720a9d16 100644 --- a/source/blender/imbuf/intern/scaling.c +++ b/source/blender/imbuf/intern/scaling.c @@ -22,14 +22,14 @@ * \ingroup imbuf */ -#include "BLI_utildefines.h" #include "BLI_math_color.h" #include "BLI_math_interp.h" +#include "BLI_utildefines.h" #include "MEM_guardedalloc.h" -#include "imbuf.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" +#include "imbuf.h" #include "IMB_filter.h" diff --git a/source/blender/imbuf/intern/stereoimbuf.c b/source/blender/imbuf/intern/stereoimbuf.c index 71750c9c28f..5569e119b95 100644 --- a/source/blender/imbuf/intern/stereoimbuf.c +++ b/source/blender/imbuf/intern/stereoimbuf.c @@ -27,9 +27,9 @@ #include "IMB_imbuf_types.h" #include "IMB_allocimbuf.h" +#include "IMB_colormanagement_intern.h" #include "IMB_filetype.h" #include "IMB_metadata.h" -#include "IMB_colormanagement_intern.h" #include "imbuf.h" @@ -39,8 +39,8 @@ #include "BLI_math.h" -#include "DNA_userdef_types.h" #include "DNA_scene_types.h" +#include "DNA_userdef_types.h" /* prototypes */ struct Stereo3DData; diff --git a/source/blender/imbuf/intern/targa.c b/source/blender/imbuf/intern/targa.c index 65ae8f8fa4b..9f33c7ea2b2 100644 --- a/source/blender/imbuf/intern/targa.c +++ b/source/blender/imbuf/intern/targa.c @@ -25,15 +25,15 @@ # include #endif -#include "BLI_utildefines.h" #include "BLI_fileops.h" +#include "BLI_utildefines.h" #include "MEM_guardedalloc.h" #include "imbuf.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_filetype.h" diff --git a/source/blender/imbuf/intern/thumbs.c b/source/blender/imbuf/intern/thumbs.c index eb4b29e81c1..195a2e9fe9c 100644 --- a/source/blender/imbuf/intern/thumbs.c +++ b/source/blender/imbuf/intern/thumbs.c @@ -26,31 +26,31 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_string.h" -#include "BLI_path_util.h" #include "BLI_fileops.h" #include "BLI_ghash.h" #include "BLI_hash_md5.h" +#include "BLI_path_util.h" +#include "BLI_string.h" #include "BLI_system.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include BLI_SYSTEM_PID_H #include "DNA_space_types.h" /* For FILE_MAX_LIBEXTRA */ #include "BLO_readfile.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" -#include "IMB_thumbs.h" +#include "IMB_imbuf_types.h" #include "IMB_metadata.h" +#include "IMB_thumbs.h" #include -#include -#include -#include -#include #include +#include +#include +#include +#include #ifdef WIN32 /* Need to include windows.h so _WIN32_IE is defined. */ @@ -61,10 +61,10 @@ # endif /* For SHGetSpecialFolderPath, has to be done before BLI_winstuff * because 'near' is disabled through BLI_windstuff */ -# include -# include /* chdir */ # include "BLI_winstuff.h" # include "utfconv.h" +# include /* chdir */ +# include #endif #if defined(WIN32) || defined(__APPLE__) diff --git a/source/blender/imbuf/intern/thumbs_blend.c b/source/blender/imbuf/intern/thumbs_blend.c index 283bd11dc7d..1054b3d2d6e 100644 --- a/source/blender/imbuf/intern/thumbs_blend.c +++ b/source/blender/imbuf/intern/thumbs_blend.c @@ -21,21 +21,21 @@ #include #include -#include "BLI_utildefines.h" #include "BLI_linklist.h" #include "BLI_listbase.h" /* Needed due to import of BLO_readfile.h */ +#include "BLI_utildefines.h" #include "BLO_blend_defs.h" #include "BLO_readfile.h" -#include "BKE_idcode.h" #include "BKE_icons.h" +#include "BKE_idcode.h" #include "BKE_main.h" #include "DNA_ID.h" /* For preview images... */ -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_thumbs.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/imbuf/intern/thumbs_font.c b/source/blender/imbuf/intern/thumbs_font.c index ddb1eb62006..b402dfb35e1 100644 --- a/source/blender/imbuf/intern/thumbs_font.c +++ b/source/blender/imbuf/intern/thumbs_font.c @@ -18,13 +18,13 @@ * \ingroup imbuf */ -#include "BLI_utildefines.h" -#include "BLI_string.h" #include "BLI_fileops.h" #include "BLI_hash_md5.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_thumbs.h" diff --git a/source/blender/imbuf/intern/tiff.c b/source/blender/imbuf/intern/tiff.c index fc0a643fade..309de25db03 100644 --- a/source/blender/imbuf/intern/tiff.c +++ b/source/blender/imbuf/intern/tiff.c @@ -43,8 +43,8 @@ #include "BKE_global.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_filetype.h" diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index a8aabf384c8..3c420f3f297 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -28,17 +28,17 @@ #include -#include "BLI_utildefines.h" -#include "BLI_path_util.h" #include "BLI_fileops.h" +#include "BLI_path_util.h" +#include "BLI_utildefines.h" #ifdef _WIN32 # include "BLI_winstuff.h" #endif -#include "imbuf.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_filetype.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" +#include "imbuf.h" #include "IMB_anim.h" @@ -48,8 +48,8 @@ # include "BKE_global.h" /* G.debug */ # include -# include # include +# include # include # include "ffmpeg_compat.h" diff --git a/source/blender/imbuf/intern/writeimage.c b/source/blender/imbuf/intern/writeimage.c index ac3961faf49..9cb0436cb98 100644 --- a/source/blender/imbuf/intern/writeimage.c +++ b/source/blender/imbuf/intern/writeimage.c @@ -22,16 +22,16 @@ * \ingroup imbuf */ +#include #include #include -#include -#include "BLI_utildefines.h" #include "BLI_path_util.h" +#include "BLI_utildefines.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_filetype.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" diff --git a/source/blender/io/alembic/intern/abc_exporter.cc b/source/blender/io/alembic/intern/abc_exporter.cc index a58b0a29e5e..fb75fb1f6c7 100644 --- a/source/blender/io/alembic/intern/abc_exporter.cc +++ b/source/blender/io/alembic/intern/abc_exporter.cc @@ -22,6 +22,7 @@ #include +#include "abc_util.h" #include "abc_writer_archive.h" #include "abc_writer_camera.h" #include "abc_writer_curves.h" @@ -31,18 +32,17 @@ #include "abc_writer_nurbs.h" #include "abc_writer_points.h" #include "abc_writer_transform.h" -#include "abc_util.h" extern "C" { #include "DNA_camera_types.h" #include "DNA_curve_types.h" -#include "DNA_meta_types.h" +#include "DNA_fluid_types.h" #include "DNA_mesh_types.h" +#include "DNA_meta_types.h" #include "DNA_modifier_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_space_types.h" /* for FILE_MAX */ -#include "DNA_fluid_types.h" #include "BLI_string.h" diff --git a/source/blender/io/alembic/intern/abc_reader_curves.h b/source/blender/io/alembic/intern/abc_reader_curves.h index 1e4f28edc51..763a83f586f 100644 --- a/source/blender/io/alembic/intern/abc_reader_curves.h +++ b/source/blender/io/alembic/intern/abc_reader_curves.h @@ -24,8 +24,8 @@ #ifndef __ABC_READER_CURVES_H__ #define __ABC_READER_CURVES_H__ -#include "abc_reader_object.h" #include "abc_reader_mesh.h" +#include "abc_reader_object.h" struct Curve; diff --git a/source/blender/io/alembic/intern/abc_reader_object.cc b/source/blender/io/alembic/intern/abc_reader_object.cc index 3e7f87d78cc..9b0c3237c45 100644 --- a/source/blender/io/alembic/intern/abc_reader_object.cc +++ b/source/blender/io/alembic/intern/abc_reader_object.cc @@ -32,10 +32,10 @@ extern "C" { #include "BKE_modifier.h" #include "BKE_object.h" -#include "BLI_utildefines.h" #include "BLI_listbase.h" #include "BLI_math_geom.h" #include "BLI_string.h" +#include "BLI_utildefines.h" } using Alembic::AbcGeom::IObject; diff --git a/source/blender/io/alembic/intern/abc_reader_points.h b/source/blender/io/alembic/intern/abc_reader_points.h index 31ad6c4589b..bb33afb466f 100644 --- a/source/blender/io/alembic/intern/abc_reader_points.h +++ b/source/blender/io/alembic/intern/abc_reader_points.h @@ -24,8 +24,8 @@ #ifndef __ABC_READER_POINTS_H__ #define __ABC_READER_POINTS_H__ -#include "abc_reader_object.h" #include "abc_customdata.h" +#include "abc_reader_object.h" class AbcPointsReader : public AbcObjectReader { Alembic::AbcGeom::IPointsSchema m_schema; diff --git a/source/blender/io/alembic/intern/abc_writer_curves.h b/source/blender/io/alembic/intern/abc_writer_curves.h index d6d8c0a7f11..e57978ada2a 100644 --- a/source/blender/io/alembic/intern/abc_writer_curves.h +++ b/source/blender/io/alembic/intern/abc_writer_curves.h @@ -24,8 +24,8 @@ #ifndef __ABC_WRITER_CURVES_H__ #define __ABC_WRITER_CURVES_H__ -#include "abc_writer_object.h" #include "abc_writer_mesh.h" +#include "abc_writer_object.h" class AbcCurveWriter : public AbcObjectWriter { Alembic::AbcGeom::OCurvesSchema m_schema; diff --git a/source/blender/io/alembic/intern/abc_writer_hair.cc b/source/blender/io/alembic/intern/abc_writer_hair.cc index bbba03ed7f4..f29d195f2ff 100644 --- a/source/blender/io/alembic/intern/abc_writer_hair.cc +++ b/source/blender/io/alembic/intern/abc_writer_hair.cc @@ -19,8 +19,8 @@ */ #include "abc_writer_hair.h" -#include "abc_writer_transform.h" #include "abc_util.h" +#include "abc_writer_transform.h" #include diff --git a/source/blender/io/alembic/intern/abc_writer_mball.cc b/source/blender/io/alembic/intern/abc_writer_mball.cc index cc0775bd537..151848674f9 100644 --- a/source/blender/io/alembic/intern/abc_writer_mball.cc +++ b/source/blender/io/alembic/intern/abc_writer_mball.cc @@ -22,8 +22,8 @@ #include "abc_writer_mesh.h" extern "C" { -#include "DNA_meta_types.h" #include "DNA_mesh_types.h" +#include "DNA_meta_types.h" #include "DNA_object_types.h" #include "BKE_displist.h" diff --git a/source/blender/io/alembic/intern/abc_writer_mball.h b/source/blender/io/alembic/intern/abc_writer_mball.h index c752472c86d..e3ac1e69cae 100644 --- a/source/blender/io/alembic/intern/abc_writer_mball.h +++ b/source/blender/io/alembic/intern/abc_writer_mball.h @@ -21,8 +21,8 @@ #ifndef __ABC_WRITER_MBALL_H__ #define __ABC_WRITER_MBALL_H__ -#include "abc_writer_object.h" #include "abc_writer_mesh.h" +#include "abc_writer_object.h" struct Main; struct Object; diff --git a/source/blender/io/alembic/intern/abc_writer_mesh.cc b/source/blender/io/alembic/intern/abc_writer_mesh.cc index b55d2473f99..f81b9505048 100644 --- a/source/blender/io/alembic/intern/abc_writer_mesh.cc +++ b/source/blender/io/alembic/intern/abc_writer_mesh.cc @@ -19,8 +19,8 @@ */ #include "abc_writer_mesh.h" -#include "abc_writer_transform.h" #include "abc_util.h" +#include "abc_writer_transform.h" extern "C" { #include "DNA_material_types.h" diff --git a/source/blender/io/alembic/intern/abc_writer_nurbs.cc b/source/blender/io/alembic/intern/abc_writer_nurbs.cc index 9796eaf54c3..d643f5482c0 100644 --- a/source/blender/io/alembic/intern/abc_writer_nurbs.cc +++ b/source/blender/io/alembic/intern/abc_writer_nurbs.cc @@ -19,8 +19,8 @@ */ #include "abc_writer_nurbs.h" -#include "abc_writer_transform.h" #include "abc_util.h" +#include "abc_writer_transform.h" extern "C" { #include "DNA_curve_types.h" diff --git a/source/blender/io/alembic/intern/abc_writer_points.cc b/source/blender/io/alembic/intern/abc_writer_points.cc index cc4abe8ec4b..70a1ead239a 100644 --- a/source/blender/io/alembic/intern/abc_writer_points.cc +++ b/source/blender/io/alembic/intern/abc_writer_points.cc @@ -22,9 +22,9 @@ */ #include "abc_writer_points.h" +#include "abc_util.h" #include "abc_writer_mesh.h" #include "abc_writer_transform.h" -#include "abc_util.h" extern "C" { #include "DNA_object_types.h" diff --git a/source/blender/io/alembic/intern/abc_writer_points.h b/source/blender/io/alembic/intern/abc_writer_points.h index 77dd10c4b26..c171cddd10e 100644 --- a/source/blender/io/alembic/intern/abc_writer_points.h +++ b/source/blender/io/alembic/intern/abc_writer_points.h @@ -24,8 +24,8 @@ #ifndef __ABC_WRITER_POINTS_H__ #define __ABC_WRITER_POINTS_H__ -#include "abc_writer_object.h" #include "abc_customdata.h" +#include "abc_writer_object.h" struct ParticleSystem; diff --git a/source/blender/io/avi/intern/avi.c b/source/blender/io/avi/intern/avi.c index 0901d03a90f..e829a15deba 100644 --- a/source/blender/io/avi/intern/avi.c +++ b/source/blender/io/avi/intern/avi.c @@ -23,11 +23,11 @@ * This is external code. */ -#include -#include +#include #include #include -#include +#include +#include #ifdef WIN32 # include "BLI_winstuff.h" @@ -35,9 +35,9 @@ #include "MEM_guardedalloc.h" +#include "BLI_fileops.h" #include "BLI_sys_types.h" #include "BLI_utildefines.h" -#include "BLI_fileops.h" #include "AVI_avi.h" #include "avi_intern.h" diff --git a/source/blender/io/avi/intern/avi_codecs.c b/source/blender/io/avi/intern/avi_codecs.c index 15f498ac653..fae8285aff5 100644 --- a/source/blender/io/avi/intern/avi_codecs.c +++ b/source/blender/io/avi/intern/avi_codecs.c @@ -26,8 +26,8 @@ #include "AVI_avi.h" #include "avi_intern.h" -#include "avi_rgb.h" #include "avi_mjpeg.h" +#include "avi_rgb.h" #include "avi_rgb32.h" void *avi_format_convert( diff --git a/source/blender/io/avi/intern/avi_endian.c b/source/blender/io/avi/intern/avi_endian.c index 56474e9e329..146206cd917 100644 --- a/source/blender/io/avi/intern/avi_endian.c +++ b/source/blender/io/avi/intern/avi_endian.c @@ -24,9 +24,9 @@ * endianness of the system. */ +#include #include #include -#include #include "AVI_avi.h" #include "avi_endian.h" diff --git a/source/blender/io/avi/intern/avi_mjpeg.c b/source/blender/io/avi/intern/avi_mjpeg.c index d4c7378964e..ac622d8b0e4 100644 --- a/source/blender/io/avi/intern/avi_mjpeg.c +++ b/source/blender/io/avi/intern/avi_mjpeg.c @@ -32,8 +32,8 @@ #include "IMB_imbuf.h" -#include "jpeglib.h" #include "jerror.h" +#include "jpeglib.h" #include "avi_mjpeg.h" diff --git a/source/blender/io/avi/intern/avi_options.c b/source/blender/io/avi/intern/avi_options.c index b078eccf376..65c64951ca0 100644 --- a/source/blender/io/avi/intern/avi_options.c +++ b/source/blender/io/avi/intern/avi_options.c @@ -25,9 +25,9 @@ */ #include "AVI_avi.h" -#include "avi_intern.h" -#include "avi_endian.h" #include "BLI_fileops.h" +#include "avi_endian.h" +#include "avi_intern.h" #ifdef WIN32 # include "BLI_winstuff.h" diff --git a/source/blender/io/collada/AnimationClipExporter.cpp b/source/blender/io/collada/AnimationClipExporter.cpp index 5868c24e6cd..5cfcd35a11e 100644 --- a/source/blender/io/collada/AnimationClipExporter.cpp +++ b/source/blender/io/collada/AnimationClipExporter.cpp @@ -14,8 +14,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "GeometryExporter.h" #include "AnimationClipExporter.h" +#include "GeometryExporter.h" #include "MaterialExporter.h" void AnimationClipExporter::exportAnimationClips(Scene *sce) diff --git a/source/blender/io/collada/AnimationClipExporter.h b/source/blender/io/collada/AnimationClipExporter.h index 036a03c3b53..9d782eac094 100644 --- a/source/blender/io/collada/AnimationClipExporter.h +++ b/source/blender/io/collada/AnimationClipExporter.h @@ -17,9 +17,9 @@ #ifndef __ANIMATIONCLIPEXPORTER_H__ #define __ANIMATIONCLIPEXPORTER_H__ -#include -#include #include +#include +#include #include "COLLADASWLibraryAnimationClips.h" #include "DEG_depsgraph.h" diff --git a/source/blender/io/collada/AnimationExporter.cpp b/source/blender/io/collada/AnimationExporter.cpp index cd4319e3101..9f0c1924bb9 100644 --- a/source/blender/io/collada/AnimationExporter.cpp +++ b/source/blender/io/collada/AnimationExporter.cpp @@ -18,10 +18,10 @@ * \ingroup collada */ -#include "GeometryExporter.h" #include "AnimationExporter.h" #include "AnimationClipExporter.h" #include "BCAnimationSampler.h" +#include "GeometryExporter.h" #include "MaterialExporter.h" #include "collada_utils.h" diff --git a/source/blender/io/collada/AnimationExporter.h b/source/blender/io/collada/AnimationExporter.h index 64751ec5327..e95a1b93163 100644 --- a/source/blender/io/collada/AnimationExporter.h +++ b/source/blender/io/collada/AnimationExporter.h @@ -17,38 +17,37 @@ #ifndef __ANIMATIONEXPORTER_H__ #define __ANIMATIONEXPORTER_H__ -#include -#include #include +#include +#include #include "BCAnimationCurve.h" extern "C" { -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_anim_types.h" #include "DNA_action_types.h" +#include "DNA_anim_types.h" +#include "DNA_armature_types.h" +#include "DNA_camera_types.h" +#include "DNA_constraint_types.h" #include "DNA_curve_types.h" #include "DNA_light_types.h" -#include "DNA_camera_types.h" -#include "DNA_armature_types.h" #include "DNA_material_types.h" -#include "DNA_constraint_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_string.h" -#include "BLI_listbase.h" #include "BLI_utildefines.h" -#include "BKE_fcurve.h" -#include "BKE_animsys.h" -#include "BKE_scene.h" -#include "BKE_action.h" // pose functions -#include "BKE_armature.h" -#include "BKE_object.h" -#include "BKE_constraint.h" #include "BIK_api.h" +#include "BKE_action.h" // pose functions +#include "BKE_animsys.h" +#include "BKE_armature.h" +#include "BKE_constraint.h" +#include "BKE_fcurve.h" +#include "BKE_object.h" +#include "BKE_scene.h" #include "ED_object.h" } @@ -56,27 +55,27 @@ extern "C" { #include "RNA_access.h" -#include "COLLADASWSource.h" -#include "COLLADASWInstanceGeometry.h" -#include "COLLADASWInputList.h" -#include "COLLADASWPrimitves.h" -#include "COLLADASWVertices.h" -#include "COLLADASWLibraryAnimations.h" -#include "COLLADASWParamTemplate.h" -#include "COLLADASWParamBase.h" -#include "COLLADASWSampler.h" -#include "COLLADASWConstants.h" #include "COLLADASWBaseInputElement.h" +#include "COLLADASWConstants.h" +#include "COLLADASWInputList.h" +#include "COLLADASWInstanceGeometry.h" +#include "COLLADASWLibraryAnimations.h" +#include "COLLADASWParamBase.h" +#include "COLLADASWParamTemplate.h" +#include "COLLADASWPrimitves.h" +#include "COLLADASWSampler.h" +#include "COLLADASWSource.h" +#include "COLLADASWVertices.h" -#include "EffectExporter.h" #include "BCAnimationSampler.h" +#include "EffectExporter.h" #include "collada_internal.h" #include "IK_solver.h" -#include -#include #include // std::find +#include +#include typedef enum BC_animation_source_type { BC_SOURCE_TYPE_VALUE, diff --git a/source/blender/io/collada/AnimationImporter.cpp b/source/blender/io/collada/AnimationImporter.cpp index 715cd9e1a12..db73c1f37d6 100644 --- a/source/blender/io/collada/AnimationImporter.cpp +++ b/source/blender/io/collada/AnimationImporter.cpp @@ -41,10 +41,10 @@ #include "MEM_guardedalloc.h" -#include "collada_utils.h" #include "AnimationImporter.h" #include "ArmatureImporter.h" #include "MaterialExporter.h" +#include "collada_utils.h" #include diff --git a/source/blender/io/collada/AnimationImporter.h b/source/blender/io/collada/AnimationImporter.h index 0043dad7116..263a130d1eb 100644 --- a/source/blender/io/collada/AnimationImporter.h +++ b/source/blender/io/collada/AnimationImporter.h @@ -27,21 +27,21 @@ #include "COLLADAFWAnimation.h" #include "COLLADAFWAnimationCurve.h" #include "COLLADAFWAnimationList.h" -#include "COLLADAFWNode.h" -#include "COLLADAFWUniqueId.h" -#include "COLLADAFWLight.h" #include "COLLADAFWCamera.h" -#include "COLLADAFWMaterial.h" #include "COLLADAFWEffect.h" #include "COLLADAFWInstanceGeometry.h" +#include "COLLADAFWLight.h" +#include "COLLADAFWMaterial.h" +#include "COLLADAFWNode.h" +#include "COLLADAFWUniqueId.h" extern "C" { #include "BKE_context.h" #include "DNA_anim_types.h" +#include "DNA_camera_types.h" +#include "DNA_light_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_light_types.h" -#include "DNA_camera_types.h" } //#include "ArmatureImporter.h" diff --git a/source/blender/io/collada/ArmatureExporter.cpp b/source/blender/io/collada/ArmatureExporter.cpp index 84979cc4ca4..660917c2aa1 100644 --- a/source/blender/io/collada/ArmatureExporter.cpp +++ b/source/blender/io/collada/ArmatureExporter.cpp @@ -39,8 +39,8 @@ extern "C" { #include "BLI_listbase.h" -#include "GeometryExporter.h" #include "ArmatureExporter.h" +#include "GeometryExporter.h" #include "SceneExporter.h" // write bone nodes diff --git a/source/blender/io/collada/ArmatureExporter.h b/source/blender/io/collada/ArmatureExporter.h index da6d6f79ef5..3bc9dfe2639 100644 --- a/source/blender/io/collada/ArmatureExporter.h +++ b/source/blender/io/collada/ArmatureExporter.h @@ -25,20 +25,20 @@ #include //#include -#include "COLLADASWStreamWriter.h" -#include "COLLADASWLibraryControllers.h" #include "COLLADASWInputList.h" +#include "COLLADASWLibraryControllers.h" #include "COLLADASWNode.h" +#include "COLLADASWStreamWriter.h" #include "DNA_armature_types.h" +#include "DNA_constraint_types.h" #include "DNA_listBase.h" #include "DNA_mesh_types.h" #include "DNA_object_types.h" -#include "DNA_constraint_types.h" #include "DNA_scene_types.h" -#include "TransformWriter.h" #include "InstanceWriter.h" +#include "TransformWriter.h" #include "ExportSettings.h" diff --git a/source/blender/io/collada/ArmatureImporter.cpp b/source/blender/io/collada/ArmatureImporter.cpp index b8c534f97dd..ed8984a4239 100644 --- a/source/blender/io/collada/ArmatureImporter.cpp +++ b/source/blender/io/collada/ArmatureImporter.cpp @@ -27,17 +27,17 @@ extern "C" { #include "BKE_action.h" -#include "BKE_object.h" #include "BKE_armature.h" -#include "BLI_string.h" +#include "BKE_object.h" #include "BLI_listbase.h" +#include "BLI_string.h" #include "ED_armature.h" } #include "DEG_depsgraph.h" -#include "collada_utils.h" #include "ArmatureImporter.h" +#include "collada_utils.h" /* use node name, or fall back to original id if not present (name is optional) */ template static const char *bc_get_joint_name(T *node) diff --git a/source/blender/io/collada/ArmatureImporter.h b/source/blender/io/collada/ArmatureImporter.h index da92c04e5dc..bafa10ca804 100644 --- a/source/blender/io/collada/ArmatureImporter.h +++ b/source/blender/io/collada/ArmatureImporter.h @@ -21,34 +21,34 @@ #ifndef __ARMATUREIMPORTER_H__ #define __ARMATUREIMPORTER_H__ +#include "COLLADAFWMorphController.h" #include "COLLADAFWNode.h" #include "COLLADAFWUniqueId.h" -#include "COLLADAFWMorphController.h" extern "C" { #include "BKE_context.h" #include "BKE_key.h" #include "DNA_armature_types.h" +#include "DNA_key_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_key_types.h" #include "ED_armature.h" } #include "AnimationImporter.h" +#include "ExtraTags.h" #include "MeshImporter.h" #include "SkinInfo.h" #include "TransformReader.h" -#include "ExtraTags.h" #include #include +#include "ImportSettings.h" #include "collada_internal.h" #include "collada_utils.h" -#include "ImportSettings.h" #define UNLIMITED_CHAIN_MAX INT_MAX #define MINIMUM_BONE_LENGTH 0.000001f diff --git a/source/blender/io/collada/BCAnimationCurve.h b/source/blender/io/collada/BCAnimationCurve.h index 7b523ac53ca..71640ff3013 100644 --- a/source/blender/io/collada/BCAnimationCurve.h +++ b/source/blender/io/collada/BCAnimationCurve.h @@ -20,18 +20,18 @@ #ifndef __BCANIMATIONCURVE_H__ #define __BCANIMATIONCURVE_H__ -#include "collada_utils.h" #include "BCSampleData.h" +#include "collada_utils.h" #include "MEM_guardedalloc.h" extern "C" { -#include "BKE_fcurve.h" #include "BKE_armature.h" +#include "BKE_fcurve.h" #include "BKE_material.h" #include "ED_anim_api.h" -#include "ED_keyframing.h" #include "ED_keyframes_edit.h" +#include "ED_keyframing.h" } typedef float(TangentPoint)[2]; diff --git a/source/blender/io/collada/BCAnimationSampler.cpp b/source/blender/io/collada/BCAnimationSampler.cpp index e6996e95a5b..0c19ce9a4c7 100644 --- a/source/blender/io/collada/BCAnimationSampler.cpp +++ b/source/blender/io/collada/BCAnimationSampler.cpp @@ -17,28 +17,28 @@ * All rights reserved. */ -#include -#include #include // std::find +#include +#include -#include "ExportSettings.h" #include "BCAnimationCurve.h" #include "BCAnimationSampler.h" -#include "collada_utils.h" #include "BCMath.h" +#include "ExportSettings.h" +#include "collada_utils.h" extern "C" { #include "BKE_action.h" #include "BKE_constraint.h" #include "BKE_key.h" -#include "BKE_main.h" #include "BKE_lib_id.h" +#include "BKE_main.h" #include "BKE_material.h" #include "BLI_listbase.h" #include "DNA_anim_types.h" -#include "DNA_scene_types.h" -#include "DNA_key_types.h" #include "DNA_constraint_types.h" +#include "DNA_key_types.h" +#include "DNA_scene_types.h" #include "ED_object.h" } diff --git a/source/blender/io/collada/BCSampleData.h b/source/blender/io/collada/BCSampleData.h index 07ecb544c71..877fb49981a 100644 --- a/source/blender/io/collada/BCSampleData.h +++ b/source/blender/io/collada/BCSampleData.h @@ -20,22 +20,22 @@ #ifndef __BCSAMPLEDATA_H__ #define __BCSAMPLEDATA_H__ -#include -#include #include +#include +#include -#include "ExportSettings.h" -#include "BCSampleData.h" #include "BCMath.h" +#include "BCSampleData.h" +#include "ExportSettings.h" extern "C" { #include "BKE_object.h" #include "BLI_math_rotation.h" -#include "DNA_object_types.h" #include "DNA_armature_types.h" -#include "DNA_material_types.h" -#include "DNA_light_types.h" #include "DNA_camera_types.h" +#include "DNA_light_types.h" +#include "DNA_material_types.h" +#include "DNA_object_types.h" } typedef std::map BCBoneMatrixMap; diff --git a/source/blender/io/collada/BlenderContext.h b/source/blender/io/collada/BlenderContext.h index 50781e8eede..15ebd671b1a 100644 --- a/source/blender/io/collada/BlenderContext.h +++ b/source/blender/io/collada/BlenderContext.h @@ -26,14 +26,14 @@ extern "C" { #endif -#include "DNA_object_types.h" -#include "BLI_linklist.h" #include "BKE_context.h" #include "BKE_main.h" +#include "BLI_linklist.h" +#include "BlenderTypes.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" #include "DNA_layer_types.h" -#include "BlenderTypes.h" +#include "DNA_object_types.h" static const BC_global_forward_axis BC_DEFAULT_FORWARD = BC_GLOBAL_FORWARD_Y; static const BC_global_up_axis BC_DEFAULT_UP = BC_GLOBAL_UP_Z; diff --git a/source/blender/io/collada/CameraExporter.h b/source/blender/io/collada/CameraExporter.h index 04bcc4a5dad..e4df994354c 100644 --- a/source/blender/io/collada/CameraExporter.h +++ b/source/blender/io/collada/CameraExporter.h @@ -21,16 +21,16 @@ #ifndef __CAMERAEXPORTER_H__ #define __CAMERAEXPORTER_H__ -#include "COLLADASWStreamWriter.h" #include "COLLADASWLibraryCameras.h" +#include "COLLADASWStreamWriter.h" extern "C" { #include "DNA_object_types.h" #include "DNA_scene_types.h" } -#include "ExportSettings.h" #include "DNA_camera_types.h" +#include "ExportSettings.h" class CamerasExporter : COLLADASW::LibraryCameras { public: diff --git a/source/blender/io/collada/ControllerExporter.cpp b/source/blender/io/collada/ControllerExporter.cpp index 0119aba7dfd..c26647d4747 100644 --- a/source/blender/io/collada/ControllerExporter.cpp +++ b/source/blender/io/collada/ControllerExporter.cpp @@ -41,9 +41,9 @@ extern "C" { #include "BLI_listbase.h" -#include "GeometryExporter.h" #include "ArmatureExporter.h" #include "ControllerExporter.h" +#include "GeometryExporter.h" #include "SceneExporter.h" #include "collada_utils.h" diff --git a/source/blender/io/collada/ControllerExporter.h b/source/blender/io/collada/ControllerExporter.h index ce2ed9fe453..fb84af6ebc9 100644 --- a/source/blender/io/collada/ControllerExporter.h +++ b/source/blender/io/collada/ControllerExporter.h @@ -25,23 +25,23 @@ #include //#include -#include "COLLADASWStreamWriter.h" -#include "COLLADASWLibraryControllers.h" -#include "COLLADASWInstanceController.h" -#include "COLLADASWInputList.h" -#include "COLLADASWNode.h" #include "COLLADASWExtraTechnique.h" +#include "COLLADASWInputList.h" +#include "COLLADASWInstanceController.h" +#include "COLLADASWLibraryControllers.h" +#include "COLLADASWNode.h" +#include "COLLADASWStreamWriter.h" #include "DNA_armature_types.h" +#include "DNA_constraint_types.h" +#include "DNA_key_types.h" #include "DNA_listBase.h" #include "DNA_mesh_types.h" #include "DNA_object_types.h" -#include "DNA_constraint_types.h" #include "DNA_scene_types.h" -#include "DNA_key_types.h" -#include "TransformWriter.h" #include "InstanceWriter.h" +#include "TransformWriter.h" #include "ExportSettings.h" diff --git a/source/blender/io/collada/DocumentExporter.cpp b/source/blender/io/collada/DocumentExporter.cpp index 9d61b9b56ab..7565aa881fd 100644 --- a/source/blender/io/collada/DocumentExporter.cpp +++ b/source/blender/io/collada/DocumentExporter.cpp @@ -18,70 +18,71 @@ * \ingroup collada */ -#include -#include -#include -#include #include // std::find +#include +#include +#include +#include -#include "COLLADASWCamera.h" #include "COLLADASWAsset.h" +#include "COLLADASWBaseInputElement.h" +#include "COLLADASWBindMaterial.h" +#include "COLLADASWCamera.h" +#include "COLLADASWColorOrTexture.h" +#include "COLLADASWConstants.h" +#include "COLLADASWEffectProfile.h" +#include "COLLADASWImage.h" +#include "COLLADASWInputList.h" +#include "COLLADASWInstanceCamera.h" +#include "COLLADASWInstanceController.h" +#include "COLLADASWInstanceGeometry.h" +#include "COLLADASWInstanceLight.h" +#include "COLLADASWInstanceNode.h" +#include "COLLADASWLibraryAnimations.h" +#include "COLLADASWLibraryControllers.h" +#include "COLLADASWLibraryEffects.h" +#include "COLLADASWLibraryImages.h" +#include "COLLADASWLibraryMaterials.h" #include "COLLADASWLibraryVisualScenes.h" #include "COLLADASWNode.h" -#include "COLLADASWSource.h" -#include "COLLADASWInstanceGeometry.h" -#include "COLLADASWInputList.h" -#include "COLLADASWPrimitves.h" -#include "COLLADASWVertices.h" -#include "COLLADASWLibraryAnimations.h" -#include "COLLADASWLibraryImages.h" -#include "COLLADASWLibraryEffects.h" -#include "COLLADASWImage.h" -#include "COLLADASWEffectProfile.h" -#include "COLLADASWColorOrTexture.h" -#include "COLLADASWParamTemplate.h" #include "COLLADASWParamBase.h" -#include "COLLADASWSurfaceInitOption.h" +#include "COLLADASWParamTemplate.h" +#include "COLLADASWPrimitves.h" #include "COLLADASWSampler.h" #include "COLLADASWScene.h" +#include "COLLADASWSource.h" +#include "COLLADASWSurfaceInitOption.h" #include "COLLADASWTechnique.h" #include "COLLADASWTexture.h" -#include "COLLADASWLibraryMaterials.h" -#include "COLLADASWBindMaterial.h" -#include "COLLADASWInstanceCamera.h" -#include "COLLADASWInstanceLight.h" -#include "COLLADASWConstants.h" -#include "COLLADASWLibraryControllers.h" -#include "COLLADASWInstanceController.h" -#include "COLLADASWInstanceNode.h" -#include "COLLADASWBaseInputElement.h" +#include "COLLADASWVertices.h" #include "MEM_guardedalloc.h" extern "C" { -#include "DNA_scene_types.h" -#include "DNA_object_types.h" +#include "DNA_action_types.h" +#include "DNA_anim_types.h" +#include "DNA_armature_types.h" #include "DNA_collection_types.h" -#include "DNA_meshdata_types.h" -#include "DNA_mesh_types.h" +#include "DNA_curve_types.h" #include "DNA_image_types.h" #include "DNA_material_types.h" -#include "DNA_anim_types.h" -#include "DNA_action_types.h" -#include "DNA_curve_types.h" -#include "DNA_armature_types.h" +#include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "DNA_userdef_types.h" -#include "BLI_path_util.h" #include "BLI_fileops.h" -#include "BLI_math.h" -#include "BLI_string.h" #include "BLI_listbase.h" +#include "BLI_math.h" +#include "BLI_path_util.h" +#include "BLI_string.h" #include "BLI_utildefines.h" #include "BKE_action.h" // pose functions #include "BKE_animsys.h" +#include "BKE_appdir.h" #include "BKE_armature.h" #include "BKE_blender_version.h" #include "BKE_customdata.h" @@ -92,7 +93,6 @@ extern "C" { #include "BKE_material.h" #include "BKE_object.h" #include "BKE_scene.h" -#include "BKE_appdir.h" #include "ED_keyframing.h" #ifdef WITH_BUILDINFO @@ -104,9 +104,9 @@ extern char build_hash[]; #include "RNA_access.h" } +#include "DocumentExporter.h" #include "collada_internal.h" #include "collada_utils.h" -#include "DocumentExporter.h" extern bool bc_has_object_type(LinkNode *export_set, short obtype); @@ -114,9 +114,8 @@ extern bool bc_has_object_type(LinkNode *export_set, short obtype); #include "InstanceWriter.h" #include "TransformWriter.h" -#include "SceneExporter.h" -#include "ArmatureExporter.h" #include "AnimationExporter.h" +#include "ArmatureExporter.h" #include "CameraExporter.h" #include "ControllerExporter.h" #include "EffectExporter.h" @@ -124,6 +123,7 @@ extern bool bc_has_object_type(LinkNode *export_set, short obtype); #include "ImageExporter.h" #include "LightExporter.h" #include "MaterialExporter.h" +#include "SceneExporter.h" #include diff --git a/source/blender/io/collada/DocumentExporter.h b/source/blender/io/collada/DocumentExporter.h index 70722ae601e..f024befbd17 100644 --- a/source/blender/io/collada/DocumentExporter.h +++ b/source/blender/io/collada/DocumentExporter.h @@ -21,9 +21,9 @@ #ifndef __DOCUMENTEXPORTER_H__ #define __DOCUMENTEXPORTER_H__ +#include "BlenderContext.h" #include "collada.h" #include "collada_utils.h" -#include "BlenderContext.h" extern "C" { #include "DNA_customdata_types.h" diff --git a/source/blender/io/collada/DocumentImporter.cpp b/source/blender/io/collada/DocumentImporter.cpp index 9b66ff429e1..281786bb45f 100644 --- a/source/blender/io/collada/DocumentImporter.cpp +++ b/source/blender/io/collada/DocumentImporter.cpp @@ -22,35 +22,35 @@ * * name imported objects * * import object rotation as euler */ -#include -#include #include // sort() +#include +#include -#include "COLLADAFWRoot.h" -#include "COLLADAFWStableHeaders.h" +#include "COLLADAFWArrayPrimitiveType.h" +#include "COLLADAFWCamera.h" #include "COLLADAFWColorOrTexture.h" #include "COLLADAFWIndexList.h" +#include "COLLADAFWLibraryNodes.h" +#include "COLLADAFWLight.h" #include "COLLADAFWMeshPrimitiveWithFaceVertexCount.h" #include "COLLADAFWPolygons.h" +#include "COLLADAFWRoot.h" #include "COLLADAFWSampler.h" +#include "COLLADAFWStableHeaders.h" #include "COLLADAFWTypes.h" #include "COLLADAFWVisualScene.h" -#include "COLLADAFWArrayPrimitiveType.h" -#include "COLLADAFWLibraryNodes.h" -#include "COLLADAFWCamera.h" -#include "COLLADAFWLight.h" -#include "COLLADASaxFWLLoader.h" #include "COLLADASaxFWLIExtraDataCallbackHandler.h" +#include "COLLADASaxFWLLoader.h" #include "MEM_guardedalloc.h" extern "C" { +#include "BLI_fileops.h" #include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_string.h" #include "BLI_utildefines.h" -#include "BLI_fileops.h" #include "BKE_camera.h" #include "BKE_collection.h" @@ -58,8 +58,8 @@ extern "C" { #include "BKE_global.h" #include "BKE_image.h" #include "BKE_layer.h" -#include "BKE_light.h" #include "BKE_lib_id.h" +#include "BKE_light.h" #include "BKE_material.h" #include "BKE_scene.h" @@ -77,14 +77,14 @@ extern "C" { #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "ExtraHandler.h" -#include "ErrorHandler.h" #include "DocumentImporter.h" +#include "ErrorHandler.h" +#include "ExtraHandler.h" #include "TransformReader.h" +#include "Materials.h" #include "collada_internal.h" #include "collada_utils.h" -#include "Materials.h" /* * COLLADA Importer limitations: diff --git a/source/blender/io/collada/DocumentImporter.h b/source/blender/io/collada/DocumentImporter.h index e47c844f7c6..d9be4880b35 100644 --- a/source/blender/io/collada/DocumentImporter.h +++ b/source/blender/io/collada/DocumentImporter.h @@ -21,26 +21,26 @@ #ifndef __DOCUMENTIMPORTER_H__ #define __DOCUMENTIMPORTER_H__ -#include "COLLADAFWIWriter.h" -#include "COLLADAFWMaterial.h" -#include "COLLADAFWEffect.h" #include "COLLADAFWColor.h" +#include "COLLADAFWController.h" +#include "COLLADAFWEffect.h" +#include "COLLADAFWEffectCommon.h" +#include "COLLADAFWIWriter.h" #include "COLLADAFWImage.h" #include "COLLADAFWInstanceGeometry.h" -#include "COLLADAFWController.h" +#include "COLLADAFWMaterial.h" #include "COLLADAFWMorphController.h" #include "COLLADAFWSkinController.h" -#include "COLLADAFWEffectCommon.h" -#include "BKE_object.h" #include "BKE_constraint.h" +#include "BKE_object.h" -#include "TransformReader.h" #include "AnimationImporter.h" #include "ArmatureImporter.h" #include "ControllerExporter.h" -#include "MeshImporter.h" #include "ImportSettings.h" +#include "MeshImporter.h" +#include "TransformReader.h" struct bContext; diff --git a/source/blender/io/collada/EffectExporter.cpp b/source/blender/io/collada/EffectExporter.cpp index a1174fdff56..f21ea57c91c 100644 --- a/source/blender/io/collada/EffectExporter.cpp +++ b/source/blender/io/collada/EffectExporter.cpp @@ -21,11 +21,11 @@ #include #include -#include "COLLADASWEffectProfile.h" #include "COLLADAFWColorOrTexture.h" +#include "COLLADASWEffectProfile.h" -#include "EffectExporter.h" #include "DocumentExporter.h" +#include "EffectExporter.h" #include "MaterialExporter.h" #include "collada_internal.h" @@ -37,8 +37,8 @@ extern "C" { #include "BKE_collection.h" #include "BKE_customdata.h" -#include "BKE_mesh.h" #include "BKE_material.h" +#include "BKE_mesh.h" } static std::string getActiveUVLayerName(Object *ob) diff --git a/source/blender/io/collada/EffectExporter.h b/source/blender/io/collada/EffectExporter.h index 57df844233c..36d02bb1c8f 100644 --- a/source/blender/io/collada/EffectExporter.h +++ b/source/blender/io/collada/EffectExporter.h @@ -25,9 +25,9 @@ #include #include "COLLADASWColorOrTexture.h" -#include "COLLADASWStreamWriter.h" -#include "COLLADASWSampler.h" #include "COLLADASWLibraryEffects.h" +#include "COLLADASWSampler.h" +#include "COLLADASWStreamWriter.h" #include "DNA_image_types.h" #include "DNA_material_types.h" diff --git a/source/blender/io/collada/ErrorHandler.cpp b/source/blender/io/collada/ErrorHandler.cpp index 286bcbfb759..7467d519f28 100644 --- a/source/blender/io/collada/ErrorHandler.cpp +++ b/source/blender/io/collada/ErrorHandler.cpp @@ -21,8 +21,8 @@ #include #include "COLLADASaxFWLIError.h" -#include "COLLADASaxFWLSaxParserError.h" #include "COLLADASaxFWLSaxFWLError.h" +#include "COLLADASaxFWLSaxParserError.h" #include "GeneratedSaxParserParserError.h" diff --git a/source/blender/io/collada/ErrorHandler.h b/source/blender/io/collada/ErrorHandler.h index f040855244d..9789e93cee9 100644 --- a/source/blender/io/collada/ErrorHandler.h +++ b/source/blender/io/collada/ErrorHandler.h @@ -21,10 +21,10 @@ #ifndef __ERRORHANDLER_H__ #define __ERRORHANDLER_H__ -#include -#include -#include #include // sort() +#include +#include +#include #include "COLLADASaxFWLIErrorHandler.h" diff --git a/source/blender/io/collada/ExportSettings.h b/source/blender/io/collada/ExportSettings.h index 1e158418120..69e260a1e91 100644 --- a/source/blender/io/collada/ExportSettings.h +++ b/source/blender/io/collada/ExportSettings.h @@ -22,8 +22,8 @@ #define __EXPORTSETTINGS_H__ #ifdef __cplusplus -# include # include "BCMath.h" +# include extern "C" { #endif diff --git a/source/blender/io/collada/ExtraHandler.cpp b/source/blender/io/collada/ExtraHandler.cpp index 4875ee72b0f..acfa74f34af 100644 --- a/source/blender/io/collada/ExtraHandler.cpp +++ b/source/blender/io/collada/ExtraHandler.cpp @@ -18,8 +18,8 @@ * \ingroup collada */ -#include #include "BLI_string.h" +#include #include "ExtraHandler.h" diff --git a/source/blender/io/collada/ExtraHandler.h b/source/blender/io/collada/ExtraHandler.h index 021eb8e9663..04ac963b530 100644 --- a/source/blender/io/collada/ExtraHandler.h +++ b/source/blender/io/collada/ExtraHandler.h @@ -21,17 +21,17 @@ #ifndef __EXTRAHANDLER_H__ #define __EXTRAHANDLER_H__ -#include -#include -#include #include // sort() +#include +#include +#include -#include "COLLADASaxFWLIExtraDataCallbackHandler.h" -#include "COLLADASaxFWLFilePartLoader.h" #include "COLLADASWInstanceController.h" +#include "COLLADASaxFWLFilePartLoader.h" +#include "COLLADASaxFWLIExtraDataCallbackHandler.h" -#include "DocumentImporter.h" #include "AnimationImporter.h" +#include "DocumentImporter.h" /** \brief Handler class for \ data, through which different * profiles can be handled diff --git a/source/blender/io/collada/ExtraTags.cpp b/source/blender/io/collada/ExtraTags.cpp index 496ba3891f7..d8fbf96db51 100644 --- a/source/blender/io/collada/ExtraTags.cpp +++ b/source/blender/io/collada/ExtraTags.cpp @@ -18,9 +18,9 @@ * \ingroup collada */ +#include "BLI_string.h" #include #include -#include "BLI_string.h" #include diff --git a/source/blender/io/collada/ExtraTags.h b/source/blender/io/collada/ExtraTags.h index 9191182c757..c806b8fa904 100644 --- a/source/blender/io/collada/ExtraTags.h +++ b/source/blender/io/collada/ExtraTags.h @@ -21,8 +21,8 @@ #ifndef __EXTRATAGS_H__ #define __EXTRATAGS_H__ -#include #include +#include #include /** \brief Class for saving \ tags for a specific UniqueId. diff --git a/source/blender/io/collada/GeometryExporter.cpp b/source/blender/io/collada/GeometryExporter.cpp index 640bf3c0633..469d8601a8b 100644 --- a/source/blender/io/collada/GeometryExporter.cpp +++ b/source/blender/io/collada/GeometryExporter.cpp @@ -20,10 +20,10 @@ #include +#include "COLLADABUUtils.h" #include "COLLADASWPrimitves.h" #include "COLLADASWSource.h" #include "COLLADASWVertices.h" -#include "COLLADABUUtils.h" #include "GeometryExporter.h" diff --git a/source/blender/io/collada/GeometryExporter.h b/source/blender/io/collada/GeometryExporter.h index 8c7a38fc407..5090158177f 100644 --- a/source/blender/io/collada/GeometryExporter.h +++ b/source/blender/io/collada/GeometryExporter.h @@ -21,23 +21,23 @@ #ifndef __GEOMETRYEXPORTER_H__ #define __GEOMETRYEXPORTER_H__ +#include #include #include -#include -#include "COLLADASWStreamWriter.h" -#include "COLLADASWLibraryGeometries.h" #include "COLLADASWInputList.h" +#include "COLLADASWLibraryGeometries.h" +#include "COLLADASWStreamWriter.h" +#include "DNA_key_types.h" #include "DNA_mesh_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_key_types.h" +#include "BKE_key.h" +#include "BlenderContext.h" #include "ExportSettings.h" #include "collada_utils.h" -#include "BlenderContext.h" -#include "BKE_key.h" class Normal { public: diff --git a/source/blender/io/collada/ImageExporter.cpp b/source/blender/io/collada/ImageExporter.cpp index 6e31e17fb26..9d2b873f862 100644 --- a/source/blender/io/collada/ImageExporter.cpp +++ b/source/blender/io/collada/ImageExporter.cpp @@ -22,9 +22,9 @@ #include "COLLADASWImage.h" extern "C" { -#include "DNA_texture_types.h" #include "DNA_image_types.h" #include "DNA_meshdata_types.h" +#include "DNA_texture_types.h" #include "BKE_customdata.h" #include "BKE_global.h" diff --git a/source/blender/io/collada/ImageExporter.h b/source/blender/io/collada/ImageExporter.h index b72d2709382..20f9b95a512 100644 --- a/source/blender/io/collada/ImageExporter.h +++ b/source/blender/io/collada/ImageExporter.h @@ -21,14 +21,14 @@ #ifndef __IMAGEEXPORTER_H__ #define __IMAGEEXPORTER_H__ -#include #include +#include -#include "COLLADASWStreamWriter.h" #include "COLLADASWLibraryImages.h" +#include "COLLADASWStreamWriter.h" -#include "DNA_material_types.h" #include "DNA_image_types.h" +#include "DNA_material_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/io/collada/InstanceWriter.cpp b/source/blender/io/collada/InstanceWriter.cpp index c9390d23fe7..a0bea16adfb 100644 --- a/source/blender/io/collada/InstanceWriter.cpp +++ b/source/blender/io/collada/InstanceWriter.cpp @@ -18,8 +18,8 @@ * \ingroup collada */ -#include #include +#include #include "COLLADASWInstanceMaterial.h" diff --git a/source/blender/io/collada/LightExporter.h b/source/blender/io/collada/LightExporter.h index 045ccfe1ce8..a5c7f5c6dee 100644 --- a/source/blender/io/collada/LightExporter.h +++ b/source/blender/io/collada/LightExporter.h @@ -21,8 +21,8 @@ #ifndef __LIGHTEXPORTER_H__ #define __LIGHTEXPORTER_H__ -#include "COLLADASWStreamWriter.h" #include "COLLADASWLibraryLights.h" +#include "COLLADASWStreamWriter.h" #include "DNA_light_types.h" #include "DNA_object_types.h" diff --git a/source/blender/io/collada/MaterialExporter.h b/source/blender/io/collada/MaterialExporter.h index be0d939b68a..8b3d1130fe9 100644 --- a/source/blender/io/collada/MaterialExporter.h +++ b/source/blender/io/collada/MaterialExporter.h @@ -34,10 +34,10 @@ extern "C" { #include "DNA_scene_types.h" } -#include "GeometryExporter.h" -#include "collada_internal.h" #include "ExportSettings.h" +#include "GeometryExporter.h" #include "Materials.h" +#include "collada_internal.h" class MaterialsExporter : COLLADASW::LibraryMaterials { public: diff --git a/source/blender/io/collada/Materials.h b/source/blender/io/collada/Materials.h index 0a4f2ee61a5..86fc4c00073 100644 --- a/source/blender/io/collada/Materials.h +++ b/source/blender/io/collada/Materials.h @@ -28,8 +28,8 @@ extern "C" { #include "DNA_node_types.h" } -#include "collada_utils.h" #include "COLLADAFWEffectCommon.h" +#include "collada_utils.h" typedef std::map NodeMap; diff --git a/source/blender/io/collada/MeshImporter.cpp b/source/blender/io/collada/MeshImporter.cpp index bc6dd4202b1..6ac87d3d394 100644 --- a/source/blender/io/collada/MeshImporter.cpp +++ b/source/blender/io/collada/MeshImporter.cpp @@ -39,10 +39,10 @@ extern "C" { #include "BKE_mesh.h" #include "BKE_object.h" +#include "BLI_edgehash.h" #include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_string.h" -#include "BLI_edgehash.h" } #include "ArmatureImporter.h" diff --git a/source/blender/io/collada/MeshImporter.h b/source/blender/io/collada/MeshImporter.h index 9517587013d..5ad2fb17fce 100644 --- a/source/blender/io/collada/MeshImporter.h +++ b/source/blender/io/collada/MeshImporter.h @@ -25,12 +25,12 @@ #include #include "COLLADAFWIndexList.h" -#include "COLLADAFWPolygons.h" #include "COLLADAFWInstanceGeometry.h" #include "COLLADAFWMaterialBinding.h" #include "COLLADAFWMesh.h" #include "COLLADAFWMeshVertexData.h" #include "COLLADAFWNode.h" +#include "COLLADAFWPolygons.h" #include "COLLADAFWTextureCoordinateBinding.h" #include "COLLADAFWTypes.h" #include "COLLADAFWUniqueId.h" diff --git a/source/blender/io/collada/SceneExporter.cpp b/source/blender/io/collada/SceneExporter.cpp index 42901bd2a4a..2f70bc1c26b 100644 --- a/source/blender/io/collada/SceneExporter.cpp +++ b/source/blender/io/collada/SceneExporter.cpp @@ -19,16 +19,16 @@ */ extern "C" { -#include "BLI_utildefines.h" #include "BKE_collection.h" +#include "BKE_lib_id.h" #include "BKE_object.h" #include "BLI_listbase.h" -#include "BKE_lib_id.h" +#include "BLI_utildefines.h" } +#include "BCSampleData.h" #include "SceneExporter.h" #include "collada_utils.h" -#include "BCSampleData.h" void SceneExporter::exportScene() { diff --git a/source/blender/io/collada/SceneExporter.h b/source/blender/io/collada/SceneExporter.h index a61d045ad5d..382f716e5a3 100644 --- a/source/blender/io/collada/SceneExporter.h +++ b/source/blender/io/collada/SceneExporter.h @@ -21,65 +21,65 @@ #ifndef __SCENEEXPORTER_H__ #define __SCENEEXPORTER_H__ -#include -#include #include +#include +#include extern "C" { -#include "DNA_scene_types.h" -#include "DNA_object_types.h" +#include "DNA_action_types.h" +#include "DNA_anim_types.h" +#include "DNA_armature_types.h" #include "DNA_collection_types.h" -#include "DNA_meshdata_types.h" -#include "DNA_mesh_types.h" +#include "DNA_constraint_types.h" +#include "DNA_curve_types.h" #include "DNA_image_types.h" #include "DNA_material_types.h" -#include "DNA_texture_types.h" -#include "DNA_anim_types.h" -#include "DNA_action_types.h" -#include "DNA_curve_types.h" -#include "DNA_constraint_types.h" -#include "DNA_armature_types.h" +#include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" +#include "DNA_texture_types.h" #include "DNA_userdef_types.h" -#include "BKE_fcurve.h" #include "BKE_animsys.h" -#include "BLI_path_util.h" #include "BKE_constraint.h" +#include "BKE_fcurve.h" #include "BLI_fileops.h" +#include "BLI_path_util.h" #include "ED_keyframing.h" } #include "COLLADASWAsset.h" +#include "COLLADASWBaseInputElement.h" +#include "COLLADASWBindMaterial.h" +#include "COLLADASWColorOrTexture.h" +#include "COLLADASWConstants.h" +#include "COLLADASWEffectProfile.h" +#include "COLLADASWImage.h" +#include "COLLADASWInputList.h" +#include "COLLADASWInstanceCamera.h" +#include "COLLADASWInstanceController.h" +#include "COLLADASWInstanceGeometry.h" +#include "COLLADASWInstanceLight.h" +#include "COLLADASWInstanceNode.h" +#include "COLLADASWLibraryAnimations.h" +#include "COLLADASWLibraryControllers.h" +#include "COLLADASWLibraryEffects.h" +#include "COLLADASWLibraryImages.h" +#include "COLLADASWLibraryMaterials.h" #include "COLLADASWLibraryVisualScenes.h" #include "COLLADASWNode.h" -#include "COLLADASWSource.h" -#include "COLLADASWInstanceGeometry.h" -#include "COLLADASWInputList.h" -#include "COLLADASWPrimitves.h" -#include "COLLADASWVertices.h" -#include "COLLADASWLibraryAnimations.h" -#include "COLLADASWLibraryImages.h" -#include "COLLADASWLibraryEffects.h" -#include "COLLADASWImage.h" -#include "COLLADASWEffectProfile.h" -#include "COLLADASWColorOrTexture.h" -#include "COLLADASWParamTemplate.h" #include "COLLADASWParamBase.h" -#include "COLLADASWSurfaceInitOption.h" +#include "COLLADASWParamTemplate.h" +#include "COLLADASWPrimitves.h" #include "COLLADASWSampler.h" #include "COLLADASWScene.h" +#include "COLLADASWSource.h" +#include "COLLADASWSurfaceInitOption.h" #include "COLLADASWTechnique.h" #include "COLLADASWTexture.h" -#include "COLLADASWLibraryMaterials.h" -#include "COLLADASWBindMaterial.h" -#include "COLLADASWInstanceCamera.h" -#include "COLLADASWInstanceLight.h" -#include "COLLADASWConstants.h" -#include "COLLADASWLibraryControllers.h" -#include "COLLADASWInstanceController.h" -#include "COLLADASWInstanceNode.h" -#include "COLLADASWBaseInputElement.h" +#include "COLLADASWVertices.h" #include "ArmatureExporter.h" #include "ExportSettings.h" diff --git a/source/blender/io/collada/SkinInfo.cpp b/source/blender/io/collada/SkinInfo.cpp index d8804a1e831..317e0b37796 100644 --- a/source/blender/io/collada/SkinInfo.cpp +++ b/source/blender/io/collada/SkinInfo.cpp @@ -27,9 +27,9 @@ /* COLLADABU_ASSERT, may be able to remove later */ #include "COLLADABUPlatform.h" +#include "BLI_compiler_attrs.h" #include "BLI_listbase.h" #include "BLI_math.h" -#include "BLI_compiler_attrs.h" #include "DNA_armature_types.h" #include "DNA_modifier_types.h" diff --git a/source/blender/io/collada/SkinInfo.h b/source/blender/io/collada/SkinInfo.h index 255d6d9b1f3..e8b13f86e9c 100644 --- a/source/blender/io/collada/SkinInfo.h +++ b/source/blender/io/collada/SkinInfo.h @@ -24,14 +24,14 @@ #include #include -#include "COLLADAFWUniqueId.h" -#include "COLLADAFWTypes.h" #include "COLLADAFWNode.h" #include "COLLADAFWSkinController.h" #include "COLLADAFWSkinControllerData.h" +#include "COLLADAFWTypes.h" +#include "COLLADAFWUniqueId.h" -#include "DNA_object_types.h" #include "BKE_context.h" +#include "DNA_object_types.h" #include "TransformReader.h" #include "collada_internal.h" diff --git a/source/blender/io/collada/TransformReader.h b/source/blender/io/collada/TransformReader.h index 2cf3ee795ae..5a778e6aba5 100644 --- a/source/blender/io/collada/TransformReader.h +++ b/source/blender/io/collada/TransformReader.h @@ -21,17 +21,17 @@ #ifndef __TRANSFORMREADER_H__ #define __TRANSFORMREADER_H__ +#include "COLLADAFWMatrix.h" #include "COLLADAFWNode.h" -#include "COLLADAFWTransformation.h" -#include "COLLADAFWTranslate.h" #include "COLLADAFWRotate.h" #include "COLLADAFWScale.h" -#include "COLLADAFWMatrix.h" +#include "COLLADAFWTransformation.h" +#include "COLLADAFWTranslate.h" #include "COLLADAFWUniqueId.h" #include "Math/COLLADABUMathVector3.h" -#include "DNA_object_types.h" #include "BLI_math.h" +#include "DNA_object_types.h" #include "collada_internal.h" diff --git a/source/blender/io/collada/TransformWriter.h b/source/blender/io/collada/TransformWriter.h index d2e4b369cdc..3c71fc9d36e 100644 --- a/source/blender/io/collada/TransformWriter.h +++ b/source/blender/io/collada/TransformWriter.h @@ -25,9 +25,9 @@ #include "DNA_object_types.h" +#include "collada.h" #include "collada_internal.h" #include "collada_utils.h" -#include "collada.h" class TransformWriter { protected: diff --git a/source/blender/io/collada/collada.cpp b/source/blender/io/collada/collada.cpp index ea5600aa850..683e64b2647 100644 --- a/source/blender/io/collada/collada.cpp +++ b/source/blender/io/collada/collada.cpp @@ -28,8 +28,8 @@ #include "collada.h" extern "C" { -#include "BKE_scene.h" #include "BKE_context.h" +#include "BKE_scene.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/io/collada/collada.h b/source/blender/io/collada/collada.h index 72753e170a3..deadbcffcaf 100644 --- a/source/blender/io/collada/collada.h +++ b/source/blender/io/collada/collada.h @@ -23,8 +23,8 @@ #include -#include "ImportSettings.h" #include "ExportSettings.h" +#include "ImportSettings.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/io/collada/collada_internal.h b/source/blender/io/collada/collada_internal.h index 297ea9c0bbb..d9fe0ba0b58 100644 --- a/source/blender/io/collada/collada_internal.h +++ b/source/blender/io/collada/collada_internal.h @@ -21,19 +21,19 @@ #ifndef __COLLADA_INTERNAL_H__ #define __COLLADA_INTERNAL_H__ +#include #include #include -#include #include "COLLADAFWFileInfo.h" #include "Math/COLLADABUMathMatrix4.h" +#include "BLI_linklist.h" +#include "BLI_math.h" #include "DNA_armature_types.h" #include "DNA_material_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_math.h" -#include "BLI_linklist.h" class UnitConverter { private: diff --git a/source/blender/io/collada/collada_utils.cpp b/source/blender/io/collada/collada_utils.cpp index 26b392af0a1..1df82ed3038 100644 --- a/source/blender/io/collada/collada_utils.cpp +++ b/source/blender/io/collada/collada_utils.cpp @@ -31,39 +31,38 @@ #include "MEM_guardedalloc.h" extern "C" { -#include "DNA_modifier_types.h" +#include "DNA_armature_types.h" +#include "DNA_constraint_types.h" #include "DNA_customdata_types.h" #include "DNA_key_types.h" -#include "DNA_object_types.h" -#include "DNA_constraint_types.h" #include "DNA_mesh_types.h" +#include "DNA_modifier_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_armature_types.h" -#include "BLI_math.h" #include "BLI_linklist.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BKE_action.h" +#include "BKE_constraint.h" #include "BKE_context.h" #include "BKE_customdata.h" -#include "BKE_constraint.h" -#include "BKE_key.h" -#include "BKE_material.h" -#include "BKE_node.h" -#include "BKE_object.h" #include "BKE_global.h" +#include "BKE_key.h" #include "BKE_layer.h" #include "BKE_lib_id.h" +#include "BKE_material.h" #include "BKE_mesh.h" #include "BKE_mesh_runtime.h" +#include "BKE_node.h" #include "BKE_object.h" #include "BKE_scene.h" #include "ED_armature.h" -#include "ED_screen.h" #include "ED_node.h" #include "ED_object.h" +#include "ED_screen.h" #include "WM_api.h" /* XXX hrm, see if we can do without this */ #include "WM_types.h" @@ -78,9 +77,9 @@ extern "C" { #endif } -#include "collada_utils.h" -#include "ExportSettings.h" #include "BlenderContext.h" +#include "ExportSettings.h" +#include "collada_utils.h" float bc_get_float_value(const COLLADAFW::FloatOrDoubleArray &array, unsigned int index) { diff --git a/source/blender/io/collada/collada_utils.h b/source/blender/io/collada/collada_utils.h index 5c5e1415422..54ba8073679 100644 --- a/source/blender/io/collada/collada_utils.h +++ b/source/blender/io/collada/collada_utils.h @@ -21,51 +21,51 @@ #ifndef __COLLADA_UTILS_H__ #define __COLLADA_UTILS_H__ -#include "COLLADAFWMeshPrimitive.h" -#include "COLLADAFWGeometry.h" +#include "COLLADAFWColorOrTexture.h" #include "COLLADAFWFloatOrDoubleArray.h" +#include "COLLADAFWGeometry.h" +#include "COLLADAFWMeshPrimitive.h" #include "COLLADAFWTypes.h" #include "COLLADASWEffectProfile.h" -#include "COLLADAFWColorOrTexture.h" -#include +#include #include #include -#include +#include extern "C" { -#include "DNA_object_types.h" #include "DNA_anim_types.h" -#include "DNA_constraint_types.h" -#include "DNA_mesh_types.h" -#include "DNA_light_types.h" #include "DNA_camera_types.h" +#include "DNA_constraint_types.h" +#include "DNA_light_types.h" +#include "DNA_mesh_types.h" +#include "DNA_object_types.h" #include "DNA_customdata_types.h" -#include "DNA_texture_types.h" #include "DNA_scene_types.h" +#include "DNA_texture_types.h" #include "RNA_access.h" #include "BLI_linklist.h" -#include "BLI_utildefines.h" #include "BLI_string.h" +#include "BLI_utildefines.h" -#include "BKE_main.h" #include "BKE_context.h" +#include "BKE_idprop.h" +#include "BKE_main.h" +#include "BKE_node.h" #include "BKE_object.h" #include "BKE_scene.h" -#include "BKE_idprop.h" -#include "BKE_node.h" } #include "DEG_depsgraph_query.h" -#include "ImportSettings.h" -#include "ExportSettings.h" -#include "collada_internal.h" #include "BCSampleData.h" #include "BlenderContext.h" +#include "ExportSettings.h" +#include "ImportSettings.h" +#include "collada_internal.h" constexpr int LIMITTED_PRECISION = 6; diff --git a/source/blender/io/usd/intern/abstract_hierarchy_iterator.h b/source/blender/io/usd/intern/abstract_hierarchy_iterator.h index 64c831877ab..f7ba1a76bac 100644 --- a/source/blender/io/usd/intern/abstract_hierarchy_iterator.h +++ b/source/blender/io/usd/intern/abstract_hierarchy_iterator.h @@ -37,8 +37,8 @@ #define __ABSTRACT_HIERARCHY_ITERATOR_H__ #include -#include #include +#include struct Base; struct Depsgraph; diff --git a/source/blender/io/usd/intern/usd_hierarchy_iterator.h b/source/blender/io/usd/intern/usd_hierarchy_iterator.h index 90c82c6e551..a608012a390 100644 --- a/source/blender/io/usd/intern/usd_hierarchy_iterator.h +++ b/source/blender/io/usd/intern/usd_hierarchy_iterator.h @@ -20,8 +20,8 @@ #define __USD_HIERARCHY_ITERATOR_H__ #include "abstract_hierarchy_iterator.h" -#include "usd_exporter_context.h" #include "usd.h" +#include "usd_exporter_context.h" #include diff --git a/source/blender/io/usd/intern/usd_writer_abstract.h b/source/blender/io/usd/intern/usd_writer_abstract.h index ad8049f499c..9c8422b52f1 100644 --- a/source/blender/io/usd/intern/usd_writer_abstract.h +++ b/source/blender/io/usd/intern/usd_writer_abstract.h @@ -19,8 +19,8 @@ #ifndef __USD_WRITER_ABSTRACT_H__ #define __USD_WRITER_ABSTRACT_H__ -#include "usd_exporter_context.h" #include "abstract_hierarchy_iterator.h" +#include "usd_exporter_context.h" #include #include diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index be9097cf5bd..40c25d39cad 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -32,11 +32,11 @@ extern "C" { #endif -#include "DNA_listBase.h" #include "DNA_ID.h" -#include "DNA_view2d_types.h" -#include "DNA_vec_types.h" +#include "DNA_listBase.h" #include "DNA_userdef_types.h" /* ThemeWireColor */ +#include "DNA_vec_types.h" +#include "DNA_view2d_types.h" struct Collection; struct GHash; diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h index 7cf49053918..fbffa039ee9 100644 --- a/source/blender/makesdna/DNA_anim_types.h +++ b/source/blender/makesdna/DNA_anim_types.h @@ -29,9 +29,9 @@ extern "C" { #endif #include "DNA_ID.h" -#include "DNA_listBase.h" #include "DNA_action_types.h" #include "DNA_curve_types.h" +#include "DNA_listBase.h" /* ************************************************ */ /* F-Curve DataTypes */ diff --git a/source/blender/makesdna/DNA_armature_types.h b/source/blender/makesdna/DNA_armature_types.h index 7192b1295aa..b29816c735b 100644 --- a/source/blender/makesdna/DNA_armature_types.h +++ b/source/blender/makesdna/DNA_armature_types.h @@ -24,9 +24,9 @@ #ifndef __DNA_ARMATURE_TYPES_H__ #define __DNA_ARMATURE_TYPES_H__ +#include "DNA_ID.h" #include "DNA_defs.h" #include "DNA_listBase.h" -#include "DNA_ID.h" struct AnimData; diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h index 2168a63940f..1fad828e887 100644 --- a/source/blender/makesdna/DNA_brush_types.h +++ b/source/blender/makesdna/DNA_brush_types.h @@ -25,8 +25,8 @@ #define __DNA_BRUSH_TYPES_H__ #include "DNA_ID.h" -#include "DNA_texture_types.h" /* for MTex */ #include "DNA_curve_types.h" +#include "DNA_texture_types.h" /* for MTex */ //#ifndef MAX_MTEX // XXX Not used? //#define MAX_MTEX 18 diff --git a/source/blender/makesdna/DNA_camera_types.h b/source/blender/makesdna/DNA_camera_types.h index 7c7d4bc182e..b12d25d74e0 100644 --- a/source/blender/makesdna/DNA_camera_types.h +++ b/source/blender/makesdna/DNA_camera_types.h @@ -24,11 +24,11 @@ #ifndef __DNA_CAMERA_TYPES_H__ #define __DNA_CAMERA_TYPES_H__ +#include "DNA_ID.h" #include "DNA_defs.h" #include "DNA_gpu_types.h" -#include "DNA_movieclip_types.h" #include "DNA_image_types.h" -#include "DNA_ID.h" +#include "DNA_movieclip_types.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/makesdna/DNA_collection_types.h b/source/blender/makesdna/DNA_collection_types.h index 6d48c029437..13eb8a762d9 100644 --- a/source/blender/makesdna/DNA_collection_types.h +++ b/source/blender/makesdna/DNA_collection_types.h @@ -26,9 +26,9 @@ #ifndef __DNA_COLLECTION_TYPES_H__ #define __DNA_COLLECTION_TYPES_H__ +#include "DNA_ID.h" #include "DNA_defs.h" #include "DNA_listBase.h" -#include "DNA_ID.h" struct Collection; struct Object; diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h index 18a4a134b71..9efd2116601 100644 --- a/source/blender/makesdna/DNA_constraint_types.h +++ b/source/blender/makesdna/DNA_constraint_types.h @@ -25,8 +25,8 @@ #ifndef __DNA_CONSTRAINT_TYPES_H__ #define __DNA_CONSTRAINT_TYPES_H__ -#include "DNA_defs.h" #include "DNA_ID.h" +#include "DNA_defs.h" #include "DNA_listBase.h" struct Action; diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h index a8d10471bb8..6a081a7f5a7 100644 --- a/source/blender/makesdna/DNA_curve_types.h +++ b/source/blender/makesdna/DNA_curve_types.h @@ -24,10 +24,10 @@ #ifndef __DNA_CURVE_TYPES_H__ #define __DNA_CURVE_TYPES_H__ +#include "DNA_ID.h" #include "DNA_defs.h" #include "DNA_listBase.h" #include "DNA_vec_types.h" -#include "DNA_ID.h" #define MAXTEXTBOX 256 /* used in readfile.c and editfont.c */ diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h index 909d65fb5ed..a90935bfe62 100644 --- a/source/blender/makesdna/DNA_gpencil_types.h +++ b/source/blender/makesdna/DNA_gpencil_types.h @@ -24,9 +24,9 @@ #ifndef __DNA_GPENCIL_TYPES_H__ #define __DNA_GPENCIL_TYPES_H__ -#include "DNA_listBase.h" #include "DNA_ID.h" #include "DNA_brush_types.h" +#include "DNA_listBase.h" struct AnimData; struct MDeformVert; diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h index d443d7806ad..11a6a937e92 100644 --- a/source/blender/makesdna/DNA_image_types.h +++ b/source/blender/makesdna/DNA_image_types.h @@ -24,9 +24,9 @@ #ifndef __DNA_IMAGE_TYPES_H__ #define __DNA_IMAGE_TYPES_H__ -#include "DNA_defs.h" #include "DNA_ID.h" #include "DNA_color_types.h" /* for color management */ +#include "DNA_defs.h" struct GPUTexture; struct MovieCache; diff --git a/source/blender/makesdna/DNA_ipo_types.h b/source/blender/makesdna/DNA_ipo_types.h index 1561b44358b..0f1028f5770 100644 --- a/source/blender/makesdna/DNA_ipo_types.h +++ b/source/blender/makesdna/DNA_ipo_types.h @@ -29,8 +29,8 @@ #ifndef __DNA_IPO_TYPES_H__ #define __DNA_IPO_TYPES_H__ -#include "DNA_listBase.h" #include "DNA_curve_types.h" +#include "DNA_listBase.h" #include "DNA_vec_types.h" #include "DNA_ID.h" diff --git a/source/blender/makesdna/DNA_key_types.h b/source/blender/makesdna/DNA_key_types.h index b57f88f39af..3685290e571 100644 --- a/source/blender/makesdna/DNA_key_types.h +++ b/source/blender/makesdna/DNA_key_types.h @@ -27,9 +27,9 @@ * aren't intended to be shared between multiple data blocks as with other ID types. */ +#include "DNA_ID.h" #include "DNA_defs.h" #include "DNA_listBase.h" -#include "DNA_ID.h" struct AnimData; struct Ipo; diff --git a/source/blender/makesdna/DNA_lattice_types.h b/source/blender/makesdna/DNA_lattice_types.h index f67553c34de..336726fb28d 100644 --- a/source/blender/makesdna/DNA_lattice_types.h +++ b/source/blender/makesdna/DNA_lattice_types.h @@ -24,8 +24,8 @@ #ifndef __DNA_LATTICE_TYPES_H__ #define __DNA_LATTICE_TYPES_H__ -#include "DNA_defs.h" #include "DNA_ID.h" +#include "DNA_defs.h" struct AnimData; struct BPoint; diff --git a/source/blender/makesdna/DNA_light_types.h b/source/blender/makesdna/DNA_light_types.h index ec83d53da5e..7a7b5d923e3 100644 --- a/source/blender/makesdna/DNA_light_types.h +++ b/source/blender/makesdna/DNA_light_types.h @@ -24,8 +24,8 @@ #ifndef __DNA_LIGHT_TYPES_H__ #define __DNA_LIGHT_TYPES_H__ -#include "DNA_defs.h" #include "DNA_ID.h" +#include "DNA_defs.h" #ifndef MAX_MTEX # define MAX_MTEX 18 diff --git a/source/blender/makesdna/DNA_lightprobe_types.h b/source/blender/makesdna/DNA_lightprobe_types.h index d9cc549229d..66d6e3f4868 100644 --- a/source/blender/makesdna/DNA_lightprobe_types.h +++ b/source/blender/makesdna/DNA_lightprobe_types.h @@ -21,9 +21,9 @@ #ifndef __DNA_LIGHTPROBE_TYPES_H__ #define __DNA_LIGHTPROBE_TYPES_H__ +#include "DNA_ID.h" #include "DNA_defs.h" #include "DNA_listBase.h" -#include "DNA_ID.h" #include "BLI_assert.h" diff --git a/source/blender/makesdna/DNA_linestyle_types.h b/source/blender/makesdna/DNA_linestyle_types.h index 48850805724..eca5ab5e8ec 100644 --- a/source/blender/makesdna/DNA_linestyle_types.h +++ b/source/blender/makesdna/DNA_linestyle_types.h @@ -24,8 +24,8 @@ * \ingroup DNA */ -#include "DNA_listBase.h" #include "DNA_ID.h" +#include "DNA_listBase.h" #ifndef MAX_MTEX # define MAX_MTEX 18 diff --git a/source/blender/makesdna/DNA_mask_types.h b/source/blender/makesdna/DNA_mask_types.h index bed7f0a150d..9617b3fdf27 100644 --- a/source/blender/makesdna/DNA_mask_types.h +++ b/source/blender/makesdna/DNA_mask_types.h @@ -27,10 +27,10 @@ #ifndef __DNA_MASK_TYPES_H__ #define __DNA_MASK_TYPES_H__ -#include "DNA_defs.h" #include "DNA_ID.h" -#include "DNA_listBase.h" #include "DNA_curve_types.h" +#include "DNA_defs.h" +#include "DNA_listBase.h" typedef struct Mask { ID id; diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index 0db7feffa99..f2e65ff9251 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -24,8 +24,8 @@ #ifndef __DNA_MATERIAL_TYPES_H__ #define __DNA_MATERIAL_TYPES_H__ -#include "DNA_defs.h" #include "DNA_ID.h" +#include "DNA_defs.h" #include "DNA_listBase.h" #ifndef MAX_MTEX diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index c65de9337fa..3c05755159d 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -24,9 +24,9 @@ #ifndef __DNA_MESH_TYPES_H__ #define __DNA_MESH_TYPES_H__ -#include "DNA_defs.h" #include "DNA_ID.h" #include "DNA_customdata_types.h" +#include "DNA_defs.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/makesdna/DNA_meta_types.h b/source/blender/makesdna/DNA_meta_types.h index 8b218dd7ce6..df4558dac77 100644 --- a/source/blender/makesdna/DNA_meta_types.h +++ b/source/blender/makesdna/DNA_meta_types.h @@ -24,9 +24,9 @@ #ifndef __DNA_META_TYPES_H__ #define __DNA_META_TYPES_H__ +#include "DNA_ID.h" #include "DNA_defs.h" #include "DNA_listBase.h" -#include "DNA_ID.h" struct AnimData; struct BoundBox; diff --git a/source/blender/makesdna/DNA_movieclip_types.h b/source/blender/makesdna/DNA_movieclip_types.h index 92fa9973759..557e069a4a6 100644 --- a/source/blender/makesdna/DNA_movieclip_types.h +++ b/source/blender/makesdna/DNA_movieclip_types.h @@ -29,8 +29,8 @@ extern "C" { #endif #include "DNA_ID.h" -#include "DNA_tracking_types.h" #include "DNA_color_types.h" /* for color management */ +#include "DNA_tracking_types.h" struct AnimData; struct ImBuf; diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index 50c0586ff37..8029e8ebc13 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -25,10 +25,10 @@ #define __DNA_NODE_TYPES_H__ #include "DNA_ID.h" -#include "DNA_vec_types.h" #include "DNA_listBase.h" -#include "DNA_texture_types.h" #include "DNA_scene_types.h" +#include "DNA_texture_types.h" +#include "DNA_vec_types.h" struct AnimData; struct ID; diff --git a/source/blender/makesdna/DNA_object_force_types.h b/source/blender/makesdna/DNA_object_force_types.h index 8afb74e0786..88c712b5b28 100644 --- a/source/blender/makesdna/DNA_object_force_types.h +++ b/source/blender/makesdna/DNA_object_force_types.h @@ -28,8 +28,8 @@ extern "C" { #endif -#include "DNA_listBase.h" #include "DNA_defs.h" +#include "DNA_listBase.h" /* pd->forcefield: Effector Fields types */ typedef enum ePFieldType { diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 645611144e9..1a76d32dc2c 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -27,11 +27,11 @@ #include "DNA_object_enums.h" -#include "DNA_defs.h" -#include "DNA_customdata_types.h" -#include "DNA_listBase.h" #include "DNA_ID.h" #include "DNA_action_types.h" /* bAnimVizSettings */ +#include "DNA_customdata_types.h" +#include "DNA_defs.h" +#include "DNA_listBase.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h index 89c90a1d7f9..5bd11ab85a5 100644 --- a/source/blender/makesdna/DNA_particle_types.h +++ b/source/blender/makesdna/DNA_particle_types.h @@ -24,9 +24,9 @@ #ifndef __DNA_PARTICLE_TYPES_H__ #define __DNA_PARTICLE_TYPES_H__ -#include "DNA_defs.h" #include "DNA_ID.h" #include "DNA_boid_types.h" +#include "DNA_defs.h" struct AnimData; diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 236f9fa4eb2..c1a6265b53b 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -33,17 +33,17 @@ extern "C" { #endif +#include "DNA_ID.h" +#include "DNA_collection_types.h" #include "DNA_color_types.h" /* color management */ #include "DNA_curveprofile_types.h" #include "DNA_customdata_types.h" /* Scene's runtime cddata masks. */ -#include "DNA_vec_types.h" -#include "DNA_listBase.h" -#include "DNA_ID.h" #include "DNA_freestyle_types.h" -#include "DNA_collection_types.h" #include "DNA_layer_types.h" +#include "DNA_listBase.h" #include "DNA_material_types.h" #include "DNA_userdef_types.h" +#include "DNA_vec_types.h" #include "DNA_view3d_types.h" struct AnimData; diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h index 189f5542ea0..9a59b69604d 100644 --- a/source/blender/makesdna/DNA_screen_types.h +++ b/source/blender/makesdna/DNA_screen_types.h @@ -26,8 +26,8 @@ #include "DNA_defs.h" #include "DNA_listBase.h" -#include "DNA_view2d_types.h" #include "DNA_vec_types.h" +#include "DNA_view2d_types.h" #include "DNA_ID.h" diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index c275c8187e4..17b3528aadf 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -31,8 +31,8 @@ #ifndef __DNA_SEQUENCE_TYPES_H__ #define __DNA_SEQUENCE_TYPES_H__ -#include "DNA_defs.h" #include "DNA_color_types.h" +#include "DNA_defs.h" #include "DNA_listBase.h" #include "DNA_vec_types.h" #include "DNA_vfont_types.h" diff --git a/source/blender/makesdna/DNA_sound_types.h b/source/blender/makesdna/DNA_sound_types.h index e2f7bab8102..73f0e20efcb 100644 --- a/source/blender/makesdna/DNA_sound_types.h +++ b/source/blender/makesdna/DNA_sound_types.h @@ -23,8 +23,8 @@ #ifndef __DNA_SOUND_TYPES_H__ #define __DNA_SOUND_TYPES_H__ -#include "DNA_defs.h" #include "DNA_ID.h" +#include "DNA_defs.h" /* stupid... could easily be solved */ #include "DNA_view2d_types.h" diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index f12ed0553ce..9d05e244c9d 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -25,15 +25,15 @@ #ifndef __DNA_SPACE_TYPES_H__ #define __DNA_SPACE_TYPES_H__ -#include "DNA_defs.h" -#include "DNA_listBase.h" #include "DNA_color_types.h" /* for Histogram */ -#include "DNA_vec_types.h" -#include "DNA_outliner_types.h" /* for TreeStoreElem */ -#include "DNA_image_types.h" /* ImageUser */ +#include "DNA_defs.h" +#include "DNA_image_types.h" /* ImageUser */ +#include "DNA_listBase.h" #include "DNA_movieclip_types.h" /* MovieClipUser */ -#include "DNA_sequence_types.h" /* SequencerScopes */ #include "DNA_node_types.h" /* for bNodeInstanceKey */ +#include "DNA_outliner_types.h" /* for TreeStoreElem */ +#include "DNA_sequence_types.h" /* SequencerScopes */ +#include "DNA_vec_types.h" /* Hum ... Not really nice... but needed for spacebuts. */ #include "DNA_view2d_types.h" diff --git a/source/blender/makesdna/DNA_text_types.h b/source/blender/makesdna/DNA_text_types.h index 8303f2322b6..dbd5def74d4 100644 --- a/source/blender/makesdna/DNA_text_types.h +++ b/source/blender/makesdna/DNA_text_types.h @@ -26,8 +26,8 @@ #ifndef __DNA_TEXT_TYPES_H__ #define __DNA_TEXT_TYPES_H__ -#include "DNA_listBase.h" #include "DNA_ID.h" +#include "DNA_listBase.h" typedef struct TextLine { struct TextLine *next, *prev; diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h index 3d3d215b973..907fe29263f 100644 --- a/source/blender/makesdna/DNA_texture_types.h +++ b/source/blender/makesdna/DNA_texture_types.h @@ -24,8 +24,8 @@ #ifndef __DNA_TEXTURE_TYPES_H__ #define __DNA_TEXTURE_TYPES_H__ -#include "DNA_defs.h" #include "DNA_ID.h" +#include "DNA_defs.h" #include "DNA_image_types.h" /* ImageUser */ #ifdef __cplusplus diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index 3dc29d40bc1..3e348f7f502 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -34,10 +34,10 @@ struct bGPdata; struct wmTimer; #include "DNA_defs.h" -#include "DNA_listBase.h" #include "DNA_image_types.h" -#include "DNA_object_types.h" +#include "DNA_listBase.h" #include "DNA_movieclip_types.h" +#include "DNA_object_types.h" #include "DNA_view3d_enums.h" typedef struct RegionView3D { diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h index 321e3925155..e1e8d808c60 100644 --- a/source/blender/makesdna/DNA_windowmanager_types.h +++ b/source/blender/makesdna/DNA_windowmanager_types.h @@ -26,8 +26,8 @@ #include "DNA_listBase.h" #include "DNA_screen_types.h" -#include "DNA_vec_types.h" #include "DNA_userdef_types.h" +#include "DNA_vec_types.h" #include "DNA_xr_types.h" #include "DNA_ID.h" diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h index 8d9fd9f1af4..f9198194a89 100644 --- a/source/blender/makesdna/DNA_world_types.h +++ b/source/blender/makesdna/DNA_world_types.h @@ -24,8 +24,8 @@ #ifndef __DNA_WORLD_TYPES_H__ #define __DNA_WORLD_TYPES_H__ -#include "DNA_defs.h" #include "DNA_ID.h" +#include "DNA_defs.h" struct AnimData; struct Ipo; diff --git a/source/blender/makesdna/intern/dna_defaults.c b/source/blender/makesdna/intern/dna_defaults.c index a8be435b902..dadd2fd9d7d 100644 --- a/source/blender/makesdna/intern/dna_defaults.c +++ b/source/blender/makesdna/intern/dna_defaults.c @@ -40,17 +40,17 @@ * \note Struct members only define their members (pointers are left as NULL set). */ +#include #include #include #include -#include #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_endian_switch.h" -#include "BLI_memarena.h" #include "BLI_math.h" +#include "BLI_memarena.h" +#include "BLI_utildefines.h" #include "DNA_defaults.h" @@ -58,8 +58,8 @@ #include "DNA_cachefile_types.h" #include "DNA_camera_types.h" #include "DNA_curve_types.h" -#include "DNA_image_types.h" #include "DNA_hair_types.h" +#include "DNA_image_types.h" #include "DNA_key_types.h" #include "DNA_lattice_types.h" #include "DNA_light_types.h" @@ -81,8 +81,8 @@ #include "DNA_cachefile_defaults.h" #include "DNA_camera_defaults.h" #include "DNA_curve_defaults.h" -#include "DNA_image_defaults.h" #include "DNA_hair_defaults.h" +#include "DNA_image_defaults.h" #include "DNA_lattice_defaults.h" #include "DNA_light_defaults.h" #include "DNA_lightprobe_defaults.h" diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c index 6b3095c7925..c3cc3256125 100644 --- a/source/blender/makesdna/intern/dna_genfile.c +++ b/source/blender/makesdna/intern/dna_genfile.c @@ -27,17 +27,17 @@ * SDNA and the SDNA of the current (running) version of Blender. */ +#include #include #include #include -#include #include "MEM_guardedalloc.h" // for MEM_freeN MEM_mallocN MEM_callocN -#include "BLI_utildefines.h" #include "BLI_endian_switch.h" #include "BLI_memarena.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BLI_ghash.h" diff --git a/source/blender/makesdna/intern/dna_utils.c b/source/blender/makesdna/intern/dna_utils.c index c402b36812b..6708365a4c8 100644 --- a/source/blender/makesdna/intern/dna_utils.c +++ b/source/blender/makesdna/intern/dna_utils.c @@ -26,10 +26,10 @@ #include "MEM_guardedalloc.h" -#include "BLI_sys_types.h" -#include "BLI_utildefines.h" #include "BLI_assert.h" #include "BLI_ghash.h" +#include "BLI_sys_types.h" +#include "BLI_utildefines.h" #include "BLI_memarena.h" diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index 3d82df79e4c..39b26fef176 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -43,18 +43,18 @@ #define DNA_DEPRECATED_ALLOW -#include -#include -#include #include +#include +#include +#include #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_alloca.h" #include "BLI_ghash.h" #include "BLI_memarena.h" #include "BLI_sys_types.h" /* for intptr_t support */ +#include "BLI_utildefines.h" #include "dna_utils.h" @@ -1536,76 +1536,76 @@ int main(int argc, char **argv) # pragma GCC poison long #endif -#include "DNA_listBase.h" -#include "DNA_vec_types.h" #include "DNA_ID.h" +#include "DNA_action_types.h" +#include "DNA_anim_types.h" +#include "DNA_armature_types.h" +#include "DNA_boid_types.h" +#include "DNA_brush_types.h" +#include "DNA_cachefile_types.h" +#include "DNA_camera_types.h" +#include "DNA_cloth_types.h" +#include "DNA_collection_types.h" +#include "DNA_color_types.h" +#include "DNA_constraint_types.h" +#include "DNA_curve_types.h" +#include "DNA_curveprofile_types.h" +#include "DNA_customdata_types.h" +#include "DNA_dynamicpaint_types.h" +#include "DNA_effect_types.h" +#include "DNA_fileglobal_types.h" +#include "DNA_fluid_types.h" +#include "DNA_freestyle_types.h" +#include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_hair_types.h" +#include "DNA_image_types.h" #include "DNA_ipo_types.h" #include "DNA_key_types.h" -#include "DNA_text_types.h" -#include "DNA_packedFile_types.h" -#include "DNA_camera_types.h" -#include "DNA_image_types.h" -#include "DNA_texture_types.h" +#include "DNA_lattice_types.h" +#include "DNA_layer_types.h" #include "DNA_light_types.h" +#include "DNA_lightprobe_types.h" +#include "DNA_linestyle_types.h" +#include "DNA_listBase.h" +#include "DNA_mask_types.h" #include "DNA_material_types.h" -#include "DNA_vfont_types.h" -#include "DNA_meta_types.h" -#include "DNA_curve_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "DNA_meta_types.h" #include "DNA_modifier_types.h" -#include "DNA_lattice_types.h" -#include "DNA_object_types.h" -#include "DNA_object_force_types.h" -#include "DNA_object_fluidsim_types.h" -#include "DNA_world_types.h" -#include "DNA_scene_types.h" -#include "DNA_view3d_types.h" -#include "DNA_view2d_types.h" -#include "DNA_space_types.h" -#include "DNA_userdef_types.h" -#include "DNA_screen_types.h" -#include "DNA_sdna_types.h" -#include "DNA_fileglobal_types.h" -#include "DNA_sequence_types.h" -#include "DNA_effect_types.h" -#include "DNA_outliner_types.h" -#include "DNA_sound_types.h" -#include "DNA_collection_types.h" -#include "DNA_armature_types.h" -#include "DNA_action_types.h" -#include "DNA_constraint_types.h" +#include "DNA_movieclip_types.h" #include "DNA_nla_types.h" #include "DNA_node_types.h" -#include "DNA_color_types.h" -#include "DNA_brush_types.h" -#include "DNA_customdata_types.h" +#include "DNA_object_fluidsim_types.h" +#include "DNA_object_force_types.h" +#include "DNA_object_types.h" +#include "DNA_outliner_types.h" +#include "DNA_packedFile_types.h" #include "DNA_particle_types.h" -#include "DNA_cloth_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_gpencil_modifier_types.h" -#include "DNA_shader_fx_types.h" -#include "DNA_windowmanager_types.h" -#include "DNA_anim_types.h" -#include "DNA_boid_types.h" -#include "DNA_fluid_types.h" -#include "DNA_speaker_types.h" -#include "DNA_movieclip_types.h" -#include "DNA_tracking_types.h" -#include "DNA_dynamicpaint_types.h" -#include "DNA_mask_types.h" -#include "DNA_rigidbody_types.h" -#include "DNA_freestyle_types.h" -#include "DNA_linestyle_types.h" -#include "DNA_cachefile_types.h" -#include "DNA_layer_types.h" -#include "DNA_workspace_types.h" -#include "DNA_lightprobe_types.h" -#include "DNA_curveprofile_types.h" -#include "DNA_xr_types.h" -#include "DNA_hair_types.h" #include "DNA_pointcloud_types.h" +#include "DNA_rigidbody_types.h" +#include "DNA_scene_types.h" +#include "DNA_screen_types.h" +#include "DNA_sdna_types.h" +#include "DNA_sequence_types.h" +#include "DNA_shader_fx_types.h" +#include "DNA_sound_types.h" +#include "DNA_space_types.h" +#include "DNA_speaker_types.h" +#include "DNA_text_types.h" +#include "DNA_texture_types.h" +#include "DNA_tracking_types.h" +#include "DNA_userdef_types.h" +#include "DNA_vec_types.h" +#include "DNA_vfont_types.h" +#include "DNA_view2d_types.h" +#include "DNA_view3d_types.h" #include "DNA_volume_types.h" +#include "DNA_windowmanager_types.h" +#include "DNA_workspace_types.h" +#include "DNA_world_types.h" +#include "DNA_xr_types.h" /* end of list */ diff --git a/source/blender/makesrna/RNA_define.h b/source/blender/makesrna/RNA_define.h index d2cc9fb95f1..558e490a16e 100644 --- a/source/blender/makesrna/RNA_define.h +++ b/source/blender/makesrna/RNA_define.h @@ -23,8 +23,8 @@ * Functions used during preprocess and runtime, for defining the RNA. */ -#include #include +#include #include #include "DNA_listBase.h" diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index 3eaee4a1ef4..46854bc6307 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -18,22 +18,22 @@ * \ingroup RNA */ -#include +#include #include +#include #include #include #include #include #include -#include #include "MEM_guardedalloc.h" #include "BLI_utildefines.h" #include "RNA_define.h" -#include "RNA_types.h" #include "RNA_enum_types.h" +#include "RNA_types.h" #include "rna_internal.h" diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index 9a660153a3b..42cec23975c 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -18,13 +18,13 @@ * \ingroup RNA */ -#include #include +#include #include "DNA_ID.h" -#include "DNA_vfont_types.h" #include "DNA_material_types.h" #include "DNA_object_types.h" +#include "DNA_vfont_types.h" #include "BLI_utildefines.h" @@ -93,15 +93,15 @@ const EnumPropertyItem rna_enum_id_type_items[] = { # include "BLI_listbase.h" # include "BLI_math_base.h" +# include "BKE_animsys.h" # include "BKE_font.h" +# include "BKE_global.h" /* XXX, remove me */ # include "BKE_idprop.h" -# include "BKE_lib_query.h" # include "BKE_lib_override.h" +# include "BKE_lib_query.h" # include "BKE_lib_remap.h" # include "BKE_library.h" -# include "BKE_animsys.h" # include "BKE_material.h" -# include "BKE_global.h" /* XXX, remove me */ # include "DEG_depsgraph.h" # include "DEG_depsgraph_build.h" diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index 33f9b2da280..bc5a5d58790 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -18,24 +18,24 @@ * \ingroup RNA */ -#include -#include -#include #include +#include +#include +#include #include "MEM_guardedalloc.h" #include "DNA_ID.h" -#include "DNA_scene_types.h" #include "DNA_constraint_types.h" #include "DNA_modifier_types.h" +#include "DNA_scene_types.h" #include "DNA_windowmanager_types.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_dynstr.h" #include "BLI_ghash.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BLF_api.h" #include "BLT_translation.h" @@ -43,12 +43,12 @@ #include "BKE_animsys.h" #include "BKE_collection.h" #include "BKE_context.h" +#include "BKE_fcurve.h" #include "BKE_idcode.h" #include "BKE_idprop.h" -#include "BKE_fcurve.h" #include "BKE_main.h" -#include "BKE_report.h" #include "BKE_node.h" +#include "BKE_report.h" #include "DEG_depsgraph.h" @@ -63,8 +63,8 @@ #include "DNA_object_types.h" #include "WM_types.h" -#include "rna_internal.h" #include "rna_access_internal.h" +#include "rna_internal.h" const PointerRNA PointerRNA_NULL = {NULL}; diff --git a/source/blender/makesrna/intern/rna_access_compare_override.c b/source/blender/makesrna/intern/rna_access_compare_override.c index 96f152f0868..22d018c6025 100644 --- a/source/blender/makesrna/intern/rna_access_compare_override.c +++ b/source/blender/makesrna/intern/rna_access_compare_override.c @@ -24,8 +24,8 @@ #include "DNA_constraint_types.h" #include "DNA_modifier_types.h" -#include "BLI_utildefines.h" #include "BLI_string.h" +#include "BLI_utildefines.h" // #define DEBUG_OVERRIDE_TIMEIT @@ -41,8 +41,8 @@ #include "RNA_define.h" #include "RNA_enum_types.h" -#include "rna_internal.h" #include "rna_access_internal.h" +#include "rna_internal.h" int RNA_property_override_flag(PropertyRNA *prop) { diff --git a/source/blender/makesrna/intern/rna_action.c b/source/blender/makesrna/intern/rna_action.c index a9dfa8b529e..0685fb270f1 100644 --- a/source/blender/makesrna/intern/rna_action.c +++ b/source/blender/makesrna/intern/rna_action.c @@ -20,8 +20,8 @@ #include -#include "DNA_anim_types.h" #include "DNA_action_types.h" +#include "DNA_anim_types.h" #include "DNA_scene_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/makesrna/intern/rna_action_api.c b/source/blender/makesrna/intern/rna_action_api.c index 76a9a255d62..48da32afba5 100644 --- a/source/blender/makesrna/intern/rna_action_api.c +++ b/source/blender/makesrna/intern/rna_action_api.c @@ -21,8 +21,8 @@ * \ingroup RNA */ -#include #include +#include #include #include diff --git a/source/blender/makesrna/intern/rna_animation.c b/source/blender/makesrna/intern/rna_animation.c index 9aafdb02f69..036bcfc6311 100644 --- a/source/blender/makesrna/intern/rna_animation.c +++ b/source/blender/makesrna/intern/rna_animation.c @@ -20,8 +20,8 @@ #include -#include "DNA_anim_types.h" #include "DNA_action_types.h" +#include "DNA_anim_types.h" #include "DNA_scene_types.h" #include "BLI_utildefines.h" diff --git a/source/blender/makesrna/intern/rna_animation_api.c b/source/blender/makesrna/intern/rna_animation_api.c index 9da845d66f2..95b89e7efe4 100644 --- a/source/blender/makesrna/intern/rna_animation_api.c +++ b/source/blender/makesrna/intern/rna_animation_api.c @@ -21,8 +21,8 @@ * \ingroup RNA */ -#include #include +#include #include "RNA_define.h" #include "RNA_enum_types.h" @@ -36,8 +36,8 @@ #ifdef RNA_RUNTIME # include "BKE_context.h" -# include "BKE_report.h" # include "BKE_nla.h" +# include "BKE_report.h" # include "ED_keyframing.h" diff --git a/source/blender/makesrna/intern/rna_animviz.c b/source/blender/makesrna/intern/rna_animviz.c index 61a1f1ffcd5..06215e16965 100644 --- a/source/blender/makesrna/intern/rna_animviz.c +++ b/source/blender/makesrna/intern/rna_animviz.c @@ -20,8 +20,8 @@ #include -#include "DNA_anim_types.h" #include "DNA_action_types.h" +#include "DNA_anim_types.h" #include "DNA_scene_types.h" #include "BLI_utildefines.h" diff --git a/source/blender/makesrna/intern/rna_armature.c b/source/blender/makesrna/intern/rna_armature.c index 232f3d86fd3..3afbd0405fe 100644 --- a/source/blender/makesrna/intern/rna_armature.c +++ b/source/blender/makesrna/intern/rna_armature.c @@ -44,8 +44,8 @@ # include "BKE_idprop.h" # include "BKE_main.h" -# include "ED_armature.h" # include "BKE_armature.h" +# include "ED_armature.h" # include "DEG_depsgraph.h" # include "DEG_depsgraph_build.h" diff --git a/source/blender/makesrna/intern/rna_armature_api.c b/source/blender/makesrna/intern/rna_armature_api.c index 2b60dbde39f..a9d39b7eda8 100644 --- a/source/blender/makesrna/intern/rna_armature_api.c +++ b/source/blender/makesrna/intern/rna_armature_api.c @@ -21,8 +21,8 @@ * \ingroup RNA */ -#include #include +#include #include #include @@ -36,8 +36,8 @@ # include "DNA_armature_types.h" -# include "BLI_math_vector.h" # include "BKE_armature.h" +# include "BLI_math_vector.h" static void rna_EditBone_align_roll(EditBone *ebo, float no[3]) { diff --git a/source/blender/makesrna/intern/rna_boid.c b/source/blender/makesrna/intern/rna_boid.c index 01d1d1ddddb..8a28a03cc71 100644 --- a/source/blender/makesrna/intern/rna_boid.c +++ b/source/blender/makesrna/intern/rna_boid.c @@ -25,10 +25,10 @@ #include #include -#include "DNA_scene_types.h" #include "DNA_boid_types.h" #include "DNA_object_types.h" #include "DNA_particle_types.h" +#include "DNA_scene_types.h" #include "BLI_utildefines.h" diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index 5ea1b696e49..b18f50e3837 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -18,15 +18,15 @@ * \ingroup RNA */ -#include #include +#include #include "DNA_brush_types.h" -#include "DNA_texture_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_workspace_types.h" #include "DNA_gpencil_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" +#include "DNA_texture_types.h" +#include "DNA_workspace_types.h" #include "BLI_math.h" diff --git a/source/blender/makesrna/intern/rna_camera_api.c b/source/blender/makesrna/intern/rna_camera_api.c index cbbd8377c7f..49271f95056 100644 --- a/source/blender/makesrna/intern/rna_camera_api.c +++ b/source/blender/makesrna/intern/rna_camera_api.c @@ -18,8 +18,8 @@ * \ingroup RNA */ -#include #include +#include #include #include "RNA_define.h" diff --git a/source/blender/makesrna/intern/rna_cloth.c b/source/blender/makesrna/intern/rna_cloth.c index 59040df56c3..1dae78b9efd 100644 --- a/source/blender/makesrna/intern/rna_cloth.c +++ b/source/blender/makesrna/intern/rna_cloth.c @@ -18,8 +18,8 @@ * \ingroup RNA */ -#include #include +#include #include "DNA_cloth_types.h" #include "DNA_object_types.h" diff --git a/source/blender/makesrna/intern/rna_collection.c b/source/blender/makesrna/intern/rna_collection.c index fb366422f34..709be0cf842 100644 --- a/source/blender/makesrna/intern/rna_collection.c +++ b/source/blender/makesrna/intern/rna_collection.c @@ -32,8 +32,8 @@ #ifdef RNA_RUNTIME -# include "DNA_scene_types.h" # include "DNA_object_types.h" +# include "DNA_scene_types.h" # include "DEG_depsgraph.h" # include "DEG_depsgraph_build.h" diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c index 215ccc78bc2..56ad8e2677b 100644 --- a/source/blender/makesrna/intern/rna_color.c +++ b/source/blender/makesrna/intern/rna_color.c @@ -18,8 +18,8 @@ * \ingroup RNA */ -#include #include +#include #include "DNA_color_types.h" #include "DNA_texture_types.h" @@ -49,10 +49,10 @@ # include "BKE_colorband.h" # include "BKE_colortools.h" # include "BKE_image.h" +# include "BKE_linestyle.h" # include "BKE_movieclip.h" # include "BKE_node.h" # include "BKE_sequencer.h" -# include "BKE_linestyle.h" # include "DEG_depsgraph.h" diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c index 64e6fc9059c..dc0cde953f4 100644 --- a/source/blender/makesrna/intern/rna_constraint.c +++ b/source/blender/makesrna/intern/rna_constraint.c @@ -285,8 +285,8 @@ static const EnumPropertyItem space_object_items[] = { # include "DNA_cachefile_types.h" -# include "BKE_animsys.h" # include "BKE_action.h" +# include "BKE_animsys.h" # include "BKE_constraint.h" # include "BKE_context.h" diff --git a/source/blender/makesrna/intern/rna_context.c b/source/blender/makesrna/intern/rna_context.c index c4c54aac2c6..c8abf774561 100644 --- a/source/blender/makesrna/intern/rna_context.c +++ b/source/blender/makesrna/intern/rna_context.c @@ -23,8 +23,8 @@ #include "DNA_ID.h" #include "DNA_userdef_types.h" -#include "BLI_utildefines.h" #include "BKE_context.h" +#include "BLI_utildefines.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index ff132b52eb3..8b2658c7e0c 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -25,8 +25,8 @@ #include "DNA_material_types.h" #include "DNA_scene_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/makesrna/intern/rna_curve_api.c b/source/blender/makesrna/intern/rna_curve_api.c index 3ff244aed6d..1207f19b95f 100644 --- a/source/blender/makesrna/intern/rna_curve_api.c +++ b/source/blender/makesrna/intern/rna_curve_api.c @@ -21,8 +21,8 @@ * \ingroup RNA */ -#include #include +#include #include "RNA_define.h" diff --git a/source/blender/makesrna/intern/rna_curveprofile.c b/source/blender/makesrna/intern/rna_curveprofile.c index c9ba338b9d6..94a35bdede8 100644 --- a/source/blender/makesrna/intern/rna_curveprofile.c +++ b/source/blender/makesrna/intern/rna_curveprofile.c @@ -18,11 +18,11 @@ * \ingroup RNA */ -#include #include +#include -#include "DNA_curveprofile_types.h" #include "DNA_curve_types.h" +#include "DNA_curveprofile_types.h" #include "DNA_texture_types.h" #include "BLI_utildefines.h" @@ -50,10 +50,10 @@ # include "BKE_colorband.h" # include "BKE_curveprofile.h" # include "BKE_image.h" +# include "BKE_linestyle.h" # include "BKE_movieclip.h" # include "BKE_node.h" # include "BKE_sequencer.h" -# include "BKE_linestyle.h" # include "DEG_depsgraph.h" diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c index fc81fd52cf3..f5e7f87cfbd 100644 --- a/source/blender/makesrna/intern/rna_define.c +++ b/source/blender/makesrna/intern/rna_define.c @@ -18,23 +18,23 @@ * \ingroup RNA */ +#include #include #include +#include #include #include -#include #include -#include #include "BLI_utildefines.h" #include "MEM_guardedalloc.h" +#include "DNA_defaults.h" #include "DNA_genfile.h" #include "DNA_sdna_types.h" -#include "DNA_defaults.h" -#include "BLI_listbase.h" #include "BLI_ghash.h" +#include "BLI_listbase.h" #include "BLT_translation.h" diff --git a/source/blender/makesrna/intern/rna_depsgraph.c b/source/blender/makesrna/intern/rna_depsgraph.c index b45b1117c2e..66c8522c53a 100644 --- a/source/blender/makesrna/intern/rna_depsgraph.c +++ b/source/blender/makesrna/intern/rna_depsgraph.c @@ -20,8 +20,8 @@ #include -#include "BLI_utildefines.h" #include "BLI_path_util.h" +#include "BLI_utildefines.h" #include "RNA_define.h" #include "RNA_enum_types.h" diff --git a/source/blender/makesrna/intern/rna_dynamicpaint.c b/source/blender/makesrna/intern/rna_dynamicpaint.c index d7e34ff139c..f86cfb674d1 100644 --- a/source/blender/makesrna/intern/rna_dynamicpaint.c +++ b/source/blender/makesrna/intern/rna_dynamicpaint.c @@ -18,11 +18,11 @@ * \ingroup RNA */ -#include #include +#include -#include "BKE_modifier.h" #include "BKE_dynamicpaint.h" +#include "BKE_modifier.h" #include "DNA_dynamicpaint_types.h" #include "DNA_modifier_types.h" diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c index 424bb4a492f..b6a2d38ba18 100644 --- a/source/blender/makesrna/intern/rna_fcurve.c +++ b/source/blender/makesrna/intern/rna_fcurve.c @@ -39,8 +39,8 @@ #include "WM_types.h" -#include "ED_keyframing.h" #include "ED_keyframes_edit.h" +#include "ED_keyframing.h" const EnumPropertyItem rna_enum_fmodifier_type_items[] = { {FMODIFIER_TYPE_NULL, "NULL", 0, "Invalid", ""}, @@ -211,8 +211,8 @@ static StructRNA *rna_FModifierType_refine(struct PointerRNA *ptr) /* ****************************** */ -# include "BKE_fcurve.h" # include "BKE_animsys.h" +# include "BKE_fcurve.h" # include "DEG_depsgraph.h" # include "DEG_depsgraph_build.h" diff --git a/source/blender/makesrna/intern/rna_fcurve_api.c b/source/blender/makesrna/intern/rna_fcurve_api.c index 4cc38d3616c..4ee25be946c 100644 --- a/source/blender/makesrna/intern/rna_fcurve_api.c +++ b/source/blender/makesrna/intern/rna_fcurve_api.c @@ -21,8 +21,8 @@ * \ingroup RNA */ -#include #include +#include #include #include diff --git a/source/blender/makesrna/intern/rna_fluid.c b/source/blender/makesrna/intern/rna_fluid.c index bd74973b7d7..9b46d0cd4a7 100644 --- a/source/blender/makesrna/intern/rna_fluid.c +++ b/source/blender/makesrna/intern/rna_fluid.c @@ -18,31 +18,31 @@ * \ingroup RNA */ -#include #include +#include -#include "BLI_utildefines.h" #include "BLI_path_util.h" #include "BLI_sys_types.h" +#include "BLI_utildefines.h" #include "RNA_define.h" #include "RNA_enum_types.h" #include "rna_internal.h" -#include "BKE_modifier.h" #include "BKE_fluid.h" +#include "BKE_modifier.h" #include "BKE_pointcache.h" +#include "DNA_fluid_types.h" #include "DNA_modifier_types.h" #include "DNA_object_force_types.h" #include "DNA_object_types.h" -#include "DNA_scene_types.h" -#include "DNA_fluid_types.h" #include "DNA_particle_types.h" +#include "DNA_scene_types.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #ifdef RNA_RUNTIME diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c index a4e6f6762b1..f451126a7e0 100644 --- a/source/blender/makesrna/intern/rna_gpencil.c +++ b/source/blender/makesrna/intern/rna_gpencil.c @@ -22,11 +22,11 @@ #include "BLI_math.h" -#include "DNA_meshdata_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_scene_types.h" #include "DNA_brush_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_meshdata_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c b/source/blender/makesrna/intern/rna_gpencil_modifier.c index 00188ac0887..34eee9415d9 100644 --- a/source/blender/makesrna/intern/rna_gpencil_modifier.c +++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c @@ -25,10 +25,10 @@ #include "DNA_armature_types.h" #include "DNA_brush_types.h" #include "DNA_cachefile_types.h" -#include "DNA_mesh_types.h" #include "DNA_gpencil_modifier_types.h" -#include "DNA_object_types.h" +#include "DNA_mesh_types.h" #include "DNA_object_force_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "MEM_guardedalloc.h" @@ -42,10 +42,10 @@ #include "BKE_data_transfer.h" #include "BKE_dynamicpaint.h" #include "BKE_effect.h" +#include "BKE_fluid.h" /* For BKE_fluid_modifier_free & BKE_fluid_modifier_create_type_data */ #include "BKE_mesh_mapping.h" #include "BKE_mesh_remap.h" #include "BKE_multires.h" -#include "BKE_fluid.h" /* For BKE_fluid_modifier_free & BKE_fluid_modifier_create_type_data */ #include "RNA_access.h" #include "RNA_define.h" @@ -174,15 +174,15 @@ static const EnumPropertyItem gpencil_tint_type_items[] = { #ifdef RNA_RUNTIME -# include "DNA_particle_types.h" # include "DNA_curve_types.h" # include "DNA_fluid_types.h" +# include "DNA_particle_types.h" # include "BKE_cachefile.h" # include "BKE_context.h" +# include "BKE_gpencil.h" # include "BKE_gpencil_modifier.h" # include "BKE_object.h" -# include "BKE_gpencil.h" # include "DEG_depsgraph.h" # include "DEG_depsgraph_build.h" diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c index 8f2a841b55c..2797f3a2d84 100644 --- a/source/blender/makesrna/intern/rna_image.c +++ b/source/blender/makesrna/intern/rna_image.c @@ -37,8 +37,8 @@ #include "rna_internal.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" const EnumPropertyItem rna_enum_image_generated_type_items[] = { {IMA_GENTYPE_BLANK, "BLANK", 0, "Blank", "Generate a blank image"}, diff --git a/source/blender/makesrna/intern/rna_image_api.c b/source/blender/makesrna/intern/rna_image_api.c index 7b5612ef8e7..fe3ef21d15e 100644 --- a/source/blender/makesrna/intern/rna_image_api.c +++ b/source/blender/makesrna/intern/rna_image_api.c @@ -21,15 +21,15 @@ * \ingroup RNA */ -#include #include +#include #include #include #include "DNA_packedFile_types.h" -#include "BLI_utildefines.h" #include "BLI_path_util.h" +#include "BLI_utildefines.h" #include "RNA_define.h" #include "RNA_enum_types.h" @@ -40,12 +40,12 @@ #ifdef RNA_RUNTIME -# include # include "BKE_image.h" # include "BKE_main.h" +# include -# include "IMB_imbuf.h" # include "IMB_colormanagement.h" +# include "IMB_imbuf.h" # include "DNA_image_types.h" # include "DNA_scene_types.h" diff --git a/source/blender/makesrna/intern/rna_key.c b/source/blender/makesrna/intern/rna_key.c index 46c3adbd6ef..d8628097490 100644 --- a/source/blender/makesrna/intern/rna_key.c +++ b/source/blender/makesrna/intern/rna_key.c @@ -21,14 +21,14 @@ #include #include "DNA_ID.h" -#include "DNA_scene_types.h" #include "DNA_curve_types.h" #include "DNA_key_types.h" #include "DNA_lattice_types.h" #include "DNA_mesh_types.h" +#include "DNA_scene_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/makesrna/intern/rna_lattice.c b/source/blender/makesrna/intern/rna_lattice.c index 34f5b6caee1..176fb838e91 100644 --- a/source/blender/makesrna/intern/rna_lattice.c +++ b/source/blender/makesrna/intern/rna_lattice.c @@ -36,16 +36,16 @@ # include "DNA_object_types.h" # include "DNA_scene_types.h" -# include "BLI_string.h" +# include "BKE_deform.h" # include "BKE_lattice.h" # include "BKE_main.h" -# include "BKE_deform.h" +# include "BLI_string.h" # include "DEG_depsgraph.h" +# include "ED_lattice.h" # include "WM_api.h" # include "WM_types.h" -# include "ED_lattice.h" static void rna_LatticePoint_co_get(PointerRNA *ptr, float *values) { diff --git a/source/blender/makesrna/intern/rna_lattice_api.c b/source/blender/makesrna/intern/rna_lattice_api.c index 6aa9dfe803d..0b61603dd09 100644 --- a/source/blender/makesrna/intern/rna_lattice_api.c +++ b/source/blender/makesrna/intern/rna_lattice_api.c @@ -21,8 +21,8 @@ * \ingroup RNA */ -#include #include +#include #include "RNA_define.h" diff --git a/source/blender/makesrna/intern/rna_layer.c b/source/blender/makesrna/intern/rna_layer.c index bf8df14d258..3883ffab246 100644 --- a/source/blender/makesrna/intern/rna_layer.c +++ b/source/blender/makesrna/intern/rna_layer.c @@ -18,8 +18,8 @@ * \ingroup RNA */ -#include "DNA_scene_types.h" #include "DNA_layer_types.h" +#include "DNA_scene_types.h" #include "DNA_view3d_types.h" #include "BLT_translation.h" @@ -51,9 +51,9 @@ # include "BKE_idprop.h" # include "BKE_layer.h" +# include "BKE_mesh.h" # include "BKE_node.h" # include "BKE_scene.h" -# include "BKE_mesh.h" # include "DEG_depsgraph_build.h" # include "DEG_depsgraph_query.h" diff --git a/source/blender/makesrna/intern/rna_light.c b/source/blender/makesrna/intern/rna_light.c index 988504db2f9..c19dafb3bc6 100644 --- a/source/blender/makesrna/intern/rna_light.c +++ b/source/blender/makesrna/intern/rna_light.c @@ -20,9 +20,9 @@ #include -#include "BLI_sys_types.h" #include "BLI_math_base.h" #include "BLI_math_rotation.h" +#include "BLI_sys_types.h" #include "BLT_translation.h" diff --git a/source/blender/makesrna/intern/rna_linestyle.c b/source/blender/makesrna/intern/rna_linestyle.c index f5730885193..788246f5edd 100644 --- a/source/blender/makesrna/intern/rna_linestyle.c +++ b/source/blender/makesrna/intern/rna_linestyle.c @@ -32,8 +32,8 @@ #include "DNA_material_types.h" #include "DNA_texture_types.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" const EnumPropertyItem rna_enum_linestyle_color_modifier_type_items[] = { {LS_MODIFIER_ALONG_STROKE, "ALONG_STROKE", ICON_MODIFIER, "Along Stroke", ""}, diff --git a/source/blender/makesrna/intern/rna_main.c b/source/blender/makesrna/intern/rna_main.c index 949a7e44feb..855d5f46890 100644 --- a/source/blender/makesrna/intern/rna_main.c +++ b/source/blender/makesrna/intern/rna_main.c @@ -21,19 +21,19 @@ #include #include -#include "BLI_utildefines.h" #include "BLI_path_util.h" +#include "BLI_utildefines.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "rna_internal.h" #ifdef RNA_RUNTIME +# include "BKE_global.h" # include "BKE_main.h" # include "BKE_mesh.h" -# include "BKE_global.h" /* all the list begin functions are added manually here, Main is not in SDNA */ diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index dfd94ccc927..6143af32c75 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/source/blender/makesrna/intern/rna_main_api.c @@ -21,19 +21,19 @@ * \ingroup RNA */ -#include -#include #include +#include +#include #include "DNA_ID.h" #include "DNA_modifier_types.h" -#include "DNA_space_types.h" #include "DNA_object_types.h" +#include "DNA_space_types.h" #include "BLI_utildefines.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "RNA_enum_types.h" #include "rna_internal.h" @@ -53,9 +53,9 @@ # include "BKE_icons.h" # include "BKE_idcode.h" # include "BKE_image.h" -# include "BKE_light.h" # include "BKE_lattice.h" # include "BKE_lib_remap.h" +# include "BKE_light.h" # include "BKE_lightprobe.h" # include "BKE_linestyle.h" # include "BKE_mask.h" @@ -81,30 +81,30 @@ # include "DEG_depsgraph_query.h" # include "DNA_armature_types.h" +# include "DNA_brush_types.h" # include "DNA_camera_types.h" +# include "DNA_collection_types.h" # include "DNA_curve_types.h" +# include "DNA_gpencil_types.h" # include "DNA_hair_types.h" +# include "DNA_lattice_types.h" # include "DNA_light_types.h" +# include "DNA_lightprobe_types.h" +# include "DNA_mask_types.h" # include "DNA_material_types.h" # include "DNA_mesh_types.h" -# include "DNA_speaker_types.h" -# include "DNA_sound_types.h" -# include "DNA_lightprobe_types.h" -# include "DNA_text_types.h" -# include "DNA_texture_types.h" -# include "DNA_collection_types.h" -# include "DNA_brush_types.h" -# include "DNA_lattice_types.h" # include "DNA_meta_types.h" -# include "DNA_world_types.h" +# include "DNA_movieclip_types.h" +# include "DNA_node_types.h" # include "DNA_particle_types.h" # include "DNA_pointcloud_types.h" +# include "DNA_sound_types.h" +# include "DNA_speaker_types.h" +# include "DNA_text_types.h" +# include "DNA_texture_types.h" # include "DNA_vfont_types.h" # include "DNA_volume_types.h" -# include "DNA_node_types.h" -# include "DNA_movieclip_types.h" -# include "DNA_mask_types.h" -# include "DNA_gpencil_types.h" +# include "DNA_world_types.h" # include "ED_screen.h" diff --git a/source/blender/makesrna/intern/rna_mask.c b/source/blender/makesrna/intern/rna_mask.c index adc041174aa..687b32dec04 100644 --- a/source/blender/makesrna/intern/rna_mask.c +++ b/source/blender/makesrna/intern/rna_mask.c @@ -18,8 +18,8 @@ * \ingroup RNA */ -#include #include +#include #include "MEM_guardedalloc.h" @@ -39,8 +39,8 @@ #include "WM_types.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #ifdef RNA_RUNTIME diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c index f206e0061fc..5c1697c70f4 100644 --- a/source/blender/makesrna/intern/rna_material.c +++ b/source/blender/makesrna/intern/rna_material.c @@ -71,22 +71,22 @@ const EnumPropertyItem rna_enum_ramp_blend_items[] = { # include "BKE_colorband.h" # include "BKE_context.h" -# include "BKE_main.h" # include "BKE_gpencil.h" +# include "BKE_main.h" # include "BKE_material.h" -# include "BKE_texture.h" # include "BKE_node.h" # include "BKE_paint.h" # include "BKE_scene.h" +# include "BKE_texture.h" # include "BKE_workspace.h" # include "DEG_depsgraph.h" # include "DEG_depsgraph_build.h" -# include "ED_node.h" -# include "ED_image.h" -# include "ED_screen.h" # include "ED_gpencil.h" +# include "ED_image.h" +# include "ED_node.h" +# include "ED_screen.h" static void rna_Material_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { diff --git a/source/blender/makesrna/intern/rna_material_api.c b/source/blender/makesrna/intern/rna_material_api.c index 9f03b5f1a27..f5b13fdbc81 100644 --- a/source/blender/makesrna/intern/rna_material_api.c +++ b/source/blender/makesrna/intern/rna_material_api.c @@ -21,8 +21,8 @@ * \ingroup RNA */ -#include #include +#include #include "BLI_utildefines.h" diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index 805abdd9aa6..54539924fde 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -39,8 +39,8 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "RNA_types.h" #include "RNA_enum_types.h" +#include "RNA_types.h" #include "rna_internal.h" diff --git a/source/blender/makesrna/intern/rna_mesh_api.c b/source/blender/makesrna/intern/rna_mesh_api.c index 0b3a7802082..cc0b2eacd13 100644 --- a/source/blender/makesrna/intern/rna_mesh_api.c +++ b/source/blender/makesrna/intern/rna_mesh_api.c @@ -21,8 +21,8 @@ * \ingroup RNA */ -#include #include +#include #include "RNA_define.h" @@ -39,9 +39,9 @@ # include "DNA_mesh_types.h" # include "BKE_mesh.h" -# include "BKE_mesh_tangent.h" # include "BKE_mesh_mapping.h" # include "BKE_mesh_runtime.h" +# include "BKE_mesh_tangent.h" # include "ED_mesh.h" static const char *rna_Mesh_unit_test_compare(struct Mesh *mesh, struct Mesh *mesh2) diff --git a/source/blender/makesrna/intern/rna_meta.c b/source/blender/makesrna/intern/rna_meta.c index 2b2a928e280..382e83a5650 100644 --- a/source/blender/makesrna/intern/rna_meta.c +++ b/source/blender/makesrna/intern/rna_meta.c @@ -37,17 +37,17 @@ # include "MEM_guardedalloc.h" -# include "DNA_scene_types.h" # include "DNA_object_types.h" +# include "DNA_scene_types.h" -# include "BKE_mball.h" # include "BKE_main.h" +# include "BKE_mball.h" # include "BKE_scene.h" # include "DEG_depsgraph.h" -# include "WM_types.h" # include "WM_api.h" +# include "WM_types.h" static int rna_Meta_texspace_editable(PointerRNA *ptr, const char **UNUSED(r_info)) { diff --git a/source/blender/makesrna/intern/rna_meta_api.c b/source/blender/makesrna/intern/rna_meta_api.c index 2678ed30024..178209d1152 100644 --- a/source/blender/makesrna/intern/rna_meta_api.c +++ b/source/blender/makesrna/intern/rna_meta_api.c @@ -21,8 +21,8 @@ * \ingroup RNA */ -#include #include +#include #include "RNA_define.h" diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 6440b140183..a91dd2e33c7 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -26,8 +26,8 @@ #include "DNA_cachefile_types.h" #include "DNA_mesh_types.h" #include "DNA_modifier_types.h" -#include "DNA_object_types.h" #include "DNA_object_force_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "MEM_guardedalloc.h" @@ -41,11 +41,11 @@ #include "BKE_data_transfer.h" #include "BKE_dynamicpaint.h" #include "BKE_effect.h" +#include "BKE_fluid.h" /* For BKE_fluid_modifier_free & BKE_fluid_modifier_create_type_data */ #include "BKE_mesh_mapping.h" #include "BKE_mesh_remap.h" #include "BKE_multires.h" #include "BKE_ocean.h" -#include "BKE_fluid.h" /* For BKE_fluid_modifier_free & BKE_fluid_modifier_create_type_data */ #include "RNA_access.h" #include "RNA_define.h" @@ -577,9 +577,9 @@ const EnumPropertyItem rna_enum_axis_flag_xyz_items[] = { }; #ifdef RNA_RUNTIME -# include "DNA_particle_types.h" # include "DNA_curve_types.h" # include "DNA_fluid_types.h" +# include "DNA_particle_types.h" # include "BKE_cachefile.h" # include "BKE_context.h" diff --git a/source/blender/makesrna/intern/rna_movieclip.c b/source/blender/makesrna/intern/rna_movieclip.c index 9bfa93ceba5..f55d44e7bad 100644 --- a/source/blender/makesrna/intern/rna_movieclip.c +++ b/source/blender/makesrna/intern/rna_movieclip.c @@ -18,8 +18,8 @@ * \ingroup RNA */ -#include #include +#include #include "MEM_guardedalloc.h" @@ -36,8 +36,8 @@ #include "WM_types.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_metadata.h" #ifdef RNA_RUNTIME diff --git a/source/blender/makesrna/intern/rna_nla.c b/source/blender/makesrna/intern/rna_nla.c index cf84d38a880..304cfb49594 100644 --- a/source/blender/makesrna/intern/rna_nla.c +++ b/source/blender/makesrna/intern/rna_nla.c @@ -20,8 +20,8 @@ #include -#include "DNA_anim_types.h" #include "DNA_action_types.h" +#include "DNA_anim_types.h" #include "DNA_scene_types.h" #include "BLI_utildefines.h" @@ -39,8 +39,8 @@ #ifdef RNA_RUNTIME -# include # include +# include /* needed for some of the validation stuff... */ # include "BKE_animsys.h" @@ -51,8 +51,8 @@ # include "ED_anim_api.h" -# include "DEG_depsgraph_build.h" # include "DEG_depsgraph.h" +# include "DEG_depsgraph_build.h" /* temp constant defined for these funcs only... */ # define NLASTRIP_MIN_LEN_THRESH 0.1f diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 663c263c7cc..5f6fcc71706 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -18,9 +18,9 @@ * \ingroup RNA */ +#include #include #include -#include #include "BLI_math.h" #include "BLI_utildefines.h" @@ -36,8 +36,8 @@ #include "DNA_texture_types.h" #include "BKE_animsys.h" -#include "BKE_node.h" #include "BKE_image.h" +#include "BKE_node.h" #include "BKE_texture.h" #include "RNA_access.h" @@ -329,9 +329,9 @@ static const EnumPropertyItem prop_shader_output_target_items[] = { # include "GPU_material.h" # include "NOD_common.h" -# include "NOD_socket.h" -# include "NOD_shader.h" # include "NOD_composite.h" +# include "NOD_shader.h" +# include "NOD_socket.h" # include "RE_engine.h" # include "RE_pipeline.h" diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 8fb90b69bc0..959529450f0 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -25,16 +25,16 @@ #include "DNA_brush_types.h" #include "DNA_collection_types.h" #include "DNA_customdata_types.h" +#include "DNA_gpencil_modifier_types.h" #include "DNA_lightprobe_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" +#include "DNA_meta_types.h" #include "DNA_object_force_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_meta_types.h" -#include "DNA_workspace_types.h" -#include "DNA_gpencil_modifier_types.h" #include "DNA_shader_fx_types.h" +#include "DNA_workspace_types.h" #include "BLI_utildefines.h" @@ -42,12 +42,12 @@ #include "BKE_camera.h" #include "BKE_collection.h" -#include "BKE_paint.h" #include "BKE_editlattice.h" #include "BKE_editmesh.h" #include "BKE_layer.h" #include "BKE_object_deform.h" #include "BKE_object_facemap.h" +#include "BKE_paint.h" #include "RNA_access.h" #include "RNA_define.h" @@ -289,10 +289,10 @@ const EnumPropertyItem rna_enum_object_axis_items[] = { # include "BLI_math.h" -# include "DNA_key_types.h" +# include "DNA_ID.h" # include "DNA_constraint_types.h" # include "DNA_gpencil_types.h" -# include "DNA_ID.h" +# include "DNA_key_types.h" # include "DNA_lattice_types.h" # include "DNA_node_types.h" @@ -301,24 +301,24 @@ const EnumPropertyItem rna_enum_object_axis_items[] = { # include "BKE_constraint.h" # include "BKE_context.h" # include "BKE_curve.h" +# include "BKE_deform.h" # include "BKE_effect.h" # include "BKE_global.h" # include "BKE_key.h" -# include "BKE_object.h" # include "BKE_material.h" # include "BKE_mesh.h" # include "BKE_modifier.h" +# include "BKE_object.h" # include "BKE_particle.h" # include "BKE_scene.h" -# include "BKE_deform.h" # include "DEG_depsgraph.h" # include "DEG_depsgraph_build.h" -# include "ED_object.h" -# include "ED_particle.h" # include "ED_curve.h" # include "ED_lattice.h" +# include "ED_object.h" +# include "ED_particle.h" static void rna_Object_internal_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c index 2afebf7e3f6..1db44f4fdea 100644 --- a/source/blender/makesrna/intern/rna_object_api.c +++ b/source/blender/makesrna/intern/rna_object_api.c @@ -21,13 +21,13 @@ * \ingroup RNA */ -#include #include +#include #include #include -#include "BLI_utildefines.h" #include "BLI_kdopbvh.h" +#include "BLI_utildefines.h" #include "RNA_define.h" @@ -36,8 +36,8 @@ #include "DNA_modifier_types.h" #include "DNA_object_types.h" -#include "BKE_layer.h" #include "BKE_gpencil.h" +#include "BKE_layer.h" #include "DEG_depsgraph.h" @@ -72,8 +72,8 @@ static const EnumPropertyItem space_items[] = { # include "BKE_global.h" # include "BKE_layer.h" # include "BKE_main.h" -# include "BKE_mesh.h" # include "BKE_mball.h" +# include "BKE_mesh.h" # include "BKE_modifier.h" # include "BKE_object.h" # include "BKE_report.h" diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c index 559b8ca4cc1..cd0c28457cf 100644 --- a/source/blender/makesrna/intern/rna_object_force.c +++ b/source/blender/makesrna/intern/rna_object_force.c @@ -21,11 +21,11 @@ #include #include "DNA_cloth_types.h" -#include "DNA_object_types.h" +#include "DNA_fluid_types.h" #include "DNA_object_force_types.h" +#include "DNA_object_types.h" #include "DNA_particle_types.h" #include "DNA_scene_types.h" -#include "DNA_fluid_types.h" #include "RNA_define.h" #include "RNA_enum_types.h" diff --git a/source/blender/makesrna/intern/rna_palette.c b/source/blender/makesrna/intern/rna_palette.c index 42bfe1a13b7..67d6daf5a13 100644 --- a/source/blender/makesrna/intern/rna_palette.c +++ b/source/blender/makesrna/intern/rna_palette.c @@ -22,8 +22,8 @@ #include "BLI_utildefines.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "rna_internal.h" diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index 3747dd53b97..47a20518648 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -20,20 +20,20 @@ * \ingroup RNA */ +#include #include #include -#include +#include "DNA_boid_types.h" +#include "DNA_cloth_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" -#include "DNA_cloth_types.h" -#include "DNA_particle_types.h" #include "DNA_object_force_types.h" #include "DNA_object_types.h" +#include "DNA_particle_types.h" #include "DNA_scene_types.h" -#include "DNA_boid_types.h" #include "DNA_texture_types.h" #include "RNA_define.h" @@ -45,8 +45,8 @@ #include "rna_internal.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #ifdef RNA_RUNTIME static const EnumPropertyItem part_from_items[] = { @@ -149,9 +149,9 @@ static const EnumPropertyItem part_fluid_type_items[] = { # include "BLI_string_utils.h" # include "BKE_boids.h" -# include "BKE_context.h" # include "BKE_cloth.h" # include "BKE_colortools.h" +# include "BKE_context.h" # include "BKE_deform.h" # include "BKE_effect.h" # include "BKE_material.h" diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c index c6175f85bd8..17e5f3d3649 100644 --- a/source/blender/makesrna/intern/rna_pose.c +++ b/source/blender/makesrna/intern/rna_pose.c @@ -80,16 +80,16 @@ const EnumPropertyItem rna_enum_color_sets_items[] = { # include "MEM_guardedalloc.h" -# include "BKE_context.h" # include "BKE_constraint.h" +# include "BKE_context.h" # include "BKE_global.h" # include "BKE_idprop.h" # include "DEG_depsgraph.h" # include "DEG_depsgraph_build.h" -# include "ED_object.h" # include "ED_armature.h" +# include "ED_object.h" # include "WM_api.h" diff --git a/source/blender/makesrna/intern/rna_pose_api.c b/source/blender/makesrna/intern/rna_pose_api.c index 42b5c762c62..59704b00391 100644 --- a/source/blender/makesrna/intern/rna_pose_api.c +++ b/source/blender/makesrna/intern/rna_pose_api.c @@ -21,8 +21,8 @@ * \ingroup RNA */ -#include #include +#include #include #include @@ -39,8 +39,8 @@ #ifdef RNA_RUNTIME /* #include "DNA_anim_types.h" */ -# include "DNA_action_types.h" /* bPose */ # include "BKE_armature.h" +# include "DNA_action_types.h" /* bPose */ static float rna_PoseBone_do_envelope(bPoseChannel *chan, float *vec) { diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c index eeaa8f78438..03c7ffb75b6 100644 --- a/source/blender/makesrna/intern/rna_render.c +++ b/source/blender/makesrna/intern/rna_render.c @@ -21,16 +21,16 @@ #include #include "DNA_node_types.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" -#include "BLI_utildefines.h" #include "BLI_path_util.h" +#include "BLI_utildefines.h" #include "DEG_depsgraph.h" -#include "BKE_scene.h" #include "BKE_image.h" +#include "BKE_scene.h" #include "RNA_define.h" #include "RNA_enum_types.h" @@ -98,9 +98,9 @@ const EnumPropertyItem rna_enum_bake_pass_type_items[] = { # include "BKE_context.h" # include "BKE_report.h" -# include "IMB_colormanagement.h" # include "GPU_extensions.h" # include "GPU_shader.h" +# include "IMB_colormanagement.h" # include "DEG_depsgraph_query.h" diff --git a/source/blender/makesrna/intern/rna_rigidbody.c b/source/blender/makesrna/intern/rna_rigidbody.c index 03937a5434e..d0a836487b4 100644 --- a/source/blender/makesrna/intern/rna_rigidbody.c +++ b/source/blender/makesrna/intern/rna_rigidbody.c @@ -32,8 +32,8 @@ #include "DNA_rigidbody_types.h" #include "DNA_scene_types.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "WM_types.h" diff --git a/source/blender/makesrna/intern/rna_rna.c b/source/blender/makesrna/intern/rna_rna.c index 484fac18c8e..4ee144e9031 100644 --- a/source/blender/makesrna/intern/rna_rna.c +++ b/source/blender/makesrna/intern/rna_rna.c @@ -123,9 +123,9 @@ const EnumPropertyItem rna_enum_property_unit_items[] = { /** \} */ #ifdef RNA_RUNTIME -# include "MEM_guardedalloc.h" # include "BLI_ghash.h" # include "BLI_string.h" +# include "MEM_guardedalloc.h" # include "BKE_lib_override.h" diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index e96db76bd3a..932ac72324e 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -22,17 +22,17 @@ #include "DNA_brush_types.h" #include "DNA_collection_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_layer_types.h" +#include "DNA_linestyle_types.h" #include "DNA_modifier_types.h" #include "DNA_particle_types.h" #include "DNA_rigidbody_types.h" #include "DNA_scene_types.h" -#include "DNA_layer_types.h" -#include "DNA_linestyle_types.h" -#include "DNA_userdef_types.h" -#include "DNA_world_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_view3d_types.h" #include "DNA_screen_types.h" /* TransformOrientation */ +#include "DNA_userdef_types.h" +#include "DNA_view3d_types.h" +#include "DNA_world_types.h" #include "IMB_imbuf_types.h" @@ -44,8 +44,8 @@ #include "BKE_editmesh.h" #include "BKE_paint.h" -#include "ED_object.h" #include "ED_gpencil.h" +#include "ED_object.h" #include "DRW_engine.h" @@ -60,9 +60,9 @@ #ifdef WITH_FFMPEG # include "BKE_writeffmpeg.h" +# include "ffmpeg_compat.h" # include # include -# include "ffmpeg_compat.h" #endif #include "ED_render.h" @@ -653,9 +653,9 @@ const EnumPropertyItem rna_enum_transform_orientation_items[] = { # include "DNA_anim_types.h" # include "DNA_color_types.h" +# include "DNA_mesh_types.h" # include "DNA_node_types.h" # include "DNA_object_types.h" -# include "DNA_mesh_types.h" # include "DNA_text_types.h" # include "DNA_workspace_types.h" @@ -663,33 +663,33 @@ const EnumPropertyItem rna_enum_transform_orientation_items[] = { # include "MEM_guardedalloc.h" +# include "BKE_animsys.h" # include "BKE_brush.h" # include "BKE_collection.h" # include "BKE_colortools.h" # include "BKE_context.h" +# include "BKE_freestyle.h" # include "BKE_global.h" +# include "BKE_gpencil.h" # include "BKE_idprop.h" # include "BKE_image.h" # include "BKE_layer.h" # include "BKE_main.h" +# include "BKE_mesh.h" # include "BKE_node.h" # include "BKE_pointcache.h" # include "BKE_scene.h" -# include "BKE_mesh.h" # include "BKE_screen.h" # include "BKE_sequencer.h" -# include "BKE_animsys.h" -# include "BKE_freestyle.h" -# include "BKE_gpencil.h" # include "BKE_unit.h" -# include "ED_info.h" -# include "ED_node.h" -# include "ED_view3d.h" -# include "ED_mesh.h" -# include "ED_keyframing.h" # include "ED_image.h" +# include "ED_info.h" +# include "ED_keyframing.h" +# include "ED_mesh.h" +# include "ED_node.h" # include "ED_scene.h" +# include "ED_view3d.h" # include "DEG_depsgraph_build.h" # include "DEG_depsgraph_query.h" diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c index 03032ac413e..c832c50bd5d 100644 --- a/source/blender/makesrna/intern/rna_scene_api.c +++ b/source/blender/makesrna/intern/rna_scene_api.c @@ -21,12 +21,12 @@ * \ingroup RNA */ -#include #include +#include -#include "BLI_utildefines.h" #include "BLI_kdopbvh.h" #include "BLI_path_util.h" +#include "BLI_utildefines.h" #include "RNA_define.h" #include "RNA_enum_types.h" diff --git a/source/blender/makesrna/intern/rna_screen.c b/source/blender/makesrna/intern/rna_screen.c index 89f65da335a..c6245f51e15 100644 --- a/source/blender/makesrna/intern/rna_screen.c +++ b/source/blender/makesrna/intern/rna_screen.c @@ -18,16 +18,16 @@ * \ingroup RNA */ -#include #include +#include #include "RNA_define.h" #include "RNA_enum_types.h" #include "rna_internal.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" #include "DNA_workspace_types.h" const EnumPropertyItem rna_enum_region_type_items[] = { @@ -55,8 +55,8 @@ const EnumPropertyItem rna_enum_region_type_items[] = { #ifdef RNA_RUNTIME # include "BKE_global.h" -# include "BKE_workspace.h" # include "BKE_screen.h" +# include "BKE_workspace.h" # include "DEG_depsgraph.h" diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c index 743c47f4f48..04a54063a03 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.c +++ b/source/blender/makesrna/intern/rna_sculpt_paint.c @@ -29,15 +29,15 @@ #include "rna_internal.h" #include "DNA_ID.h" +#include "DNA_brush_types.h" #include "DNA_gpencil_types.h" #include "DNA_scene_types.h" -#include "DNA_brush_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" +#include "BKE_brush.h" #include "BKE_material.h" #include "BKE_paint.h" -#include "BKE_brush.h" #include "ED_image.h" @@ -115,11 +115,11 @@ const EnumPropertyItem rna_enum_symmetrize_direction_items[] = { # include "BKE_collection.h" # include "BKE_context.h" +# include "BKE_gpencil.h" +# include "BKE_object.h" # include "BKE_particle.h" # include "BKE_pbvh.h" # include "BKE_pointcache.h" -# include "BKE_object.h" -# include "BKE_gpencil.h" # include "DEG_depsgraph.h" diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index d4dd3365935..6677105b771 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -18,14 +18,14 @@ * \ingroup RNA */ -#include #include +#include #include "DNA_anim_types.h" +#include "DNA_movieclip_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_sequence_types.h" -#include "DNA_movieclip_types.h" #include "DNA_vfont_types.h" #include "BLI_math.h" @@ -70,9 +70,9 @@ const EnumPropertyItem rna_enum_sequence_modifier_type_items[] = { #ifdef RNA_RUNTIME # include "BKE_global.h" -# include "BKE_report.h" # include "BKE_idprop.h" # include "BKE_movieclip.h" +# include "BKE_report.h" # include "WM_api.h" diff --git a/source/blender/makesrna/intern/rna_sequencer_api.c b/source/blender/makesrna/intern/rna_sequencer_api.c index 38bf1241b9c..d49a2ed1ea0 100644 --- a/source/blender/makesrna/intern/rna_sequencer_api.c +++ b/source/blender/makesrna/intern/rna_sequencer_api.c @@ -18,8 +18,8 @@ * \ingroup RNA */ -#include #include +#include #include #include "DNA_scene_types.h" diff --git a/source/blender/makesrna/intern/rna_sound.c b/source/blender/makesrna/intern/rna_sound.c index 8402c4a8705..28a1c0f3cca 100644 --- a/source/blender/makesrna/intern/rna_sound.c +++ b/source/blender/makesrna/intern/rna_sound.c @@ -28,9 +28,9 @@ #ifdef RNA_RUNTIME -# include "BKE_sound.h" # include "BKE_context.h" # include "BKE_sequencer.h" +# include "BKE_sound.h" # include "DEG_depsgraph.h" diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 5d4ca44f53a..1b74cb8aece 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -29,8 +29,8 @@ #include "BKE_key.h" #include "BKE_movieclip.h" #include "BKE_node.h" -#include "BKE_studiolight.h" #include "BKE_sequencer.h" +#include "BKE_studiolight.h" #include "ED_text.h" @@ -39,12 +39,12 @@ #include "DNA_action_types.h" #include "DNA_gpencil_types.h" #include "DNA_key_types.h" +#include "DNA_mask_types.h" #include "DNA_material_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" -#include "DNA_space_types.h" #include "DNA_sequence_types.h" -#include "DNA_mask_types.h" +#include "DNA_space_types.h" #include "DNA_view3d_types.h" #include "DNA_workspace_types.h" @@ -495,14 +495,14 @@ const EnumPropertyItem rna_enum_file_sort_items[] = { # include "BKE_brush.h" # include "BKE_colortools.h" # include "BKE_context.h" +# include "BKE_global.h" +# include "BKE_icons.h" # include "BKE_idprop.h" # include "BKE_layer.h" -# include "BKE_global.h" # include "BKE_nla.h" # include "BKE_paint.h" # include "BKE_scene.h" # include "BKE_screen.h" -# include "BKE_icons.h" # include "BKE_workspace.h" # include "DEG_depsgraph.h" @@ -510,14 +510,14 @@ const EnumPropertyItem rna_enum_file_sort_items[] = { # include "ED_anim_api.h" # include "ED_buttons.h" +# include "ED_clip.h" # include "ED_fileselect.h" # include "ED_image.h" # include "ED_node.h" -# include "ED_transform.h" # include "ED_screen.h" -# include "ED_view3d.h" # include "ED_sequencer.h" -# include "ED_clip.h" +# include "ED_transform.h" +# include "ED_view3d.h" # include "GPU_material.h" diff --git a/source/blender/makesrna/intern/rna_speaker.c b/source/blender/makesrna/intern/rna_speaker.c index 8f156a67e08..27e8654306a 100644 --- a/source/blender/makesrna/intern/rna_speaker.c +++ b/source/blender/makesrna/intern/rna_speaker.c @@ -25,8 +25,8 @@ #include "rna_internal.h" -#include "DNA_speaker_types.h" #include "DNA_sound_types.h" +#include "DNA_speaker_types.h" #include "BLT_translation.h" diff --git a/source/blender/makesrna/intern/rna_text.c b/source/blender/makesrna/intern/rna_text.c index 778e817c73e..c8797a8bc74 100644 --- a/source/blender/makesrna/intern/rna_text.c +++ b/source/blender/makesrna/intern/rna_text.c @@ -18,8 +18,8 @@ * \ingroup RNA */ -#include #include +#include #include "MEM_guardedalloc.h" diff --git a/source/blender/makesrna/intern/rna_text_api.c b/source/blender/makesrna/intern/rna_text_api.c index 000076eccec..b4c4a79ca75 100644 --- a/source/blender/makesrna/intern/rna_text_api.c +++ b/source/blender/makesrna/intern/rna_text_api.c @@ -18,8 +18,8 @@ * \ingroup RNA */ -#include #include +#include #include "BLI_utildefines.h" diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c index 356ecd5b4db..46b8d8647de 100644 --- a/source/blender/makesrna/intern/rna_texture.c +++ b/source/blender/makesrna/intern/rna_texture.c @@ -25,12 +25,12 @@ #include "DNA_brush_types.h" #include "DNA_light_types.h" #include "DNA_material_types.h" -#include "DNA_object_types.h" -#include "DNA_texture_types.h" -#include "DNA_world_types.h" #include "DNA_node_types.h" +#include "DNA_object_types.h" #include "DNA_particle_types.h" #include "DNA_scene_types.h" /* MAXFRAME only */ +#include "DNA_texture_types.h" +#include "DNA_world_types.h" #include "BLI_utildefines.h" @@ -144,8 +144,8 @@ static const EnumPropertyItem blend_type_items[] = { # include "BKE_colorband.h" # include "BKE_context.h" # include "BKE_image.h" -# include "BKE_texture.h" # include "BKE_main.h" +# include "BKE_texture.h" # include "DEG_depsgraph.h" diff --git a/source/blender/makesrna/intern/rna_texture_api.c b/source/blender/makesrna/intern/rna_texture_api.c index 059c0b8208c..b000565ed09 100644 --- a/source/blender/makesrna/intern/rna_texture_api.c +++ b/source/blender/makesrna/intern/rna_texture_api.c @@ -18,8 +18,8 @@ * \ingroup RNA */ -#include #include +#include #include #include "BLI_utildefines.h" @@ -30,11 +30,11 @@ #ifdef RNA_RUNTIME -# include "IMB_imbuf.h" -# include "IMB_imbuf_types.h" -# include "DNA_scene_types.h" # include "BKE_context.h" # include "BKE_global.h" +# include "DNA_scene_types.h" +# include "IMB_imbuf.h" +# include "IMB_imbuf_types.h" # include "RE_pipeline.h" # include "RE_shader_ext.h" diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c index 4b232251770..c8965f1a6fb 100644 --- a/source/blender/makesrna/intern/rna_tracking.c +++ b/source/blender/makesrna/intern/rna_tracking.c @@ -18,8 +18,8 @@ * \ingroup RNA */ -#include #include +#include #include "MEM_guardedalloc.h" diff --git a/source/blender/makesrna/intern/rna_ui.c b/source/blender/makesrna/intern/rna_ui.c index 778e65d3276..273bef6d239 100644 --- a/source/blender/makesrna/intern/rna_ui.c +++ b/source/blender/makesrna/intern/rna_ui.c @@ -29,13 +29,13 @@ #include "RNA_define.h" -#include "rna_internal.h" #include "RNA_enum_types.h" +#include "rna_internal.h" #include "UI_interface.h" -#include "WM_types.h" #include "WM_toolsystem.h" +#include "WM_types.h" /* see WM_types.h */ const EnumPropertyItem rna_enum_operator_context_items[] = { diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c index 8b112031ada..5eadbaf55e4 100644 --- a/source/blender/makesrna/intern/rna_ui_api.c +++ b/source/blender/makesrna/intern/rna_ui_api.c @@ -21,8 +21,8 @@ * \ingroup RNA */ -#include #include +#include #include "BLI_utildefines.h" @@ -33,9 +33,9 @@ #include "DNA_screen_types.h" -#include "UI_resources.h" #include "UI_interface.h" #include "UI_interface_icons.h" +#include "UI_resources.h" #include "rna_internal.h" diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 69694624a2b..6bec8843f82 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -21,22 +21,22 @@ #include #include +#include "DNA_brush_types.h" #include "DNA_curve_types.h" +#include "DNA_scene_types.h" #include "DNA_space_types.h" #include "DNA_userdef_types.h" -#include "DNA_brush_types.h" #include "DNA_view3d_types.h" -#include "DNA_scene_types.h" -#include "BLI_utildefines.h" #include "BLI_math_base.h" #include "BLI_math_rotation.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" +#include "BKE_addon.h" #include "BKE_appdir.h" #include "BKE_sound.h" -#include "BKE_addon.h" #include "BKE_studiolight.h" #include "RNA_access.h" @@ -181,8 +181,8 @@ static const EnumPropertyItem rna_enum_userdef_viewport_aa_items[] = { # include "BKE_idprop.h" # include "BKE_main.h" # include "BKE_mesh_runtime.h" -# include "BKE_pbvh.h" # include "BKE_paint.h" +# include "BKE_pbvh.h" # include "BKE_screen.h" # include "DEG_depsgraph.h" @@ -194,8 +194,8 @@ static const EnumPropertyItem rna_enum_userdef_viewport_aa_items[] = { # include "BLI_path_util.h" -# include "MEM_guardedalloc.h" # include "MEM_CacheLimiterC-Api.h" +# include "MEM_guardedalloc.h" # include "UI_interface.h" diff --git a/source/blender/makesrna/intern/rna_volume.c b/source/blender/makesrna/intern/rna_volume.c index 755d8922140..4b31bc1b4a9 100644 --- a/source/blender/makesrna/intern/rna_volume.c +++ b/source/blender/makesrna/intern/rna_volume.c @@ -44,8 +44,8 @@ # include "DEG_depsgraph.h" # include "DEG_depsgraph_build.h" -# include "WM_types.h" # include "WM_api.h" +# include "WM_types.h" /* Updates */ diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index 515ed2b0743..b0d77a2e176 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -29,8 +29,8 @@ #include "BLT_translation.h" -#include "BKE_workspace.h" #include "BKE_keyconfig.h" +#include "BKE_workspace.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/makesrna/intern/rna_wm_api.c b/source/blender/makesrna/intern/rna_wm_api.c index db7a7d6852b..df6abecd365 100644 --- a/source/blender/makesrna/intern/rna_wm_api.c +++ b/source/blender/makesrna/intern/rna_wm_api.c @@ -21,9 +21,9 @@ * \ingroup RNA */ -#include -#include #include +#include +#include #include "BLI_utildefines.h" diff --git a/source/blender/makesrna/intern/rna_wm_gizmo_api.c b/source/blender/makesrna/intern/rna_wm_gizmo_api.c index bc6c2e8a796..b4b7e02a95b 100644 --- a/source/blender/makesrna/intern/rna_wm_gizmo_api.c +++ b/source/blender/makesrna/intern/rna_wm_gizmo_api.c @@ -18,8 +18,8 @@ * \ingroup RNA */ -#include #include +#include #include "BLI_utildefines.h" @@ -36,8 +36,8 @@ #ifdef RNA_RUNTIME -# include "UI_interface.h" # include "BKE_context.h" +# include "UI_interface.h" # include "ED_gizmo_library.h" diff --git a/source/blender/makesrna/intern/rna_workspace_api.c b/source/blender/makesrna/intern/rna_workspace_api.c index 4fb6677199f..a2bb89dd5ee 100644 --- a/source/blender/makesrna/intern/rna_workspace_api.c +++ b/source/blender/makesrna/intern/rna_workspace_api.c @@ -18,8 +18,8 @@ * \ingroup RNA */ -#include #include +#include #include #include diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c index 38b66121cee..3e78662da6c 100644 --- a/source/blender/modifiers/intern/MOD_armature.c +++ b/source/blender/modifiers/intern/MOD_armature.c @@ -23,12 +23,12 @@ #include -#include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "DNA_armature_types.h" -#include "DNA_object_types.h" #include "DNA_mesh_types.h" +#include "DNA_object_types.h" #include "BKE_action.h" #include "BKE_editmesh.h" diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index f8f8ea49676..ff5bf3d0ee4 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -35,12 +35,12 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BKE_displist.h" #include "BKE_curve.h" +#include "BKE_displist.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" -#include "BKE_modifier.h" #include "BKE_mesh.h" +#include "BKE_modifier.h" #include "BKE_object_deform.h" #include "MOD_util.h" diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c index de08533753e..bd2f8a6dca3 100644 --- a/source/blender/modifiers/intern/MOD_bevel.c +++ b/source/blender/modifiers/intern/MOD_bevel.c @@ -27,11 +27,11 @@ #include "BLI_math.h" +#include "DNA_curveprofile_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_curveprofile_types.h" #include "BKE_deform.h" #include "BKE_mesh.h" @@ -39,9 +39,9 @@ #include "MOD_util.h" +#include "BKE_curveprofile.h" #include "bmesh.h" #include "bmesh_tools.h" -#include "BKE_curveprofile.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/modifiers/intern/MOD_build.c b/source/blender/modifiers/intern/MOD_build.c index e61f6877d09..3c1a5744b33 100644 --- a/source/blender/modifiers/intern/MOD_build.c +++ b/source/blender/modifiers/intern/MOD_build.c @@ -29,8 +29,8 @@ #include "BLI_math_vector.h" #include "BLI_rand.h" -#include "DNA_meshdata_types.h" #include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/modifiers/intern/MOD_cloth.c b/source/blender/modifiers/intern/MOD_cloth.c index 63c1b6f1ef0..0cab6144de8 100644 --- a/source/blender/modifiers/intern/MOD_cloth.c +++ b/source/blender/modifiers/intern/MOD_cloth.c @@ -30,8 +30,8 @@ #include "DNA_cloth_types.h" #include "DNA_key_types.h" #include "DNA_mesh_types.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c index 2dec5963f3c..af468cb2d27 100644 --- a/source/blender/modifiers/intern/MOD_collision.c +++ b/source/blender/modifiers/intern/MOD_collision.c @@ -25,9 +25,9 @@ #include "BLI_math.h" -#include "DNA_object_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/modifiers/intern/MOD_correctivesmooth.c b/source/blender/modifiers/intern/MOD_correctivesmooth.c index d35873728db..4eea9092e10 100644 --- a/source/blender/modifiers/intern/MOD_correctivesmooth.c +++ b/source/blender/modifiers/intern/MOD_correctivesmooth.c @@ -27,17 +27,17 @@ #include "BLI_math.h" -#include "DNA_scene_types.h" +#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "DNA_mesh_types.h" +#include "DNA_scene_types.h" #include "MEM_guardedalloc.h" #include "BKE_deform.h" -#include "BKE_mesh.h" #include "BKE_editmesh.h" #include "BKE_lib_id.h" +#include "BKE_mesh.h" #include "MOD_modifiertypes.h" #include "MOD_util.h" diff --git a/source/blender/modifiers/intern/MOD_curve.c b/source/blender/modifiers/intern/MOD_curve.c index f1fa627df00..e287685a9e5 100644 --- a/source/blender/modifiers/intern/MOD_curve.c +++ b/source/blender/modifiers/intern/MOD_curve.c @@ -26,8 +26,8 @@ #include "BLI_utildefines.h" #include "DNA_mesh_types.h" -#include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BKE_editmesh.h" #include "BKE_lattice.h" diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c index 8680b514fdc..cf07b5460e1 100644 --- a/source/blender/modifiers/intern/MOD_decimate.c +++ b/source/blender/modifiers/intern/MOD_decimate.c @@ -25,9 +25,9 @@ #include "BLI_math.h" -#include "DNA_object_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c index 46a9d4e676f..a1b02e201d9 100644 --- a/source/blender/modifiers/intern/MOD_displace.c +++ b/source/blender/modifiers/intern/MOD_displace.c @@ -31,15 +31,15 @@ #include "DNA_object_types.h" #include "BKE_customdata.h" +#include "BKE_deform.h" #include "BKE_editmesh.h" +#include "BKE_image.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" -#include "BKE_image.h" #include "BKE_mesh.h" #include "BKE_modifier.h" -#include "BKE_texture.h" -#include "BKE_deform.h" #include "BKE_object.h" +#include "BKE_texture.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.c b/source/blender/modifiers/intern/MOD_dynamicpaint.c index dc9b2f763e0..457f47bf025 100644 --- a/source/blender/modifiers/intern/MOD_dynamicpaint.c +++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c @@ -23,10 +23,10 @@ #include "BLI_utildefines.h" #include "DNA_dynamicpaint_types.h" -#include "DNA_object_types.h" -#include "DNA_object_force_types.h" -#include "DNA_scene_types.h" #include "DNA_mesh_types.h" +#include "DNA_object_force_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BKE_dynamicpaint.h" #include "BKE_layer.h" diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c index e900b304c6f..d380747eb31 100644 --- a/source/blender/modifiers/intern/MOD_explode.c +++ b/source/blender/modifiers/intern/MOD_explode.c @@ -28,10 +28,10 @@ #include "BLI_math.h" #include "BLI_rand.h" -#include "DNA_meshdata_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" #include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BKE_deform.h" #include "BKE_lattice.h" diff --git a/source/blender/modifiers/intern/MOD_fluid.c b/source/blender/modifiers/intern/MOD_fluid.c index 16dfe5ffc40..1c2f0a413a7 100644 --- a/source/blender/modifiers/intern/MOD_fluid.c +++ b/source/blender/modifiers/intern/MOD_fluid.c @@ -28,16 +28,16 @@ #include "BLI_utildefines.h" #include "DNA_collection_types.h" +#include "DNA_fluid_types.h" +#include "DNA_mesh_types.h" +#include "DNA_object_force_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_fluid_types.h" -#include "DNA_object_force_types.h" -#include "DNA_mesh_types.h" +#include "BKE_fluid.h" #include "BKE_layer.h" #include "BKE_lib_query.h" #include "BKE_modifier.h" -#include "BKE_fluid.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/modifiers/intern/MOD_hook.c b/source/blender/modifiers/intern/MOD_hook.c index 78d29edfd98..1ae2c5e4424 100644 --- a/source/blender/modifiers/intern/MOD_hook.c +++ b/source/blender/modifiers/intern/MOD_hook.c @@ -30,13 +30,13 @@ #include "DNA_object_types.h" #include "BKE_action.h" +#include "BKE_colortools.h" +#include "BKE_deform.h" #include "BKE_editmesh.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_mesh.h" #include "BKE_modifier.h" -#include "BKE_deform.h" -#include "BKE_colortools.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/modifiers/intern/MOD_mask.cc b/source/blender/modifiers/intern/MOD_mask.cc index 0b2981fca36..3bdb5a3fd54 100644 --- a/source/blender/modifiers/intern/MOD_mask.cc +++ b/source/blender/modifiers/intern/MOD_mask.cc @@ -25,8 +25,8 @@ #include "BLI_utildefines.h" -#include "BLI_listbase.h" #include "BLI_ghash.h" +#include "BLI_listbase.h" #include "DNA_armature_types.h" #include "DNA_mesh_types.h" @@ -36,10 +36,10 @@ #include "BKE_action.h" /* BKE_pose_channel_find_name */ #include "BKE_customdata.h" +#include "BKE_deform.h" #include "BKE_lib_query.h" #include "BKE_mesh.h" #include "BKE_modifier.h" -#include "BKE_deform.h" #include "DEG_depsgraph_build.h" #include "DEG_depsgraph_query.h" @@ -47,8 +47,8 @@ #include "MOD_modifiertypes.h" #include "BLI_array_cxx.h" -#include "BLI_vector.h" #include "BLI_listbase_wrapper.h" +#include "BLI_vector.h" using BLI::Array; using BLI::ArrayRef; diff --git a/source/blender/modifiers/intern/MOD_meshcache.c b/source/blender/modifiers/intern/MOD_meshcache.c index e01f07584ee..c2cbddf806c 100644 --- a/source/blender/modifiers/intern/MOD_meshcache.c +++ b/source/blender/modifiers/intern/MOD_meshcache.c @@ -26,10 +26,10 @@ #include "BLI_path_util.h" #include "BLI_string.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BKE_main.h" #include "BKE_mesh.h" diff --git a/source/blender/modifiers/intern/MOD_meshcache_mdd.c b/source/blender/modifiers/intern/MOD_meshcache_mdd.c index f3cb1469d8b..60376f61708 100644 --- a/source/blender/modifiers/intern/MOD_meshcache_mdd.c +++ b/source/blender/modifiers/intern/MOD_meshcache_mdd.c @@ -18,9 +18,9 @@ * \ingroup modifiers */ +#include #include #include -#include #include "BLI_utildefines.h" diff --git a/source/blender/modifiers/intern/MOD_meshcache_pc2.c b/source/blender/modifiers/intern/MOD_meshcache_pc2.c index 8d4b4a6dfdd..60011458c67 100644 --- a/source/blender/modifiers/intern/MOD_meshcache_pc2.c +++ b/source/blender/modifiers/intern/MOD_meshcache_pc2.c @@ -18,9 +18,9 @@ * \ingroup modifiers */ +#include #include #include -#include #include "BLI_utildefines.h" diff --git a/source/blender/modifiers/intern/MOD_meshdeform.c b/source/blender/modifiers/intern/MOD_meshdeform.c index 28299d78371..7125d0df3a1 100644 --- a/source/blender/modifiers/intern/MOD_meshdeform.c +++ b/source/blender/modifiers/intern/MOD_meshdeform.c @@ -31,14 +31,14 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "BKE_deform.h" +#include "BKE_editmesh.h" #include "BKE_global.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_mesh.h" #include "BKE_mesh_runtime.h" #include "BKE_modifier.h" -#include "BKE_deform.h" -#include "BKE_editmesh.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.c b/source/blender/modifiers/intern/MOD_meshsequencecache.c index e0c81b005fd..7357f18eb6a 100644 --- a/source/blender/modifiers/intern/MOD_meshsequencecache.c +++ b/source/blender/modifiers/intern/MOD_meshsequencecache.c @@ -20,8 +20,8 @@ #include -#include "BLI_utildefines.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "DNA_cachefile_types.h" #include "DNA_mesh_types.h" diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c index 45a2f619369..3b3dfa2bda2 100644 --- a/source/blender/modifiers/intern/MOD_mirror.c +++ b/source/blender/modifiers/intern/MOD_mirror.c @@ -27,12 +27,12 @@ #include "DNA_meshdata_types.h" #include "DNA_object_types.h" +#include "BKE_deform.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_mesh.h" #include "BKE_mesh_mirror.h" #include "BKE_modifier.h" -#include "BKE_deform.h" #include "bmesh.h" #include "bmesh_tools.h" diff --git a/source/blender/modifiers/intern/MOD_multires.c b/source/blender/modifiers/intern/MOD_multires.c index 2068c747f4e..742d100ac44 100644 --- a/source/blender/modifiers/intern/MOD_multires.c +++ b/source/blender/modifiers/intern/MOD_multires.c @@ -33,8 +33,8 @@ #include "BKE_cdderivedmesh.h" #include "BKE_mesh.h" -#include "BKE_multires.h" #include "BKE_modifier.h" +#include "BKE_multires.h" #include "BKE_paint.h" #include "BKE_subdiv.h" #include "BKE_subdiv_ccg.h" diff --git a/source/blender/modifiers/intern/MOD_normal_edit.c b/source/blender/modifiers/intern/MOD_normal_edit.c index ace0c1b5eaf..0b101b26906 100644 --- a/source/blender/modifiers/intern/MOD_normal_edit.c +++ b/source/blender/modifiers/intern/MOD_normal_edit.c @@ -27,14 +27,14 @@ #include "BLI_bitmap.h" #include "BLI_math.h" -#include "DNA_object_types.h" -#include "DNA_meshdata_types.h" #include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_object_types.h" +#include "BKE_deform.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_mesh.h" -#include "BKE_deform.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c index fec04e9916d..fddfc74f267 100644 --- a/source/blender/modifiers/intern/MOD_ocean.c +++ b/source/blender/modifiers/intern/MOD_ocean.c @@ -28,10 +28,10 @@ #include "BLI_task.h" #include "DNA_customdata_types.h" -#include "DNA_object_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "BKE_lib_id.h" diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c index d4a8f50f03f..8a4468ec91e 100644 --- a/source/blender/modifiers/intern/MOD_particleinstance.c +++ b/source/blender/modifiers/intern/MOD_particleinstance.c @@ -25,8 +25,8 @@ #include "BLI_utildefines.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_rand.h" #include "BLI_string.h" diff --git a/source/blender/modifiers/intern/MOD_particlesystem.c b/source/blender/modifiers/intern/MOD_particlesystem.c index 462f9a428f3..e6229e27e4b 100644 --- a/source/blender/modifiers/intern/MOD_particlesystem.c +++ b/source/blender/modifiers/intern/MOD_particlesystem.c @@ -29,8 +29,8 @@ #include "DNA_mesh_types.h" #include "BKE_editmesh.h" -#include "BKE_mesh.h" #include "BKE_lib_id.h" +#include "BKE_mesh.h" #include "BKE_modifier.h" #include "BKE_particle.h" diff --git a/source/blender/modifiers/intern/MOD_remesh.c b/source/blender/modifiers/intern/MOD_remesh.c index df84f3db55c..3300cda947c 100644 --- a/source/blender/modifiers/intern/MOD_remesh.c +++ b/source/blender/modifiers/intern/MOD_remesh.c @@ -26,10 +26,10 @@ #include "BLI_math_base.h" +#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_object_types.h" -#include "DNA_mesh_types.h" #include "MOD_modifiertypes.h" diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c index 460fd906986..8921ddb894f 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -26,8 +26,8 @@ #include "BLI_utildefines.h" -#include "BLI_math.h" #include "BLI_alloca.h" +#include "BLI_math.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" @@ -39,8 +39,8 @@ #include "DEG_depsgraph_build.h" #include "DEG_depsgraph_query.h" -#include "MOD_modifiertypes.h" #include "MEM_guardedalloc.h" +#include "MOD_modifiertypes.h" #include "BLI_strict_flags.h" diff --git a/source/blender/modifiers/intern/MOD_shapekey.c b/source/blender/modifiers/intern/MOD_shapekey.c index 69db6f5565d..25f702bf696 100644 --- a/source/blender/modifiers/intern/MOD_shapekey.c +++ b/source/blender/modifiers/intern/MOD_shapekey.c @@ -25,8 +25,8 @@ #include "BLI_math.h" -#include "DNA_mesh_types.h" #include "DNA_key_types.h" +#include "DNA_mesh_types.h" #include "BKE_key.h" #include "BKE_particle.h" diff --git a/source/blender/modifiers/intern/MOD_simpledeform.c b/source/blender/modifiers/intern/MOD_simpledeform.c index f38a50bd672..65ea6b95824 100644 --- a/source/blender/modifiers/intern/MOD_simpledeform.c +++ b/source/blender/modifiers/intern/MOD_simpledeform.c @@ -29,12 +29,12 @@ #include "DNA_meshdata_types.h" #include "DNA_object_types.h" +#include "BKE_deform.h" #include "BKE_editmesh.h" -#include "BKE_mesh.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" +#include "BKE_mesh.h" #include "BKE_modifier.h" -#include "BKE_deform.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c index b22874eb0bc..ec7c2b5b1a4 100644 --- a/source/blender/modifiers/intern/MOD_skin.c +++ b/source/blender/modifiers/intern/MOD_skin.c @@ -63,8 +63,8 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_object_types.h" #include "DNA_modifier_types.h" +#include "DNA_object_types.h" #include "BKE_deform.h" #include "BKE_lib_id.h" diff --git a/source/blender/modifiers/intern/MOD_smooth.c b/source/blender/modifiers/intern/MOD_smooth.c index 1a08083aa2f..2a0376fd291 100644 --- a/source/blender/modifiers/intern/MOD_smooth.c +++ b/source/blender/modifiers/intern/MOD_smooth.c @@ -30,11 +30,11 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "BKE_deform.h" #include "BKE_editmesh.h" #include "BKE_lib_id.h" #include "BKE_mesh.h" #include "BKE_particle.h" -#include "BKE_deform.h" #include "MOD_modifiertypes.h" #include "MOD_util.h" diff --git a/source/blender/modifiers/intern/MOD_softbody.c b/source/blender/modifiers/intern/MOD_softbody.c index af6de8447ec..679fdb634f4 100644 --- a/source/blender/modifiers/intern/MOD_softbody.c +++ b/source/blender/modifiers/intern/MOD_softbody.c @@ -25,9 +25,9 @@ #include "BLI_utildefines.h" -#include "DNA_scene_types.h" #include "DNA_mesh_types.h" #include "DNA_object_force_types.h" +#include "DNA_scene_types.h" #include "BKE_layer.h" #include "BKE_particle.h" diff --git a/source/blender/modifiers/intern/MOD_solidify_extrude.c b/source/blender/modifiers/intern/MOD_solidify_extrude.c index 0be674ea2e8..8febf78fef5 100644 --- a/source/blender/modifiers/intern/MOD_solidify_extrude.c +++ b/source/blender/modifiers/intern/MOD_solidify_extrude.c @@ -29,13 +29,13 @@ #include "MEM_guardedalloc.h" +#include "BKE_deform.h" #include "BKE_mesh.h" #include "BKE_particle.h" -#include "BKE_deform.h" #include "MOD_modifiertypes.h" -#include "MOD_util.h" #include "MOD_solidify_util.h" /* own include */ +#include "MOD_util.h" #ifdef __GNUC__ # pragma GCC diagnostic error "-Wsign-conversion" diff --git a/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c b/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c index 7dea4d2ccd7..23053adfd5a 100644 --- a/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c +++ b/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c @@ -27,13 +27,13 @@ #include "MEM_guardedalloc.h" +#include "BKE_deform.h" #include "BKE_mesh.h" #include "BKE_particle.h" -#include "BKE_deform.h" #include "MOD_modifiertypes.h" -#include "MOD_util.h" #include "MOD_solidify_util.h" /* Own include. */ +#include "MOD_util.h" #ifdef __GNUC__ # pragma GCC diagnostic error "-Wsign-conversion" diff --git a/source/blender/modifiers/intern/MOD_subsurf.c b/source/blender/modifiers/intern/MOD_subsurf.c index 5fcd9622c5d..56180564be2 100644 --- a/source/blender/modifiers/intern/MOD_subsurf.c +++ b/source/blender/modifiers/intern/MOD_subsurf.c @@ -27,9 +27,9 @@ #include "BLI_utildefines.h" +#include "DNA_mesh_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_mesh_types.h" #include "BKE_scene.h" #include "BKE_subdiv.h" diff --git a/source/blender/modifiers/intern/MOD_surface.c b/source/blender/modifiers/intern/MOD_surface.c index a9c91e6188d..0e318e9b092 100644 --- a/source/blender/modifiers/intern/MOD_surface.c +++ b/source/blender/modifiers/intern/MOD_surface.c @@ -25,10 +25,10 @@ #include "BLI_math.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BKE_bvhutils.h" #include "BKE_lib_id.h" diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.c b/source/blender/modifiers/intern/MOD_surfacedeform.c index 743c2227981..57e7e2fa98b 100644 --- a/source/blender/modifiers/intern/MOD_surfacedeform.c +++ b/source/blender/modifiers/intern/MOD_surfacedeform.c @@ -30,10 +30,10 @@ #include "DNA_scene_types.h" #include "BKE_bvhutils.h" -#include "BKE_mesh_runtime.h" #include "BKE_editmesh.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" +#include "BKE_mesh_runtime.h" #include "BKE_modifier.h" #include "DEG_depsgraph.h" diff --git a/source/blender/modifiers/intern/MOD_triangulate.c b/source/blender/modifiers/intern/MOD_triangulate.c index 94613353373..1e6bc2e1819 100644 --- a/source/blender/modifiers/intern/MOD_triangulate.c +++ b/source/blender/modifiers/intern/MOD_triangulate.c @@ -26,8 +26,8 @@ #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "BKE_modifier.h" #include "BKE_mesh.h" +#include "BKE_modifier.h" #include "bmesh.h" #include "bmesh_tools.h" diff --git a/source/blender/modifiers/intern/MOD_util.c b/source/blender/modifiers/intern/MOD_util.c index d234570a974..c0014a2c0cd 100644 --- a/source/blender/modifiers/intern/MOD_util.c +++ b/source/blender/modifiers/intern/MOD_util.c @@ -26,12 +26,12 @@ #include "BLI_utildefines.h" #include "BLI_bitmap.h" -#include "BLI_math_vector.h" #include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "DNA_image_types.h" -#include "DNA_meshdata_types.h" #include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -49,8 +49,8 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "MOD_util.h" #include "MOD_modifiertypes.h" +#include "MOD_util.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/modifiers/intern/MOD_uvproject.c b/source/blender/modifiers/intern/MOD_uvproject.c index b87bfa7190f..242f31b6434 100644 --- a/source/blender/modifiers/intern/MOD_uvproject.c +++ b/source/blender/modifiers/intern/MOD_uvproject.c @@ -28,9 +28,9 @@ #include "BLI_math.h" #include "BLI_uvproject.h" +#include "DNA_camera_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_camera_types.h" #include "DNA_object_types.h" #include "BKE_camera.h" diff --git a/source/blender/modifiers/intern/MOD_warp.c b/source/blender/modifiers/intern/MOD_warp.c index 9d037455579..4a98afbb91c 100644 --- a/source/blender/modifiers/intern/MOD_warp.c +++ b/source/blender/modifiers/intern/MOD_warp.c @@ -30,14 +30,14 @@ #include "DNA_meshdata_types.h" #include "DNA_object_types.h" +#include "BKE_colortools.h" +#include "BKE_deform.h" #include "BKE_editmesh.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_mesh.h" #include "BKE_modifier.h" -#include "BKE_deform.h" #include "BKE_texture.h" -#include "BKE_colortools.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/modifiers/intern/MOD_weightvgedit.c b/source/blender/modifiers/intern/MOD_weightvgedit.c index f914d05dbcd..6acbbefe745 100644 --- a/source/blender/modifiers/intern/MOD_weightvgedit.c +++ b/source/blender/modifiers/intern/MOD_weightvgedit.c @@ -44,8 +44,8 @@ #include "MEM_guardedalloc.h" -#include "MOD_weightvg_util.h" #include "MOD_modifiertypes.h" +#include "MOD_weightvg_util.h" /************************************** * Modifiers functions. * diff --git a/source/blender/modifiers/intern/MOD_weightvgmix.c b/source/blender/modifiers/intern/MOD_weightvgmix.c index 4aaa69912b2..4984853d41e 100644 --- a/source/blender/modifiers/intern/MOD_weightvgmix.c +++ b/source/blender/modifiers/intern/MOD_weightvgmix.c @@ -42,8 +42,8 @@ #include "MEM_guardedalloc.h" -#include "MOD_weightvg_util.h" #include "MOD_modifiertypes.h" +#include "MOD_weightvg_util.h" /** * This mixes the old weight with the new weight factor. diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c index 9403c2a837b..e2e8e732311 100644 --- a/source/blender/modifiers/intern/MOD_weightvgproximity.c +++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c @@ -49,9 +49,9 @@ #include "MEM_guardedalloc.h" -#include "MOD_weightvg_util.h" #include "MOD_modifiertypes.h" #include "MOD_util.h" +#include "MOD_weightvg_util.h" //#define USE_TIMEIT diff --git a/source/blender/modifiers/intern/MOD_weld.c b/source/blender/modifiers/intern/MOD_weld.c index 609c9c33d24..5d56152e0ff 100644 --- a/source/blender/modifiers/intern/MOD_weld.c +++ b/source/blender/modifiers/intern/MOD_weld.c @@ -40,10 +40,10 @@ #include "DNA_modifier_types.h" #include "DNA_object_types.h" -#include "BKE_deform.h" #include "BKE_bvhutils.h" -#include "BKE_modifier.h" +#include "BKE_deform.h" #include "BKE_mesh.h" +#include "BKE_modifier.h" #include "DEG_depsgraph.h" diff --git a/source/blender/nodes/composite/node_composite_tree.c b/source/blender/nodes/composite/node_composite_tree.c index 8c224eb335f..a830f5f1bf9 100644 --- a/source/blender/nodes/composite/node_composite_tree.c +++ b/source/blender/nodes/composite/node_composite_tree.c @@ -24,8 +24,8 @@ #include #include "DNA_color_types.h" -#include "DNA_scene_types.h" #include "DNA_node_types.h" +#include "DNA_scene_types.h" #include "BLT_translation.h" diff --git a/source/blender/nodes/composite/node_composite_util.h b/source/blender/nodes/composite/node_composite_util.h index c7785682865..4372ef78bc0 100644 --- a/source/blender/nodes/composite/node_composite_util.h +++ b/source/blender/nodes/composite/node_composite_util.h @@ -28,8 +28,8 @@ #include "DNA_movieclip_types.h" #include "DNA_node_types.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLT_translation.h" @@ -41,8 +41,8 @@ #include "node_util.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "RE_pipeline.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_common.c b/source/blender/nodes/composite/nodes/node_composite_common.c index 0736496a24f..15637506e77 100644 --- a/source/blender/nodes/composite/nodes/node_composite_common.c +++ b/source/blender/nodes/composite/nodes/node_composite_common.c @@ -24,9 +24,9 @@ #include "DNA_node_types.h" -#include "node_composite_util.h" #include "NOD_common.h" #include "node_common.h" +#include "node_composite_util.h" #include "BKE_node.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.c b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.c index dedede996cf..ce0c1a91072 100644 --- a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.c +++ b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.c @@ -21,11 +21,11 @@ * \ingroup cmpnodes */ -#include "node_composite_util.h" #include "BLI_assert.h" #include "BLI_dynstr.h" #include "BLI_hash_mm3.h" #include "BLI_utildefines.h" +#include "node_composite_util.h" /* this is taken from the cryptomatte specification 1.0 */ diff --git a/source/blender/nodes/composite/nodes/node_composite_image.c b/source/blender/nodes/composite/nodes/node_composite_image.c index 6b380bfb5af..cda142e1a8b 100644 --- a/source/blender/nodes/composite/nodes/node_composite_image.c +++ b/source/blender/nodes/composite/nodes/node_composite_image.c @@ -23,8 +23,8 @@ #include "node_composite_util.h" -#include "BLI_utildefines.h" #include "BLI_linklist.h" +#include "BLI_utildefines.h" #include "DNA_scene_types.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_outputFile.c b/source/blender/nodes/composite/nodes/node_composite_outputFile.c index af806a37341..4d23a4d2797 100644 --- a/source/blender/nodes/composite/nodes/node_composite_outputFile.c +++ b/source/blender/nodes/composite/nodes/node_composite_outputFile.c @@ -21,9 +21,9 @@ * \ingroup cmpnodes */ -#include -#include "BLI_utildefines.h" #include "BLI_string_utils.h" +#include "BLI_utildefines.h" +#include #include "BKE_context.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_splitViewer.c b/source/blender/nodes/composite/nodes/node_composite_splitViewer.c index 7a6ae3790d4..8afb3fd4841 100644 --- a/source/blender/nodes/composite/nodes/node_composite_splitViewer.c +++ b/source/blender/nodes/composite/nodes/node_composite_splitViewer.c @@ -23,8 +23,8 @@ #include "node_composite_util.h" -#include "BKE_image.h" #include "BKE_global.h" +#include "BKE_image.h" /* **************** SPLIT VIEWER ******************** */ static bNodeSocketTemplate cmp_node_splitviewer_in[] = { diff --git a/source/blender/nodes/composite/nodes/node_composite_viewer.c b/source/blender/nodes/composite/nodes/node_composite_viewer.c index 1bdf7a8ee7c..b5f74d5c937 100644 --- a/source/blender/nodes/composite/nodes/node_composite_viewer.c +++ b/source/blender/nodes/composite/nodes/node_composite_viewer.c @@ -23,8 +23,8 @@ #include "node_composite_util.h" -#include "BKE_image.h" #include "BKE_global.h" +#include "BKE_image.h" /* **************** VIEWER ******************** */ static bNodeSocketTemplate cmp_node_viewer_in[] = { diff --git a/source/blender/nodes/intern/node_common.c b/source/blender/nodes/intern/node_common.c index 7886fcf4f4d..765fa84439f 100644 --- a/source/blender/nodes/intern/node_common.c +++ b/source/blender/nodes/intern/node_common.c @@ -21,8 +21,8 @@ * \ingroup nodes */ -#include #include +#include #include "DNA_node_types.h" @@ -38,9 +38,9 @@ #include "MEM_guardedalloc.h" +#include "NOD_common.h" #include "node_common.h" #include "node_util.h" -#include "NOD_common.h" enum { REFINE_FORWARD = 1 << 0, diff --git a/source/blender/nodes/intern/node_socket.c b/source/blender/nodes/intern/node_socket.c index 15e41d03583..199b469781d 100644 --- a/source/blender/nodes/intern/node_socket.c +++ b/source/blender/nodes/intern/node_socket.c @@ -27,8 +27,8 @@ #include "BLI_listbase.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BKE_node.h" diff --git a/source/blender/nodes/shader/node_shader_tree.c b/source/blender/nodes/shader/node_shader_tree.c index 12763390506..983386cc380 100644 --- a/source/blender/nodes/shader/node_shader_tree.c +++ b/source/blender/nodes/shader/node_shader_tree.c @@ -24,27 +24,27 @@ #include #include "DNA_light_types.h" +#include "DNA_linestyle_types.h" #include "DNA_material_types.h" #include "DNA_node_types.h" #include "DNA_scene_types.h" #include "DNA_space_types.h" -#include "DNA_world_types.h" -#include "DNA_linestyle_types.h" #include "DNA_workspace_types.h" +#include "DNA_world_types.h" +#include "BLI_alloca.h" #include "BLI_linklist.h" #include "BLI_listbase.h" #include "BLI_threads.h" #include "BLI_utildefines.h" -#include "BLI_alloca.h" #include "BLT_translation.h" #include "BKE_context.h" +#include "BKE_lib_id.h" #include "BKE_linestyle.h" #include "BKE_node.h" #include "BKE_scene.h" -#include "BKE_lib_id.h" #include "RNA_access.h" @@ -56,8 +56,8 @@ #include "node_common.h" #include "node_exec.h" -#include "node_util.h" #include "node_shader_util.h" +#include "node_util.h" typedef struct nTreeTags { float ssr_id, sss_id; diff --git a/source/blender/nodes/shader/node_shader_util.h b/source/blender/nodes/shader/node_shader_util.h index 9719d0b36f5..8d525c8f23c 100644 --- a/source/blender/nodes/shader/node_shader_util.h +++ b/source/blender/nodes/shader/node_shader_util.h @@ -24,15 +24,15 @@ #ifndef __NODE_SHADER_UTIL_H__ #define __NODE_SHADER_UTIL_H__ -#include #include +#include #include #include "MEM_guardedalloc.h" +#include "DNA_ID.h" #include "DNA_color_types.h" #include "DNA_customdata_types.h" -#include "DNA_ID.h" #include "DNA_image_types.h" #include "DNA_material_types.h" #include "DNA_node_types.h" @@ -40,8 +40,8 @@ #include "DNA_scene_types.h" #include "DNA_texture_types.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_rand.h" #include "BLI_threads.h" #include "BLI_utildefines.h" diff --git a/source/blender/nodes/shader/nodes/node_shader_common.c b/source/blender/nodes/shader/nodes/node_shader_common.c index 257caabcabf..0ecb64cd1d1 100644 --- a/source/blender/nodes/shader/nodes/node_shader_common.c +++ b/source/blender/nodes/shader/nodes/node_shader_common.c @@ -28,10 +28,10 @@ #include "BKE_node.h" -#include "node_shader_util.h" #include "NOD_common.h" #include "node_common.h" #include "node_exec.h" +#include "node_shader_util.h" #include "RNA_access.h" diff --git a/source/blender/nodes/shader/nodes/node_shader_valToRgb.c b/source/blender/nodes/shader/nodes/node_shader_valToRgb.c index 56cd52705ab..49f9befdce3 100644 --- a/source/blender/nodes/shader/nodes/node_shader_valToRgb.c +++ b/source/blender/nodes/shader/nodes/node_shader_valToRgb.c @@ -21,8 +21,8 @@ * \ingroup shdnodes */ -#include "node_shader_util.h" #include "IMB_colormanagement.h" +#include "node_shader_util.h" /* **************** VALTORGB ******************** */ static bNodeSocketTemplate sh_node_valtorgb_in[] = { diff --git a/source/blender/nodes/texture/node_texture_tree.c b/source/blender/nodes/texture/node_texture_tree.c index 43deea9c2de..cf5d39847cf 100644 --- a/source/blender/nodes/texture/node_texture_tree.c +++ b/source/blender/nodes/texture/node_texture_tree.c @@ -23,9 +23,9 @@ #include -#include "DNA_texture_types.h" #include "DNA_node_types.h" #include "DNA_space_types.h" +#include "DNA_texture_types.h" #include "BLI_listbase.h" #include "BLI_threads.h" @@ -38,11 +38,11 @@ #include "BKE_node.h" #include "BKE_paint.h" +#include "NOD_texture.h" #include "node_common.h" #include "node_exec.h" -#include "node_util.h" -#include "NOD_texture.h" #include "node_texture_util.h" +#include "node_util.h" #include "DEG_depsgraph.h" diff --git a/source/blender/nodes/texture/node_texture_util.c b/source/blender/nodes/texture/node_texture_util.c index 844a45f8d8b..1d7641753e0 100644 --- a/source/blender/nodes/texture/node_texture_util.c +++ b/source/blender/nodes/texture/node_texture_util.c @@ -37,8 +37,8 @@ * over other previous ones. */ -#include #include "node_texture_util.h" +#include bool tex_node_poll_default(bNodeType *UNUSED(ntype), bNodeTree *ntree) { diff --git a/source/blender/nodes/texture/node_texture_util.h b/source/blender/nodes/texture/node_texture_util.h index f638bdb0eec..b3407f68857 100644 --- a/source/blender/nodes/texture/node_texture_util.h +++ b/source/blender/nodes/texture/node_texture_util.h @@ -29,8 +29,8 @@ #include "MEM_guardedalloc.h" -#include "DNA_color_types.h" #include "DNA_ID.h" +#include "DNA_color_types.h" #include "DNA_image_types.h" #include "DNA_material_types.h" #include "DNA_node_types.h" @@ -38,8 +38,8 @@ #include "DNA_scene_types.h" #include "DNA_texture_types.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_rand.h" #include "BLI_threads.h" #include "BLI_utildefines.h" @@ -53,13 +53,13 @@ #include "BKE_node.h" #include "BKE_texture.h" -#include "node_util.h" #include "NOD_texture.h" +#include "node_util.h" #include "BLT_translation.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "RE_pipeline.h" #include "RE_shader_ext.h" diff --git a/source/blender/nodes/texture/nodes/node_texture_at.c b/source/blender/nodes/texture/nodes/node_texture_at.c index 66fec2f3769..a6f8d28db75 100644 --- a/source/blender/nodes/texture/nodes/node_texture_at.c +++ b/source/blender/nodes/texture/nodes/node_texture_at.c @@ -21,8 +21,8 @@ * \ingroup texnodes */ -#include "node_texture_util.h" #include "NOD_texture.h" +#include "node_texture_util.h" static bNodeSocketTemplate inputs[] = { {SOCK_RGBA, N_("Texture"), 0.0f, 0.0f, 0.0f, 1.0f}, diff --git a/source/blender/nodes/texture/nodes/node_texture_bricks.c b/source/blender/nodes/texture/nodes/node_texture_bricks.c index b2ebc722204..72690d6ccfe 100644 --- a/source/blender/nodes/texture/nodes/node_texture_bricks.c +++ b/source/blender/nodes/texture/nodes/node_texture_bricks.c @@ -21,8 +21,8 @@ * \ingroup texnodes */ -#include "node_texture_util.h" #include "NOD_texture.h" +#include "node_texture_util.h" #include diff --git a/source/blender/nodes/texture/nodes/node_texture_checker.c b/source/blender/nodes/texture/nodes/node_texture_checker.c index 662a4cdeb20..e3c4d44e7f5 100644 --- a/source/blender/nodes/texture/nodes/node_texture_checker.c +++ b/source/blender/nodes/texture/nodes/node_texture_checker.c @@ -21,8 +21,8 @@ * \ingroup texnodes */ -#include "node_texture_util.h" #include "NOD_texture.h" +#include "node_texture_util.h" #include static bNodeSocketTemplate inputs[] = { diff --git a/source/blender/nodes/texture/nodes/node_texture_common.c b/source/blender/nodes/texture/nodes/node_texture_common.c index a505bed2458..c83166f5ed6 100644 --- a/source/blender/nodes/texture/nodes/node_texture_common.c +++ b/source/blender/nodes/texture/nodes/node_texture_common.c @@ -28,10 +28,10 @@ #include "BKE_node.h" -#include "node_texture_util.h" #include "NOD_common.h" #include "node_common.h" #include "node_exec.h" +#include "node_texture_util.h" #include "RNA_access.h" diff --git a/source/blender/nodes/texture/nodes/node_texture_compose.c b/source/blender/nodes/texture/nodes/node_texture_compose.c index 6339dfa6afd..ffa0e9ae43e 100644 --- a/source/blender/nodes/texture/nodes/node_texture_compose.c +++ b/source/blender/nodes/texture/nodes/node_texture_compose.c @@ -21,8 +21,8 @@ * \ingroup texnodes */ -#include "node_texture_util.h" #include "NOD_texture.h" +#include "node_texture_util.h" static bNodeSocketTemplate inputs[] = { {SOCK_FLOAT, N_("Red"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_UNSIGNED}, diff --git a/source/blender/nodes/texture/nodes/node_texture_coord.c b/source/blender/nodes/texture/nodes/node_texture_coord.c index d34aa36fefc..5a0cf5eb497 100644 --- a/source/blender/nodes/texture/nodes/node_texture_coord.c +++ b/source/blender/nodes/texture/nodes/node_texture_coord.c @@ -21,8 +21,8 @@ * \ingroup texnodes */ -#include "node_texture_util.h" #include "NOD_texture.h" +#include "node_texture_util.h" static bNodeSocketTemplate outputs[] = { {SOCK_VECTOR, N_("Coordinates")}, diff --git a/source/blender/nodes/texture/nodes/node_texture_curves.c b/source/blender/nodes/texture/nodes/node_texture_curves.c index 86141e1916f..d42985ba041 100644 --- a/source/blender/nodes/texture/nodes/node_texture_curves.c +++ b/source/blender/nodes/texture/nodes/node_texture_curves.c @@ -21,8 +21,8 @@ * \ingroup texnodes */ -#include "node_texture_util.h" #include "NOD_texture.h" +#include "node_texture_util.h" /* **************** CURVE Time ******************** */ diff --git a/source/blender/nodes/texture/nodes/node_texture_decompose.c b/source/blender/nodes/texture/nodes/node_texture_decompose.c index 2a992837272..83922ea03ab 100644 --- a/source/blender/nodes/texture/nodes/node_texture_decompose.c +++ b/source/blender/nodes/texture/nodes/node_texture_decompose.c @@ -21,8 +21,8 @@ * \ingroup texnodes */ -#include "node_texture_util.h" #include "NOD_texture.h" +#include "node_texture_util.h" #include static bNodeSocketTemplate inputs[] = { diff --git a/source/blender/nodes/texture/nodes/node_texture_distance.c b/source/blender/nodes/texture/nodes/node_texture_distance.c index 7673d74772e..489318514e5 100644 --- a/source/blender/nodes/texture/nodes/node_texture_distance.c +++ b/source/blender/nodes/texture/nodes/node_texture_distance.c @@ -21,10 +21,10 @@ * \ingroup texnodes */ -#include #include "BLI_math.h" -#include "node_texture_util.h" #include "NOD_texture.h" +#include "node_texture_util.h" +#include static bNodeSocketTemplate inputs[] = { {SOCK_VECTOR, N_("Coordinate 1"), 0.0f, 0.0f, 0.0f, 0.0f, -1.0f, 1.0f, PROP_NONE}, diff --git a/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c b/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c index 9490fbe79dd..759fb3d43d5 100644 --- a/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c +++ b/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c @@ -21,8 +21,8 @@ * \ingroup texnodes */ -#include "node_texture_util.h" #include "NOD_texture.h" +#include "node_texture_util.h" static bNodeSocketTemplate inputs[] = { {SOCK_FLOAT, N_("Hue"), 0.0f, 0.0f, 0.0f, 0.0f, -0.5f, 0.5f, PROP_NONE}, diff --git a/source/blender/nodes/texture/nodes/node_texture_image.c b/source/blender/nodes/texture/nodes/node_texture_image.c index 035514bf486..0d10b3270d7 100644 --- a/source/blender/nodes/texture/nodes/node_texture_image.c +++ b/source/blender/nodes/texture/nodes/node_texture_image.c @@ -21,8 +21,8 @@ * \ingroup texnodes */ -#include "node_texture_util.h" #include "NOD_texture.h" +#include "node_texture_util.h" static bNodeSocketTemplate outputs[] = { {SOCK_RGBA, N_("Image")}, diff --git a/source/blender/nodes/texture/nodes/node_texture_invert.c b/source/blender/nodes/texture/nodes/node_texture_invert.c index 361f94d7228..5d3f86c5c9c 100644 --- a/source/blender/nodes/texture/nodes/node_texture_invert.c +++ b/source/blender/nodes/texture/nodes/node_texture_invert.c @@ -21,8 +21,8 @@ * \ingroup texnodes */ -#include "node_texture_util.h" #include "NOD_texture.h" +#include "node_texture_util.h" /* **************** INVERT ******************** */ static bNodeSocketTemplate inputs[] = { diff --git a/source/blender/nodes/texture/nodes/node_texture_math.c b/source/blender/nodes/texture/nodes/node_texture_math.c index 334e3fef294..134a0ebb093 100644 --- a/source/blender/nodes/texture/nodes/node_texture_math.c +++ b/source/blender/nodes/texture/nodes/node_texture_math.c @@ -21,8 +21,8 @@ * \ingroup texnodes */ -#include "node_texture_util.h" #include "NOD_texture.h" +#include "node_texture_util.h" /* **************** SCALAR MATH ******************** */ static bNodeSocketTemplate inputs[] = { diff --git a/source/blender/nodes/texture/nodes/node_texture_mixRgb.c b/source/blender/nodes/texture/nodes/node_texture_mixRgb.c index e964aec86bb..b1aeb269018 100644 --- a/source/blender/nodes/texture/nodes/node_texture_mixRgb.c +++ b/source/blender/nodes/texture/nodes/node_texture_mixRgb.c @@ -21,8 +21,8 @@ * \ingroup texnodes */ -#include "node_texture_util.h" #include "NOD_texture.h" +#include "node_texture_util.h" /* **************** MIX RGB ******************** */ static bNodeSocketTemplate inputs[] = { diff --git a/source/blender/nodes/texture/nodes/node_texture_output.c b/source/blender/nodes/texture/nodes/node_texture_output.c index ed5c872ee13..b24781e032b 100644 --- a/source/blender/nodes/texture/nodes/node_texture_output.c +++ b/source/blender/nodes/texture/nodes/node_texture_output.c @@ -21,8 +21,8 @@ * \ingroup texnodes */ -#include "node_texture_util.h" #include "NOD_texture.h" +#include "node_texture_util.h" /* **************** COMPOSITE ******************** */ static bNodeSocketTemplate inputs[] = { diff --git a/source/blender/nodes/texture/nodes/node_texture_proc.c b/source/blender/nodes/texture/nodes/node_texture_proc.c index ac6a5e6e845..bb7ee5f5bff 100644 --- a/source/blender/nodes/texture/nodes/node_texture_proc.c +++ b/source/blender/nodes/texture/nodes/node_texture_proc.c @@ -21,8 +21,8 @@ * \ingroup texnodes */ -#include "node_texture_util.h" #include "NOD_texture.h" +#include "node_texture_util.h" #include "RE_shader_ext.h" diff --git a/source/blender/nodes/texture/nodes/node_texture_rotate.c b/source/blender/nodes/texture/nodes/node_texture_rotate.c index c005aedceb8..825f9d56147 100644 --- a/source/blender/nodes/texture/nodes/node_texture_rotate.c +++ b/source/blender/nodes/texture/nodes/node_texture_rotate.c @@ -23,8 +23,8 @@ #include -#include "node_texture_util.h" #include "NOD_texture.h" +#include "node_texture_util.h" static bNodeSocketTemplate inputs[] = { {SOCK_RGBA, N_("Color"), 0.0f, 0.0f, 0.0f, 1.0f}, diff --git a/source/blender/nodes/texture/nodes/node_texture_scale.c b/source/blender/nodes/texture/nodes/node_texture_scale.c index 57bfe4f42f8..d23b1b4d037 100644 --- a/source/blender/nodes/texture/nodes/node_texture_scale.c +++ b/source/blender/nodes/texture/nodes/node_texture_scale.c @@ -21,8 +21,8 @@ * \ingroup texnodes */ -#include #include "node_texture_util.h" +#include static bNodeSocketTemplate inputs[] = { {SOCK_RGBA, N_("Color"), 0.0f, 0.0f, 0.0f, 1.0f}, diff --git a/source/blender/nodes/texture/nodes/node_texture_texture.c b/source/blender/nodes/texture/nodes/node_texture_texture.c index 47c795907b6..9551a10ee57 100644 --- a/source/blender/nodes/texture/nodes/node_texture_texture.c +++ b/source/blender/nodes/texture/nodes/node_texture_texture.c @@ -21,8 +21,8 @@ * \ingroup texnodes */ -#include "node_texture_util.h" #include "NOD_texture.h" +#include "node_texture_util.h" #include "RE_shader_ext.h" diff --git a/source/blender/nodes/texture/nodes/node_texture_translate.c b/source/blender/nodes/texture/nodes/node_texture_translate.c index ae9ee60522a..2eef3132a18 100644 --- a/source/blender/nodes/texture/nodes/node_texture_translate.c +++ b/source/blender/nodes/texture/nodes/node_texture_translate.c @@ -21,9 +21,9 @@ * \ingroup texnodes */ -#include -#include "node_texture_util.h" #include "NOD_texture.h" +#include "node_texture_util.h" +#include static bNodeSocketTemplate inputs[] = { {SOCK_RGBA, N_("Color"), 0.0f, 0.0f, 0.0f, 1.0f}, diff --git a/source/blender/nodes/texture/nodes/node_texture_valToNor.c b/source/blender/nodes/texture/nodes/node_texture_valToNor.c index 009c5c783b7..2fb04777848 100644 --- a/source/blender/nodes/texture/nodes/node_texture_valToNor.c +++ b/source/blender/nodes/texture/nodes/node_texture_valToNor.c @@ -21,8 +21,8 @@ * \ingroup texnodes */ -#include "node_texture_util.h" #include "NOD_texture.h" +#include "node_texture_util.h" static bNodeSocketTemplate inputs[] = { {SOCK_FLOAT, N_("Val"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE}, diff --git a/source/blender/nodes/texture/nodes/node_texture_valToRgb.c b/source/blender/nodes/texture/nodes/node_texture_valToRgb.c index 7aabae6feeb..8d365e13fc4 100644 --- a/source/blender/nodes/texture/nodes/node_texture_valToRgb.c +++ b/source/blender/nodes/texture/nodes/node_texture_valToRgb.c @@ -21,9 +21,9 @@ * \ingroup texnodes */ -#include "node_texture_util.h" -#include "NOD_texture.h" #include "IMB_colormanagement.h" +#include "NOD_texture.h" +#include "node_texture_util.h" /* **************** VALTORGB ******************** */ static bNodeSocketTemplate valtorgb_in[] = { diff --git a/source/blender/nodes/texture/nodes/node_texture_viewer.c b/source/blender/nodes/texture/nodes/node_texture_viewer.c index 9f05f7ab70f..c96ff2062cb 100644 --- a/source/blender/nodes/texture/nodes/node_texture_viewer.c +++ b/source/blender/nodes/texture/nodes/node_texture_viewer.c @@ -21,8 +21,8 @@ * \ingroup texnodes */ -#include "node_texture_util.h" #include "NOD_texture.h" +#include "node_texture_util.h" #include static bNodeSocketTemplate inputs[] = { diff --git a/source/blender/physics/intern/BPH_mass_spring.cpp b/source/blender/physics/intern/BPH_mass_spring.cpp index 8f079a75f14..20dc4d5c5a8 100644 --- a/source/blender/physics/intern/BPH_mass_spring.cpp +++ b/source/blender/physics/intern/BPH_mass_spring.cpp @@ -25,14 +25,14 @@ extern "C" { #include "DNA_cloth_types.h" -#include "DNA_scene_types.h" -#include "DNA_object_force_types.h" -#include "DNA_object_types.h" #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" +#include "DNA_object_force_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" -#include "BLI_math.h" #include "BLI_linklist.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "BKE_cloth.h" diff --git a/source/blender/physics/intern/hair_volume.cpp b/source/blender/physics/intern/hair_volume.cpp index 88913eef7df..b8783c51fe8 100644 --- a/source/blender/physics/intern/hair_volume.cpp +++ b/source/blender/physics/intern/hair_volume.cpp @@ -32,8 +32,8 @@ extern "C" { #include "BKE_effect.h" } -#include "implicit.h" #include "eigen_utils.h" +#include "implicit.h" /* ================ Volumetric Hair Interaction ================ * adapted from diff --git a/source/blender/physics/intern/implicit_blender.c b/source/blender/physics/intern/implicit_blender.c index fd9903baa41..b1afaa52ef2 100644 --- a/source/blender/physics/intern/implicit_blender.c +++ b/source/blender/physics/intern/implicit_blender.c @@ -27,10 +27,10 @@ # include "MEM_guardedalloc.h" -# include "DNA_scene_types.h" -# include "DNA_object_types.h" -# include "DNA_object_force_types.h" # include "DNA_meshdata_types.h" +# include "DNA_object_force_types.h" +# include "DNA_object_types.h" +# include "DNA_scene_types.h" # include "DNA_texture_types.h" # include "BLI_math.h" diff --git a/source/blender/physics/intern/implicit_eigen.cpp b/source/blender/physics/intern/implicit_eigen.cpp index b801e851b90..58538c13116 100644 --- a/source/blender/physics/intern/implicit_eigen.cpp +++ b/source/blender/physics/intern/implicit_eigen.cpp @@ -63,14 +63,14 @@ # include "MEM_guardedalloc.h" extern "C" { -# include "DNA_scene_types.h" -# include "DNA_object_types.h" -# include "DNA_object_force_types.h" # include "DNA_meshdata_types.h" +# include "DNA_object_force_types.h" +# include "DNA_object_types.h" +# include "DNA_scene_types.h" # include "DNA_texture_types.h" -# include "BLI_math.h" # include "BLI_linklist.h" +# include "BLI_math.h" # include "BLI_utildefines.h" # include "BKE_cloth.h" diff --git a/source/blender/python/bmesh/bmesh_py_api.c b/source/blender/python/bmesh/bmesh_py_api.c index 7f5b10e6759..c6fd4bf0644 100644 --- a/source/blender/python/bmesh/bmesh_py_api.c +++ b/source/blender/python/bmesh/bmesh_py_api.c @@ -30,13 +30,13 @@ #include "bmesh.h" #include "bmesh_py_types.h" -#include "bmesh_py_types_select.h" #include "bmesh_py_types_customdata.h" #include "bmesh_py_types_meshdata.h" +#include "bmesh_py_types_select.h" +#include "bmesh_py_geometry.h" #include "bmesh_py_ops.h" #include "bmesh_py_utils.h" -#include "bmesh_py_geometry.h" #include "BKE_editmesh.h" diff --git a/source/blender/python/bmesh/bmesh_py_geometry.c b/source/blender/python/bmesh/bmesh_py_geometry.c index 2429d2a4888..f5090cd568b 100644 --- a/source/blender/python/bmesh/bmesh_py_geometry.c +++ b/source/blender/python/bmesh/bmesh_py_geometry.c @@ -31,8 +31,8 @@ #include "../mathutils/mathutils.h" #include "bmesh.h" -#include "bmesh_py_types.h" #include "bmesh_py_geometry.h" /* own include */ +#include "bmesh_py_types.h" PyDoc_STRVAR(bpy_bm_geometry_intersect_face_point_doc, ".. method:: intersect_face_point(face, point)\n" diff --git a/source/blender/python/bmesh/bmesh_py_ops.c b/source/blender/python/bmesh/bmesh_py_ops.c index 4708736ca27..1eccfe06d15 100644 --- a/source/blender/python/bmesh/bmesh_py_ops.c +++ b/source/blender/python/bmesh/bmesh_py_ops.c @@ -26,15 +26,15 @@ #include -#include "BLI_utildefines.h" #include "BLI_dynstr.h" +#include "BLI_utildefines.h" #include "MEM_guardedalloc.h" #include "bmesh.h" -#include "bmesh_py_ops_call.h" #include "bmesh_py_ops.h" /* own include */ +#include "bmesh_py_ops_call.h" /* bmesh operator 'bmesh.ops.*' callable types * ******************************************* */ diff --git a/source/blender/python/bmesh/bmesh_py_ops_call.c b/source/blender/python/bmesh/bmesh_py_ops_call.c index f44fa2aeac3..b1e5c1c761b 100644 --- a/source/blender/python/bmesh/bmesh_py_ops_call.c +++ b/source/blender/python/bmesh/bmesh_py_ops_call.c @@ -37,8 +37,8 @@ #include "bmesh_py_types.h" -#include "../generic/python_utildefines.h" #include "../generic/py_capi_utils.h" +#include "../generic/python_utildefines.h" BLI_STATIC_ASSERT(sizeof(PyC_FlagSet) == sizeof(BMO_FlagSet), "size mismatch"); diff --git a/source/blender/python/bmesh/bmesh_py_types.c b/source/blender/python/bmesh/bmesh_py_types.c index 12ae18a5bf5..fccdfe7fbdc 100644 --- a/source/blender/python/bmesh/bmesh_py_types.c +++ b/source/blender/python/bmesh/bmesh_py_types.c @@ -24,9 +24,9 @@ #include "BLI_math.h" #include "BLI_sort.h" +#include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_object_types.h" -#include "DNA_material_types.h" #include "BKE_customdata.h" #include "BKE_global.h" @@ -47,9 +47,9 @@ #include "../generic/python_utildefines.h" #include "bmesh_py_types.h" /* own include */ -#include "bmesh_py_types_select.h" #include "bmesh_py_types_customdata.h" #include "bmesh_py_types_meshdata.h" +#include "bmesh_py_types_select.h" static void bm_dealloc_editmode_warn(BPy_BMesh *self); diff --git a/source/blender/python/bmesh/bmesh_py_types_customdata.c b/source/blender/python/bmesh/bmesh_py_types_customdata.c index ce700849cf3..ffddfb4a7e1 100644 --- a/source/blender/python/bmesh/bmesh_py_types_customdata.c +++ b/source/blender/python/bmesh/bmesh_py_types_customdata.c @@ -26,8 +26,8 @@ #include -#include "BLI_utildefines.h" #include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "bmesh.h" @@ -35,9 +35,9 @@ #include "bmesh_py_types_customdata.h" #include "bmesh_py_types_meshdata.h" -#include "../mathutils/mathutils.h" -#include "../generic/python_utildefines.h" #include "../generic/py_capi_utils.h" +#include "../generic/python_utildefines.h" +#include "../mathutils/mathutils.h" #include "BKE_customdata.h" diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.c b/source/blender/python/bmesh/bmesh_py_types_meshdata.c index 321fc20c792..82b6cf5c3d5 100644 --- a/source/blender/python/bmesh/bmesh_py_types_meshdata.c +++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.c @@ -28,12 +28,12 @@ #include "../mathutils/mathutils.h" -#include "DNA_object_types.h" #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" -#include "BLI_utildefines.h" #include "BLI_math_base.h" #include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "BKE_deform.h" diff --git a/source/blender/python/bmesh/bmesh_py_types_select.c b/source/blender/python/bmesh/bmesh_py_types_select.c index dc0cf59d38c..5e064453a04 100644 --- a/source/blender/python/bmesh/bmesh_py_types_select.c +++ b/source/blender/python/bmesh/bmesh_py_types_select.c @@ -29,8 +29,8 @@ #include -#include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "bmesh.h" diff --git a/source/blender/python/bmesh/bmesh_py_utils.c b/source/blender/python/bmesh/bmesh_py_utils.c index 01f6cdf6e26..9b207693e37 100644 --- a/source/blender/python/bmesh/bmesh_py_utils.c +++ b/source/blender/python/bmesh/bmesh_py_utils.c @@ -26,8 +26,8 @@ #include -#include "BLI_utildefines.h" #include "BLI_math_base.h" +#include "BLI_utildefines.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/python/generic/blf_py_api.c b/source/blender/python/generic/blf_py_api.c index 269ff3b5d69..836f4f1a12c 100644 --- a/source/blender/python/generic/blf_py_api.c +++ b/source/blender/python/generic/blf_py_api.c @@ -23,8 +23,8 @@ /* Future-proof, See https://docs.python.org/3/c-api/arg.html#strings-and-buffers */ #define PY_SSIZE_T_CLEAN -#include #include "blf_py_api.h" +#include #include "../../blenfont/BLF_api.h" diff --git a/source/blender/python/generic/bpy_threads.c b/source/blender/python/generic/bpy_threads.c index 2474b08180f..1aa36a0e685 100644 --- a/source/blender/python/generic/bpy_threads.c +++ b/source/blender/python/generic/bpy_threads.c @@ -23,8 +23,8 @@ #include -#include "BLI_utildefines.h" #include "../BPY_extern.h" +#include "BLI_utildefines.h" /* analogue of PyEval_SaveThread() */ BPy_ThreadStatePtr BPY_thread_save(void) diff --git a/source/blender/python/generic/imbuf_py_api.c b/source/blender/python/generic/imbuf_py_api.c index 32fe522b84d..8a02638786d 100644 --- a/source/blender/python/generic/imbuf_py_api.c +++ b/source/blender/python/generic/imbuf_py_api.c @@ -22,9 +22,9 @@ #include -#include "BLI_utildefines.h" -#include "BLI_string.h" #include "BLI_rect.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" #include "py_capi_utils.h" @@ -36,9 +36,9 @@ #include "../../imbuf/IMB_imbuf_types.h" /* File IO */ -#include -#include #include "BLI_fileops.h" +#include +#include static PyObject *Py_ImBuf_CreatePyObject(ImBuf *ibuf); diff --git a/source/blender/python/gpu/gpu_py_batch.c b/source/blender/python/gpu/gpu_py_batch.c index f147b7de01d..b3df991cf12 100644 --- a/source/blender/python/gpu/gpu_py_batch.c +++ b/source/blender/python/gpu/gpu_py_batch.c @@ -39,10 +39,10 @@ #include "../generic/py_capi_utils.h" #include "gpu_py_api.h" +#include "gpu_py_batch.h" /* own include */ +#include "gpu_py_element.h" #include "gpu_py_shader.h" #include "gpu_py_vertex_buffer.h" -#include "gpu_py_element.h" -#include "gpu_py_batch.h" /* own include */ /* -------------------------------------------------------------------- */ /** \name Utility Functions diff --git a/source/blender/python/gpu/gpu_py_offscreen.c b/source/blender/python/gpu/gpu_py_offscreen.c index f128c46ec05..280f09d67c9 100644 --- a/source/blender/python/gpu/gpu_py_offscreen.c +++ b/source/blender/python/gpu/gpu_py_offscreen.c @@ -36,8 +36,8 @@ #include "BKE_lib_id.h" #include "BKE_scene.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" #include "DNA_view3d_types.h" #include "GPU_framebuffer.h" diff --git a/source/blender/python/gpu/gpu_py_types.h b/source/blender/python/gpu/gpu_py_types.h index 7e73f5b9084..d8048225604 100644 --- a/source/blender/python/gpu/gpu_py_types.h +++ b/source/blender/python/gpu/gpu_py_types.h @@ -21,12 +21,12 @@ #ifndef __GPU_PY_TYPES_H__ #define __GPU_PY_TYPES_H__ -#include "gpu_py_vertex_format.h" -#include "gpu_py_vertex_buffer.h" -#include "gpu_py_element.h" #include "gpu_py_batch.h" +#include "gpu_py_element.h" #include "gpu_py_offscreen.h" #include "gpu_py_shader.h" +#include "gpu_py_vertex_buffer.h" +#include "gpu_py_vertex_format.h" PyObject *BPyInit_gpu_types(void); diff --git a/source/blender/python/gpu/gpu_py_vertex_buffer.c b/source/blender/python/gpu/gpu_py_vertex_buffer.c index 9760c12d89f..57290fdc3c4 100644 --- a/source/blender/python/gpu/gpu_py_vertex_buffer.c +++ b/source/blender/python/gpu/gpu_py_vertex_buffer.c @@ -32,8 +32,8 @@ #include "../generic/py_capi_utils.h" #include "../generic/python_utildefines.h" -#include "gpu_py_vertex_format.h" #include "gpu_py_vertex_buffer.h" /* own include */ +#include "gpu_py_vertex_format.h" /* -------------------------------------------------------------------- */ /** \name Utility Functions diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c index 52b35478dd0..5a36535f3e3 100644 --- a/source/blender/python/intern/bpy.c +++ b/source/blender/python/intern/bpy.c @@ -24,26 +24,26 @@ #include -#include "BLI_utildefines.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BKE_appdir.h" -#include "BKE_global.h" /* XXX, G_MAIN only */ #include "BKE_blender_version.h" #include "BKE_bpath.h" +#include "BKE_global.h" /* XXX, G_MAIN only */ -#include "RNA_types.h" #include "RNA_access.h" +#include "RNA_types.h" #include "bpy.h" -#include "bpy_capi_utils.h" -#include "bpy_rna.h" #include "bpy_app.h" -#include "bpy_rna_id_collection.h" -#include "bpy_rna_gizmo.h" -#include "bpy_props.h" +#include "bpy_capi_utils.h" #include "bpy_library.h" #include "bpy_operator.h" +#include "bpy_props.h" +#include "bpy_rna.h" +#include "bpy_rna_gizmo.h" +#include "bpy_rna_id_collection.h" #include "bpy_utils_previews.h" #include "bpy_utils_units.h" diff --git a/source/blender/python/intern/bpy_app.c b/source/blender/python/intern/bpy_app.c index 9b7842460b5..a9bdef1c3e4 100644 --- a/source/blender/python/intern/bpy_app.c +++ b/source/blender/python/intern/bpy_app.c @@ -27,6 +27,7 @@ #include "bpy_app.h" #include "bpy_app_alembic.h" +#include "bpy_app_build_options.h" #include "bpy_app_ffmpeg.h" #include "bpy_app_ocio.h" #include "bpy_app_oiio.h" @@ -34,7 +35,6 @@ #include "bpy_app_openvdb.h" #include "bpy_app_sdl.h" #include "bpy_app_usd.h" -#include "bpy_app_build_options.h" #include "bpy_app_translations.h" diff --git a/source/blender/python/intern/bpy_app_alembic.c b/source/blender/python/intern/bpy_app_alembic.c index c02bb546553..dc7632baeef 100644 --- a/source/blender/python/intern/bpy_app_alembic.c +++ b/source/blender/python/intern/bpy_app_alembic.c @@ -21,8 +21,8 @@ * \ingroup pythonintern */ -#include #include "BLI_utildefines.h" +#include #include "bpy_app_alembic.h" diff --git a/source/blender/python/intern/bpy_app_ffmpeg.c b/source/blender/python/intern/bpy_app_ffmpeg.c index 7f12f7be7ab..193b0385044 100644 --- a/source/blender/python/intern/bpy_app_ffmpeg.c +++ b/source/blender/python/intern/bpy_app_ffmpeg.c @@ -18,8 +18,8 @@ * \ingroup pythonintern */ -#include #include "BLI_utildefines.h" +#include #include "bpy_app_ffmpeg.h" diff --git a/source/blender/python/intern/bpy_app_handlers.c b/source/blender/python/intern/bpy_app_handlers.c index 01618f0184a..28498e116df 100644 --- a/source/blender/python/intern/bpy_app_handlers.c +++ b/source/blender/python/intern/bpy_app_handlers.c @@ -22,15 +22,15 @@ * functions into (called via blenders generic BLI_cb api) */ -#include #include "BLI_utildefines.h" +#include #include "BKE_callbacks.h" -#include "RNA_types.h" #include "RNA_access.h" -#include "bpy_rna.h" +#include "RNA_types.h" #include "bpy_app_handlers.h" +#include "bpy_rna.h" #include "../generic/python_utildefines.h" diff --git a/source/blender/python/intern/bpy_app_ocio.c b/source/blender/python/intern/bpy_app_ocio.c index 750fe93d1de..bbfc734a77f 100644 --- a/source/blender/python/intern/bpy_app_ocio.c +++ b/source/blender/python/intern/bpy_app_ocio.c @@ -18,8 +18,8 @@ * \ingroup pythonintern */ -#include #include "BLI_utildefines.h" +#include #include "bpy_app_ocio.h" diff --git a/source/blender/python/intern/bpy_app_oiio.c b/source/blender/python/intern/bpy_app_oiio.c index 44ffce2ad07..1f65641606d 100644 --- a/source/blender/python/intern/bpy_app_oiio.c +++ b/source/blender/python/intern/bpy_app_oiio.c @@ -18,8 +18,8 @@ * \ingroup pythonintern */ -#include #include "BLI_utildefines.h" +#include #include "bpy_app_oiio.h" diff --git a/source/blender/python/intern/bpy_app_opensubdiv.c b/source/blender/python/intern/bpy_app_opensubdiv.c index 2b3c2f18e43..3f14c4dca57 100644 --- a/source/blender/python/intern/bpy_app_opensubdiv.c +++ b/source/blender/python/intern/bpy_app_opensubdiv.c @@ -18,8 +18,8 @@ * \ingroup pythonintern */ -#include #include "BLI_utildefines.h" +#include #include "bpy_app_opensubdiv.h" diff --git a/source/blender/python/intern/bpy_app_openvdb.c b/source/blender/python/intern/bpy_app_openvdb.c index 80732b7fecb..9958029dd0a 100644 --- a/source/blender/python/intern/bpy_app_openvdb.c +++ b/source/blender/python/intern/bpy_app_openvdb.c @@ -21,8 +21,8 @@ * \ingroup pythonintern */ -#include #include "BLI_utildefines.h" +#include #include "bpy_app_openvdb.h" diff --git a/source/blender/python/intern/bpy_app_sdl.c b/source/blender/python/intern/bpy_app_sdl.c index 1bc3d07473a..a3f9fdc67c1 100644 --- a/source/blender/python/intern/bpy_app_sdl.c +++ b/source/blender/python/intern/bpy_app_sdl.c @@ -18,8 +18,8 @@ * \ingroup pythonintern */ -#include #include "BLI_utildefines.h" +#include #include "bpy_app_sdl.h" diff --git a/source/blender/python/intern/bpy_app_timers.c b/source/blender/python/intern/bpy_app_timers.c index c3c56e4fb66..f1dd8b9e803 100644 --- a/source/blender/python/intern/bpy_app_timers.c +++ b/source/blender/python/intern/bpy_app_timers.c @@ -18,10 +18,10 @@ * \ingroup pythonintern */ -#include -#include "BLI_utildefines.h" #include "BLI_timer.h" +#include "BLI_utildefines.h" #include "PIL_time.h" +#include #include "BPY_extern.h" #include "bpy_app_timers.h" diff --git a/source/blender/python/intern/bpy_app_translations.c b/source/blender/python/intern/bpy_app_translations.c index 54699663b91..cf4550089ba 100644 --- a/source/blender/python/intern/bpy_app_translations.c +++ b/source/blender/python/intern/bpy_app_translations.c @@ -33,16 +33,16 @@ #include "MEM_guardedalloc.h" -#include "BLT_translation.h" #include "BLT_lang.h" +#include "BLT_translation.h" #include "RNA_types.h" #include "../generic/python_utildefines.h" #ifdef WITH_INTERNATIONAL -# include "BLI_string.h" # include "BLI_ghash.h" +# include "BLI_string.h" #endif typedef struct { diff --git a/source/blender/python/intern/bpy_app_usd.c b/source/blender/python/intern/bpy_app_usd.c index d87d218a5e5..d60264ef259 100644 --- a/source/blender/python/intern/bpy_app_usd.c +++ b/source/blender/python/intern/bpy_app_usd.c @@ -21,8 +21,8 @@ * \ingroup pythonintern */ -#include #include "BLI_utildefines.h" +#include #include "bpy_app_usd.h" diff --git a/source/blender/python/intern/bpy_capi_utils.c b/source/blender/python/intern/bpy_capi_utils.c index 2ff357896d5..f63b77e1726 100644 --- a/source/blender/python/intern/bpy_capi_utils.c +++ b/source/blender/python/intern/bpy_capi_utils.c @@ -23,15 +23,15 @@ #include -#include "BLI_utildefines.h" #include "BLI_dynstr.h" +#include "BLI_utildefines.h" #include "bpy_capi_utils.h" #include "MEM_guardedalloc.h" -#include "BKE_report.h" #include "BKE_context.h" +#include "BKE_report.h" #include "BLT_translation.h" diff --git a/source/blender/python/intern/bpy_gizmo_wrap.c b/source/blender/python/intern/bpy_gizmo_wrap.c index c66cad5f4a3..8ff3af59930 100644 --- a/source/blender/python/intern/bpy_gizmo_wrap.c +++ b/source/blender/python/intern/bpy_gizmo_wrap.c @@ -37,9 +37,9 @@ #include "RNA_define.h" #include "RNA_enum_types.h" -#include "bpy_rna.h" -#include "bpy_intern_string.h" #include "bpy_gizmo_wrap.h" /* own include */ +#include "bpy_intern_string.h" +#include "bpy_rna.h" /* we may want to add, but not now */ diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index 1e1a070208c..fdf7e127af9 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/source/blender/python/intern/bpy_interface.c @@ -30,22 +30,22 @@ #include "CLG_log.h" -#include "BLI_utildefines.h" -#include "BLI_path_util.h" #include "BLI_fileops.h" #include "BLI_listbase.h" +#include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_string_utf8.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include "RNA_types.h" #include "bpy.h" -#include "bpy_rna.h" -#include "bpy_path.h" #include "bpy_capi_utils.h" -#include "bpy_traceback.h" #include "bpy_intern_string.h" +#include "bpy_path.h" +#include "bpy_rna.h" +#include "bpy_traceback.h" #include "bpy_app_translations.h" @@ -66,12 +66,12 @@ #include "../generic/py_capi_utils.h" /* inittab initialization functions */ +#include "../bmesh/bmesh_py_api.h" #include "../generic/bgl.h" #include "../generic/blf_py_api.h" #include "../generic/idprop_py_api.h" #include "../generic/imbuf_py_api.h" #include "../gpu/gpu_py_api.h" -#include "../bmesh/bmesh_py_api.h" #include "../mathutils/mathutils.h" /* Logging types to use anywhere in the Python modules. */ diff --git a/source/blender/python/intern/bpy_interface_atexit.c b/source/blender/python/intern/bpy_interface_atexit.c index 4a43d4e6853..e69914671dd 100644 --- a/source/blender/python/intern/bpy_interface_atexit.c +++ b/source/blender/python/intern/bpy_interface_atexit.c @@ -26,8 +26,8 @@ #include "BLI_utildefines.h" -#include "bpy_capi_utils.h" #include "bpy.h" /* own include */ +#include "bpy_capi_utils.h" #include "WM_api.h" diff --git a/source/blender/python/intern/bpy_library_load.c b/source/blender/python/intern/bpy_library_load.c index 95f0daae862..14a4482f570 100644 --- a/source/blender/python/intern/bpy_library_load.c +++ b/source/blender/python/intern/bpy_library_load.c @@ -28,11 +28,11 @@ #include #include -#include "BLI_utildefines.h" #include "BLI_ghash.h" -#include "BLI_string.h" #include "BLI_linklist.h" #include "BLI_path_util.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_idcode.h" @@ -54,8 +54,8 @@ #define USE_RNA_DATABLOCKS #ifdef USE_RNA_DATABLOCKS -# include "bpy_rna.h" # include "RNA_access.h" +# include "bpy_rna.h" #endif typedef struct { diff --git a/source/blender/python/intern/bpy_library_write.c b/source/blender/python/intern/bpy_library_write.c index a1894b7f000..6c8f1deb126 100644 --- a/source/blender/python/intern/bpy_library_write.c +++ b/source/blender/python/intern/bpy_library_write.c @@ -26,9 +26,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_string.h" #include "BLI_path_util.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" #include "BKE_blendfile.h" #include "BKE_global.h" @@ -37,9 +37,9 @@ #include "RNA_types.h" -#include "bpy_rna.h" #include "bpy_capi_utils.h" #include "bpy_library.h" +#include "bpy_rna.h" #include "../generic/py_capi_utils.h" diff --git a/source/blender/python/intern/bpy_msgbus.c b/source/blender/python/intern/bpy_msgbus.c index 3d98a3879a3..c068182fe27 100644 --- a/source/blender/python/intern/bpy_msgbus.c +++ b/source/blender/python/intern/bpy_msgbus.c @@ -21,8 +21,8 @@ #include -#include "../generic/python_utildefines.h" #include "../generic/py_capi_utils.h" +#include "../generic/python_utildefines.h" #include "../mathutils/mathutils.h" #include "BLI_utildefines.h" @@ -30,17 +30,17 @@ #include "BKE_context.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "RNA_access.h" #include "RNA_define.h" #include "RNA_enum_types.h" #include "bpy_capi_utils.h" -#include "bpy_rna.h" -#include "bpy_intern_string.h" #include "bpy_gizmo_wrap.h" /* own include */ +#include "bpy_intern_string.h" +#include "bpy_rna.h" #include "bpy_msgbus.h" /* own include */ diff --git a/source/blender/python/intern/bpy_operator.c b/source/blender/python/intern/bpy_operator.c index 5e3b000c604..4b2b5f129a7 100644 --- a/source/blender/python/intern/bpy_operator.c +++ b/source/blender/python/intern/bpy_operator.c @@ -29,16 +29,16 @@ #include "RNA_types.h" -#include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" +#include "../generic/py_capi_utils.h" +#include "../generic/python_utildefines.h" #include "BPY_extern.h" +#include "bpy_capi_utils.h" #include "bpy_operator.h" #include "bpy_operator_wrap.h" #include "bpy_rna.h" /* for setting arg props only - pyrna_py_to_prop() */ -#include "bpy_capi_utils.h" -#include "../generic/py_capi_utils.h" -#include "../generic/python_utildefines.h" #include "RNA_access.h" #include "RNA_enum_types.h" @@ -50,8 +50,8 @@ #include "BLI_ghash.h" -#include "BKE_report.h" #include "BKE_context.h" +#include "BKE_report.h" /* so operators called can spawn threads which acquire the GIL */ #define BPY_RELEASE_GIL diff --git a/source/blender/python/intern/bpy_operator_wrap.c b/source/blender/python/intern/bpy_operator_wrap.c index 2e88a2a5b06..b7d3c99d3da 100644 --- a/source/blender/python/intern/bpy_operator_wrap.c +++ b/source/blender/python/intern/bpy_operator_wrap.c @@ -33,9 +33,9 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "bpy_rna.h" #include "bpy_intern_string.h" #include "bpy_operator_wrap.h" /* own include */ +#include "bpy_rna.h" static void operator_properties_init(wmOperatorType *ot) { diff --git a/source/blender/python/intern/bpy_props.c b/source/blender/python/intern/bpy_props.c index 4fd81a707fb..ade02780210 100644 --- a/source/blender/python/intern/bpy_props.c +++ b/source/blender/python/intern/bpy_props.c @@ -31,9 +31,9 @@ #include "BLI_utildefines.h" +#include "bpy_capi_utils.h" #include "bpy_props.h" #include "bpy_rna.h" -#include "bpy_capi_utils.h" #include "BKE_idprop.h" diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index 92230ece35e..8ec62c24c5f 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -26,46 +26,46 @@ #include -#include #include /* FLT_MIN/MAX */ +#include #include "RNA_types.h" #include "BLI_bitmap.h" #include "BLI_dynstr.h" -#include "BLI_string.h" #include "BLI_listbase.h" #include "BLI_math_rotation.h" +#include "BLI_string.h" #include "BLI_utildefines.h" #include "BPY_extern.h" #include "BPY_extern_clog.h" +#include "bpy_capi_utils.h" +#include "bpy_intern_string.h" +#include "bpy_props.h" #include "bpy_rna.h" #include "bpy_rna_anim.h" -#include "bpy_props.h" -#include "bpy_capi_utils.h" #include "bpy_rna_callback.h" -#include "bpy_intern_string.h" #ifdef USE_PYRNA_INVALIDATE_WEAKREF # include "BLI_ghash.h" #endif -#include "RNA_enum_types.h" -#include "RNA_define.h" /* RNA_def_property_free_identifier */ #include "RNA_access.h" +#include "RNA_define.h" /* RNA_def_property_free_identifier */ +#include "RNA_enum_types.h" #include "CLG_log.h" #include "MEM_guardedalloc.h" -#include "BKE_main.h" -#include "BKE_idcode.h" #include "BKE_context.h" #include "BKE_global.h" /* evil G.* */ -#include "BKE_report.h" +#include "BKE_idcode.h" #include "BKE_idprop.h" +#include "BKE_main.h" +#include "BKE_report.h" /* Only for types. */ #include "BKE_node.h" diff --git a/source/blender/python/intern/bpy_rna_anim.c b/source/blender/python/intern/bpy_rna_anim.c index d41ec59188c..0c640329efa 100644 --- a/source/blender/python/intern/bpy_rna_anim.c +++ b/source/blender/python/intern/bpy_rna_anim.c @@ -25,15 +25,15 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_string.h" #include "BLI_string_utils.h" +#include "BLI_utildefines.h" -#include "DNA_scene_types.h" #include "DNA_anim_types.h" +#include "DNA_scene_types.h" -#include "ED_keyframing.h" #include "ED_keyframes_edit.h" +#include "ED_keyframing.h" #include "BKE_animsys.h" #include "BKE_context.h" @@ -49,8 +49,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "bpy_rna.h" #include "bpy_capi_utils.h" +#include "bpy_rna.h" #include "bpy_rna_anim.h" #include "../generic/python_utildefines.h" diff --git a/source/blender/python/intern/bpy_rna_callback.c b/source/blender/python/intern/bpy_rna_callback.c index b321a482b1d..cc9f5746bba 100644 --- a/source/blender/python/intern/bpy_rna_callback.c +++ b/source/blender/python/intern/bpy_rna_callback.c @@ -27,12 +27,12 @@ #include "BLI_utildefines.h" +#include "bpy_capi_utils.h" #include "bpy_rna.h" #include "bpy_rna_callback.h" -#include "bpy_capi_utils.h" -#include "DNA_space_types.h" #include "DNA_screen_types.h" +#include "DNA_space_types.h" #include "RNA_access.h" #include "RNA_enum_types.h" diff --git a/source/blender/python/intern/bpy_rna_gizmo.c b/source/blender/python/intern/bpy_rna_gizmo.c index ec041b3054a..aff81c68358 100644 --- a/source/blender/python/intern/bpy_rna_gizmo.c +++ b/source/blender/python/intern/bpy_rna_gizmo.c @@ -25,8 +25,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_alloca.h" +#include "BLI_utildefines.h" #include "WM_api.h" #include "WM_types.h" @@ -38,8 +38,8 @@ #include "../generic/python_utildefines.h" #include "RNA_access.h" -#include "RNA_types.h" #include "RNA_enum_types.h" +#include "RNA_types.h" #include "bpy_rna.h" diff --git a/source/blender/python/intern/bpy_rna_id_collection.c b/source/blender/python/intern/bpy_rna_id_collection.c index 6344ed39b1b..6b6ffa97995 100644 --- a/source/blender/python/intern/bpy_rna_id_collection.c +++ b/source/blender/python/intern/bpy_rna_id_collection.c @@ -25,8 +25,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_bitmap.h" +#include "BLI_utildefines.h" #include "BKE_global.h" #include "BKE_lib_id.h" @@ -36,8 +36,8 @@ #include "DNA_ID.h" /* Those following are only to support hack of not listing some internal * 'backward' pointers in generated user_map. */ -#include "DNA_object_types.h" #include "DNA_key_types.h" +#include "DNA_object_types.h" #include "WM_api.h" #include "WM_types.h" @@ -49,8 +49,8 @@ #include "../generic/python_utildefines.h" #include "RNA_access.h" -#include "RNA_types.h" #include "RNA_enum_types.h" +#include "RNA_types.h" #include "bpy_rna.h" diff --git a/source/blender/python/intern/bpy_traceback.c b/source/blender/python/intern/bpy_traceback.c index 911e91e9e0f..e92a0b788ea 100644 --- a/source/blender/python/intern/bpy_traceback.c +++ b/source/blender/python/intern/bpy_traceback.c @@ -24,8 +24,8 @@ #include #include -#include "BLI_utildefines.h" #include "BLI_path_util.h" +#include "BLI_utildefines.h" #ifdef WIN32 # include "BLI_string.h" /* BLI_strcasecmp */ #endif diff --git a/source/blender/python/intern/bpy_utils_previews.c b/source/blender/python/intern/bpy_utils_previews.c index 7423e55d253..81b44dd5c43 100644 --- a/source/blender/python/intern/bpy_utils_previews.c +++ b/source/blender/python/intern/bpy_utils_previews.c @@ -28,12 +28,12 @@ #include "BLI_utildefines.h" -#include "RNA_types.h" #include "RNA_access.h" +#include "RNA_types.h" #include "BPY_extern.h" -#include "bpy_utils_previews.h" #include "bpy_rna.h" +#include "bpy_utils_previews.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/python/intern/bpy_utils_units.c b/source/blender/python/intern/bpy_utils_units.c index fb9a28be430..4433f5d0f88 100644 --- a/source/blender/python/intern/bpy_utils_units.c +++ b/source/blender/python/intern/bpy_utils_units.c @@ -27,8 +27,8 @@ #include #include -#include "BLI_utildefines.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "bpy_utils_units.h" diff --git a/source/blender/python/mathutils/mathutils.h b/source/blender/python/mathutils/mathutils.h index 70bd3a64481..c59fa75b651 100644 --- a/source/blender/python/mathutils/mathutils.h +++ b/source/blender/python/mathutils/mathutils.h @@ -69,11 +69,11 @@ typedef struct { } BaseMathObject; /* types */ -#include "mathutils_Vector.h" +#include "mathutils_Color.h" +#include "mathutils_Euler.h" #include "mathutils_Matrix.h" #include "mathutils_Quaternion.h" -#include "mathutils_Euler.h" -#include "mathutils_Color.h" +#include "mathutils_Vector.h" /* avoid checking all types */ #define BaseMathObject_CheckExact(v) (Py_TYPE(v)->tp_dealloc == (destructor)BaseMathObject_dealloc) diff --git a/source/blender/python/mathutils/mathutils_Color.c b/source/blender/python/mathutils/mathutils_Color.c index bf7fe0472d0..08dede8ff78 100644 --- a/source/blender/python/mathutils/mathutils_Color.c +++ b/source/blender/python/mathutils/mathutils_Color.c @@ -25,8 +25,8 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "../generic/python_utildefines.h" #include "../generic/py_capi_utils.h" +#include "../generic/python_utildefines.h" #ifndef MATH_STANDALONE # include "BLI_dynstr.h" diff --git a/source/blender/python/mathutils/mathutils_Euler.c b/source/blender/python/mathutils/mathutils_Euler.c index 4375ba31439..7ece587e38f 100644 --- a/source/blender/python/mathutils/mathutils_Euler.c +++ b/source/blender/python/mathutils/mathutils_Euler.c @@ -22,10 +22,10 @@ #include "mathutils.h" +#include "../generic/py_capi_utils.h" +#include "../generic/python_utildefines.h" #include "BLI_math.h" #include "BLI_utildefines.h" -#include "../generic/python_utildefines.h" -#include "../generic/py_capi_utils.h" #ifndef MATH_STANDALONE # include "BLI_dynstr.h" diff --git a/source/blender/python/mathutils/mathutils_Matrix.c b/source/blender/python/mathutils/mathutils_Matrix.c index 352d8326901..7a3a92d8a10 100644 --- a/source/blender/python/mathutils/mathutils_Matrix.c +++ b/source/blender/python/mathutils/mathutils_Matrix.c @@ -25,12 +25,12 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "../generic/python_utildefines.h" #include "../generic/py_capi_utils.h" +#include "../generic/python_utildefines.h" #ifndef MATH_STANDALONE -# include "BLI_string.h" # include "BLI_dynstr.h" +# include "BLI_string.h" #endif typedef enum eMatrixAccess_t { diff --git a/source/blender/python/mathutils/mathutils_Quaternion.c b/source/blender/python/mathutils/mathutils_Quaternion.c index 6a2a1161ca9..39d84c1ac96 100644 --- a/source/blender/python/mathutils/mathutils_Quaternion.c +++ b/source/blender/python/mathutils/mathutils_Quaternion.c @@ -25,8 +25,8 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "../generic/python_utildefines.h" #include "../generic/py_capi_utils.h" +#include "../generic/python_utildefines.h" #ifndef MATH_STANDALONE # include "BLI_dynstr.h" diff --git a/source/blender/python/mathutils/mathutils_bvhtree.c b/source/blender/python/mathutils/mathutils_bvhtree.c index ad88bd8cd84..5a0dc7d6a5e 100644 --- a/source/blender/python/mathutils/mathutils_bvhtree.c +++ b/source/blender/python/mathutils/mathutils_bvhtree.c @@ -25,12 +25,12 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_kdopbvh.h" -#include "BLI_polyfill_2d.h" -#include "BLI_math.h" #include "BLI_ghash.h" +#include "BLI_kdopbvh.h" +#include "BLI_math.h" #include "BLI_memarena.h" +#include "BLI_polyfill_2d.h" +#include "BLI_utildefines.h" #include "BKE_bvhutils.h" @@ -41,9 +41,9 @@ #include "mathutils_bvhtree.h" /* own include */ #ifndef MATH_STANDALONE -# include "DNA_object_types.h" # include "DNA_mesh_types.h" # include "DNA_meshdata_types.h" +# include "DNA_object_types.h" # include "BKE_customdata.h" # include "BKE_editmesh_bvh.h" diff --git a/source/blender/python/mathutils/mathutils_geometry.c b/source/blender/python/mathutils/mathutils_geometry.c index 6474275ecaf..105cf96a17e 100644 --- a/source/blender/python/mathutils/mathutils_geometry.c +++ b/source/blender/python/mathutils/mathutils_geometry.c @@ -25,13 +25,13 @@ /* Used for PolyFill */ #ifndef MATH_STANDALONE /* define when building outside blender */ -# include "MEM_guardedalloc.h" +# include "BKE_curve.h" +# include "BKE_displist.h" # include "BLI_blenlib.h" # include "BLI_boxpack_2d.h" # include "BLI_convexhull_2d.h" # include "BLI_delaunay_2d.h" -# include "BKE_displist.h" -# include "BKE_curve.h" +# include "MEM_guardedalloc.h" #endif #include "BLI_math.h" diff --git a/source/blender/python/mathutils/mathutils_kdtree.c b/source/blender/python/mathutils/mathutils_kdtree.c index ec35d25bdd5..c3e66546dae 100644 --- a/source/blender/python/mathutils/mathutils_kdtree.c +++ b/source/blender/python/mathutils/mathutils_kdtree.c @@ -25,8 +25,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_kdtree.h" +#include "BLI_utildefines.h" #include "../generic/py_capi_utils.h" #include "../generic/python_utildefines.h" diff --git a/source/blender/render/extern/include/RE_engine.h b/source/blender/render/extern/include/RE_engine.h index 38cba264a01..ac05c6c963c 100644 --- a/source/blender/render/extern/include/RE_engine.h +++ b/source/blender/render/extern/include/RE_engine.h @@ -25,10 +25,10 @@ #define __RE_ENGINE_H__ #include "DNA_listBase.h" -#include "DNA_scene_types.h" #include "DNA_node_types.h" -#include "RNA_types.h" +#include "DNA_scene_types.h" #include "RE_bake.h" +#include "RNA_types.h" #include "BLI_threads.h" diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h index 7816c72a033..319d8b1c2ed 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -24,9 +24,9 @@ #ifndef __RE_PIPELINE_H__ #define __RE_PIPELINE_H__ +#include "DEG_depsgraph.h" #include "DNA_listBase.h" #include "DNA_vec_types.h" -#include "DEG_depsgraph.h" struct Image; struct ImageFormatData; diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h index fd60e4ac0fc..1318e2498bb 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -28,8 +28,8 @@ /* exposed internal in render module only! */ /* ------------------------------------------------------------------------- */ -#include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BLI_threads.h" diff --git a/source/blender/render/intern/source/bake_api.c b/source/blender/render/intern/source/bake_api.c index ca6ae3fb78c..e823a481d59 100644 --- a/source/blender/render/intern/source/bake_api.c +++ b/source/blender/render/intern/source/bake_api.c @@ -75,12 +75,12 @@ #include "BKE_image.h" #include "BKE_lib_id.h" #include "BKE_mesh.h" -#include "BKE_mesh_tangent.h" #include "BKE_mesh_runtime.h" +#include "BKE_mesh_tangent.h" #include "BKE_node.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "RE_bake.h" diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c index 4fcb5f5f16e..7c071bb6b04 100644 --- a/source/blender/render/intern/source/external_engine.c +++ b/source/blender/render/intern/source/external_engine.c @@ -29,17 +29,17 @@ #include "BLT_translation.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_rect.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "DNA_object_types.h" #include "BKE_camera.h" -#include "BKE_global.h" #include "BKE_colortools.h" +#include "BKE_global.h" #include "BKE_layer.h" #include "BKE_node.h" #include "BKE_report.h" @@ -55,16 +55,16 @@ # include "BPY_extern.h" #endif +#include "RE_bake.h" #include "RE_engine.h" #include "RE_pipeline.h" -#include "RE_bake.h" #include "DRW_engine.h" #include "initrender.h" -#include "renderpipeline.h" -#include "render_types.h" #include "render_result.h" +#include "render_types.h" +#include "renderpipeline.h" /* Render Engine Types */ diff --git a/source/blender/render/intern/source/imagetexture.c b/source/blender/render/intern/source/imagetexture.c index 253741401f1..7b28728cfe7 100644 --- a/source/blender/render/intern/source/imagetexture.c +++ b/source/blender/render/intern/source/imagetexture.c @@ -21,26 +21,26 @@ * \ingroup render */ +#include +#include +#include #include #include -#include -#include -#include #ifndef WIN32 # include #else # include #endif -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "DNA_image_types.h" #include "DNA_scene_types.h" #include "DNA_texture_types.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_threads.h" #include "BLI_utildefines.h" diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/source/initrender.c index e2e2e09d393..5a6ecfc3e20 100644 --- a/source/blender/render/intern/source/initrender.c +++ b/source/blender/render/intern/source/initrender.c @@ -24,15 +24,15 @@ /* Global includes */ #include +#include #include #include -#include #include "MEM_guardedalloc.h" -#include "BLI_math.h" -#include "BLI_ghash.h" #include "BLI_blenlib.h" +#include "BLI_ghash.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "DNA_camera_types.h" @@ -40,8 +40,8 @@ #include "BKE_camera.h" /* this module */ -#include "renderpipeline.h" #include "render_types.h" +#include "renderpipeline.h" /* Own includes */ #include "initrender.h" diff --git a/source/blender/render/intern/source/multires_bake.c b/source/blender/render/intern/source/multires_bake.c index 5421f487de5..7c301f7d591 100644 --- a/source/blender/render/intern/source/multires_bake.c +++ b/source/blender/render/intern/source/multires_bake.c @@ -25,12 +25,12 @@ #include "MEM_guardedalloc.h" -#include "DNA_object_types.h" #include "DNA_mesh_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_threads.h" #include "BKE_ccg.h" @@ -38,8 +38,8 @@ #include "BKE_image.h" #include "BKE_material.h" #include "BKE_mesh.h" -#include "BKE_multires.h" #include "BKE_modifier.h" +#include "BKE_multires.h" #include "BKE_subsurf.h" #include "DEG_depsgraph.h" @@ -48,8 +48,8 @@ #include "RE_pipeline.h" #include "RE_shader_ext.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" typedef void (*MPassKnownData)(DerivedMesh *lores_dm, DerivedMesh *hires_dm, diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 183ef89892e..ccf1d4031cd 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -21,12 +21,12 @@ * \ingroup render */ -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include #include "DNA_anim_types.h" #include "DNA_collection_types.h" @@ -40,14 +40,14 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" -#include "BLI_rect.h" -#include "BLI_listbase.h" -#include "BLI_string.h" -#include "BLI_path_util.h" -#include "BLI_timecode.h" #include "BLI_fileops.h" +#include "BLI_listbase.h" +#include "BLI_math.h" +#include "BLI_path_util.h" +#include "BLI_rect.h" +#include "BLI_string.h" #include "BLI_threads.h" +#include "BLI_timecode.h" #include "BLT_translation.h" @@ -77,11 +77,11 @@ #include "DEG_depsgraph_debug.h" #include "DEG_depsgraph_query.h" -#include "PIL_time.h" #include "IMB_colormanagement.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" #include "IMB_metadata.h" +#include "PIL_time.h" #include "RE_engine.h" #include "RE_pipeline.h" @@ -99,9 +99,9 @@ /* internal */ #include "initrender.h" -#include "renderpipeline.h" #include "render_result.h" #include "render_types.h" +#include "renderpipeline.h" /* render flow * diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c index ffc03dfa2ab..edade21fd27 100644 --- a/source/blender/render/intern/source/pointdensity.c +++ b/source/blender/render/intern/source/pointdensity.c @@ -22,17 +22,17 @@ */ #include -#include #include +#include #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" -#include "BLI_noise.h" #include "BLI_kdopbvh.h" -#include "BLI_utildefines.h" +#include "BLI_math.h" +#include "BLI_noise.h" #include "BLI_task.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -43,12 +43,12 @@ #include "DNA_texture_types.h" #include "BKE_colorband.h" +#include "BKE_colortools.h" #include "BKE_deform.h" #include "BKE_lattice.h" #include "BKE_object.h" #include "BKE_particle.h" #include "BKE_scene.h" -#include "BKE_colortools.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c index 0f39073c693..814e9b1c79e 100644 --- a/source/blender/render/intern/source/render_result.c +++ b/source/blender/render/intern/source/render_result.c @@ -21,22 +21,22 @@ * \ingroup render */ +#include #include #include #include -#include #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" -#include "BLI_listbase.h" #include "BLI_hash_md5.h" +#include "BLI_listbase.h" #include "BLI_path_util.h" #include "BLI_rect.h" #include "BLI_string.h" #include "BLI_string_utils.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include "BKE_appdir.h" #include "BKE_camera.h" @@ -45,9 +45,9 @@ #include "BKE_report.h" #include "BKE_scene.h" +#include "IMB_colormanagement.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "IMB_colormanagement.h" #include "intern/openexr/openexr_multi.h" diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c index fe162212b9c..22cc1f0eddf 100644 --- a/source/blender/render/intern/source/render_texture.c +++ b/source/blender/render/intern/source/render_texture.c @@ -21,10 +21,10 @@ * \ingroup render */ +#include #include #include #include -#include #include "BLI_math.h" #include "BLI_noise.h" @@ -32,16 +32,16 @@ #include "BLI_utildefines.h" #include "DNA_anim_types.h" -#include "DNA_texture_types.h" -#include "DNA_object_types.h" -#include "DNA_light_types.h" -#include "DNA_meshdata_types.h" -#include "DNA_material_types.h" #include "DNA_image_types.h" +#include "DNA_light_types.h" +#include "DNA_material_types.h" +#include "DNA_meshdata_types.h" #include "DNA_node_types.h" +#include "DNA_object_types.h" +#include "DNA_texture_types.h" -#include "IMB_imbuf_types.h" #include "IMB_colormanagement.h" +#include "IMB_imbuf_types.h" #include "BKE_image.h" #include "BKE_node.h" diff --git a/source/blender/shader_fx/intern/FX_shader_flip.c b/source/blender/shader_fx/intern/FX_shader_flip.c index 41ca903ee08..ddf4d201ca7 100644 --- a/source/blender/shader_fx/intern/FX_shader_flip.c +++ b/source/blender/shader_fx/intern/FX_shader_flip.c @@ -23,9 +23,9 @@ #include -#include "DNA_scene_types.h" -#include "DNA_object_types.h" #include "DNA_gpencil_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BLI_utildefines.h" diff --git a/source/blender/shader_fx/intern/FX_shader_glow.c b/source/blender/shader_fx/intern/FX_shader_glow.c index 8924a1ab8b9..a81e69e00a1 100644 --- a/source/blender/shader_fx/intern/FX_shader_glow.c +++ b/source/blender/shader_fx/intern/FX_shader_glow.c @@ -23,9 +23,9 @@ #include -#include "DNA_scene_types.h" -#include "DNA_object_types.h" #include "DNA_gpencil_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BLI_math.h" #include "BLI_utildefines.h" diff --git a/source/blender/shader_fx/intern/FX_shader_light.c b/source/blender/shader_fx/intern/FX_shader_light.c index 5bcc130eb78..c81d959ebe0 100644 --- a/source/blender/shader_fx/intern/FX_shader_light.c +++ b/source/blender/shader_fx/intern/FX_shader_light.c @@ -23,9 +23,9 @@ #include -#include "DNA_scene_types.h" -#include "DNA_object_types.h" #include "DNA_gpencil_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BLI_utildefines.h" diff --git a/source/blender/shader_fx/intern/FX_shader_shadow.c b/source/blender/shader_fx/intern/FX_shader_shadow.c index aa9da5ae9f1..6887e988fc7 100644 --- a/source/blender/shader_fx/intern/FX_shader_shadow.c +++ b/source/blender/shader_fx/intern/FX_shader_shadow.c @@ -23,9 +23,9 @@ #include -#include "DNA_scene_types.h" -#include "DNA_object_types.h" #include "DNA_gpencil_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BLI_utildefines.h" diff --git a/source/blender/shader_fx/intern/FX_shader_swirl.c b/source/blender/shader_fx/intern/FX_shader_swirl.c index 6884694e057..8e1e4a5e9fe 100644 --- a/source/blender/shader_fx/intern/FX_shader_swirl.c +++ b/source/blender/shader_fx/intern/FX_shader_swirl.c @@ -23,9 +23,9 @@ #include -#include "DNA_scene_types.h" -#include "DNA_object_types.h" #include "DNA_gpencil_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BLI_math_base.h" #include "BLI_utildefines.h" diff --git a/source/blender/shader_fx/intern/FX_shader_wave.c b/source/blender/shader_fx/intern/FX_shader_wave.c index 35d2e515f76..a4ad108bc94 100644 --- a/source/blender/shader_fx/intern/FX_shader_wave.c +++ b/source/blender/shader_fx/intern/FX_shader_wave.c @@ -23,9 +23,9 @@ #include -#include "DNA_scene_types.h" -#include "DNA_object_types.h" #include "DNA_gpencil_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BLI_utildefines.h" diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index 7426d64c769..a29ee4131cb 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -31,9 +31,9 @@ */ /* dna-savable wmStructs here */ +#include "BLI_compiler_attrs.h" #include "DNA_windowmanager_types.h" #include "WM_keymap.h" -#include "BLI_compiler_attrs.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/windowmanager/WM_keymap.h b/source/blender/windowmanager/WM_keymap.h index 1d8e6bb8772..2cf71dcf165 100644 --- a/source/blender/windowmanager/WM_keymap.h +++ b/source/blender/windowmanager/WM_keymap.h @@ -25,8 +25,8 @@ */ /* dna-savable wmStructs here */ -#include "DNA_windowmanager_types.h" #include "BLI_utildefines.h" +#include "DNA_windowmanager_types.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h index 1edfe252cf4..f27f3ccf71c 100644 --- a/source/blender/windowmanager/WM_types.h +++ b/source/blender/windowmanager/WM_types.h @@ -120,15 +120,15 @@ struct wmEvent; struct wmOperator; struct wmWindowManager; -#include "RNA_types.h" +#include "BLI_compiler_attrs.h" #include "DNA_listBase.h" #include "DNA_vec_types.h" -#include "BLI_compiler_attrs.h" +#include "RNA_types.h" /* exported types for WM */ +#include "gizmo/WM_gizmo_types.h" #include "wm_cursors.h" #include "wm_event_types.h" -#include "gizmo/WM_gizmo_types.h" /* Include external gizmo API's */ #include "gizmo/WM_gizmo_api.h" diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo.c index e2fb4dc3e0e..df571e84d31 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo.c @@ -35,8 +35,8 @@ #include "RNA_define.h" #include "BKE_global.h" -#include "BKE_main.h" #include "BKE_idprop.h" +#include "BKE_main.h" #include "WM_api.h" #include "WM_toolsystem.h" @@ -55,8 +55,8 @@ #include "wm.h" /* own includes */ -#include "wm_gizmo_wmapi.h" #include "wm_gizmo_intern.h" +#include "wm_gizmo_wmapi.h" static void wm_gizmo_register(wmGizmoGroup *gzgroup, wmGizmo *gz); diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c index 066aae9071c..ef270533855 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c @@ -52,8 +52,8 @@ #include "ED_undo.h" /* own includes */ -#include "wm_gizmo_wmapi.h" #include "wm_gizmo_intern.h" +#include "wm_gizmo_wmapi.h" #ifdef WITH_PYTHON # include "BPY_extern.h" diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c index dcc70222a48..560d73ec220 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c @@ -18,8 +18,8 @@ * \ingroup wm */ -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" #include "BKE_context.h" @@ -35,8 +35,8 @@ #include "wm.h" /* own includes */ -#include "wm_gizmo_wmapi.h" #include "wm_gizmo_intern.h" +#include "wm_gizmo_wmapi.h" /** \name GizmoGroup Type Append * diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c index d463f1df2e9..286afe42158 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c @@ -24,11 +24,11 @@ #include #include "BLI_buffer.h" +#include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_math_bits.h" #include "BLI_rect.h" -#include "BLI_ghash.h" #include "BKE_context.h" #include "BKE_global.h" @@ -55,8 +55,8 @@ #include "DEG_depsgraph.h" /* own includes */ -#include "wm_gizmo_wmapi.h" #include "wm_gizmo_intern.h" +#include "wm_gizmo_wmapi.h" /** * Store all gizmo-maps here. Anyone who wants to register a gizmo for a certain diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c index 469d24c109d..2dc03d1419c 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c @@ -28,8 +28,8 @@ #include "RNA_access.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "wm.h" @@ -38,8 +38,8 @@ #include "ED_view3d.h" /* own includes */ -#include "wm_gizmo_wmapi.h" #include "wm_gizmo_intern.h" +#include "wm_gizmo_wmapi.h" /* -------------------------------------------------------------------- */ /** \name Property Definition diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.c index 812dd8edd3c..93f3a04978f 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.c @@ -18,9 +18,9 @@ * \ingroup wm */ -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_main.h" @@ -42,8 +42,8 @@ #include "wm.h" /* own includes */ -#include "wm_gizmo_wmapi.h" #include "wm_gizmo_intern.h" +#include "wm_gizmo_wmapi.h" /** \name Gizmo Type Append * diff --git a/source/blender/windowmanager/intern/wm.c b/source/blender/windowmanager/intern/wm.c index 2a4ba7fdb8e..e9d2ee9c662 100644 --- a/source/blender/windowmanager/intern/wm.c +++ b/source/blender/windowmanager/intern/wm.c @@ -25,8 +25,8 @@ * Also Blenders main event loop (WM_main) */ -#include #include +#include #include "BLI_sys_types.h" @@ -34,8 +34,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_blenlib.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -49,15 +49,15 @@ #include "BKE_workspace.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" -#include "wm_window.h" -#include "wm_event_system.h" -#include "wm_draw.h" +#include "WM_types.h" #include "wm.h" +#include "wm_draw.h" +#include "wm_event_system.h" +#include "wm_window.h" -#include "ED_screen.h" #include "BKE_undo_system.h" +#include "ED_screen.h" #ifdef WITH_PYTHON # include "BPY_extern.h" diff --git a/source/blender/windowmanager/intern/wm_cursors.c b/source/blender/windowmanager/intern/wm_cursors.c index 06a6a9d039a..aa80064fae7 100644 --- a/source/blender/windowmanager/intern/wm_cursors.c +++ b/source/blender/windowmanager/intern/wm_cursors.c @@ -40,8 +40,8 @@ #include "BKE_global.h" #include "BKE_main.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "wm_cursors.h" #include "wm_window.h" diff --git a/source/blender/windowmanager/intern/wm_dragdrop.c b/source/blender/windowmanager/intern/wm_dragdrop.c index a45c8af0b5a..728bd7d1227 100644 --- a/source/blender/windowmanager/intern/wm_dragdrop.c +++ b/source/blender/windowmanager/intern/wm_dragdrop.c @@ -25,8 +25,8 @@ #include -#include "DNA_windowmanager_types.h" #include "DNA_screen_types.h" +#include "DNA_windowmanager_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c index 38cd667c422..b1cfb155df0 100644 --- a/source/blender/windowmanager/intern/wm_draw.c +++ b/source/blender/windowmanager/intern/wm_draw.c @@ -26,13 +26,13 @@ #include #include +#include "DNA_camera_types.h" #include "DNA_listBase.h" #include "DNA_object_types.h" -#include "DNA_camera_types.h" #include "DNA_screen_types.h" -#include "DNA_windowmanager_types.h" #include "DNA_userdef_types.h" #include "DNA_view3d_types.h" +#include "DNA_windowmanager_types.h" #include "MEM_guardedalloc.h" @@ -42,14 +42,14 @@ #include "BKE_context.h" #include "BKE_image.h" #include "BKE_main.h" -#include "BKE_screen.h" #include "BKE_scene.h" +#include "BKE_screen.h" #include "GHOST_C-api.h" #include "ED_node.h" -#include "ED_view3d.h" #include "ED_screen.h" +#include "ED_view3d.h" #include "GPU_draw.h" #include "GPU_framebuffer.h" @@ -61,13 +61,13 @@ #include "RE_engine.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "wm.h" #include "wm_draw.h" -#include "wm_window.h" #include "wm_event_system.h" #include "wm_surface.h" +#include "wm_window.h" #ifdef WITH_OPENSUBDIV # include "BKE_subsurf.h" diff --git a/source/blender/windowmanager/intern/wm_event_query.c b/source/blender/windowmanager/intern/wm_event_query.c index eaddbb25034..5b1c7680adc 100644 --- a/source/blender/windowmanager/intern/wm_event_query.c +++ b/source/blender/windowmanager/intern/wm_event_query.c @@ -27,14 +27,14 @@ #include #include "DNA_listBase.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" -#include "DNA_windowmanager_types.h" +#include "DNA_screen_types.h" #include "DNA_userdef_types.h" +#include "DNA_windowmanager_types.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index c14ae57d4a3..6f133e063f7 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -29,10 +29,10 @@ #include #include "DNA_listBase.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" -#include "DNA_windowmanager_types.h" +#include "DNA_screen_types.h" #include "DNA_userdef_types.h" +#include "DNA_windowmanager_types.h" #include "MEM_guardedalloc.h" @@ -42,14 +42,14 @@ #include "BLI_blenlib.h" #include "BLI_dynstr.h" -#include "BLI_utildefines.h" #include "BLI_math.h" #include "BLI_timer.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_customdata.h" -#include "BKE_idprop.h" #include "BKE_global.h" +#include "BKE_idprop.h" #include "BKE_main.h" #include "BKE_report.h" #include "BKE_scene.h" @@ -63,9 +63,9 @@ #include "ED_fileselect.h" #include "ED_info.h" #include "ED_screen.h" -#include "ED_view3d.h" -#include "ED_util.h" #include "ED_undo.h" +#include "ED_util.h" +#include "ED_view3d.h" #include "RNA_access.h" @@ -74,14 +74,14 @@ #include "PIL_time.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "wm.h" -#include "wm_window.h" #include "wm_event_system.h" #include "wm_event_types.h" +#include "wm_window.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index bfe36a8ab55..3f4d082f9f7 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -27,9 +27,9 @@ /* placed up here because of crappy * winsock stuff. */ +#include #include #include -#include #include "zlib.h" /* wm_read_exotic() */ @@ -42,19 +42,19 @@ # endif /* For SHGetSpecialFolderPath, has to be done before BLI_winstuff * because 'near' is disabled through BLI_windstuff */ -# include # include "BLI_winstuff.h" +# include #endif -#include "MEM_guardedalloc.h" #include "MEM_CacheLimiterC-Api.h" +#include "MEM_guardedalloc.h" #include "BLI_blenlib.h" #include "BLI_linklist.h" -#include "BLI_utildefines.h" -#include "BLI_timer.h" -#include "BLI_threads.h" #include "BLI_system.h" +#include "BLI_threads.h" +#include "BLI_timer.h" +#include "BLI_utildefines.h" #include BLI_SYSTEM_PID_H #include "BLT_translation.h" @@ -62,10 +62,10 @@ #include "BLF_api.h" #include "DNA_object_types.h" -#include "DNA_space_types.h" -#include "DNA_userdef_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" +#include "DNA_space_types.h" +#include "DNA_userdef_types.h" #include "DNA_windowmanager_types.h" #include "DNA_workspace_types.h" @@ -82,15 +82,15 @@ #include "BKE_main.h" #include "BKE_packedFile.h" #include "BKE_report.h" -#include "BKE_sound.h" #include "BKE_scene.h" #include "BKE_screen.h" +#include "BKE_sound.h" #include "BKE_undo_system.h" #include "BKE_workspace.h" #include "BLO_readfile.h" -#include "BLO_writefile.h" #include "BLO_undofile.h" /* to save from an undo memfile */ +#include "BLO_writefile.h" #include "RNA_access.h" #include "RNA_define.h" @@ -104,10 +104,10 @@ #include "ED_image.h" #include "ED_outliner.h" #include "ED_screen.h" +#include "ED_undo.h" +#include "ED_util.h" #include "ED_view3d.h" #include "ED_view3d_offscreen.h" -#include "ED_util.h" -#include "ED_undo.h" #include "GHOST_C-api.h" #include "GHOST_Path-api.h" @@ -127,14 +127,14 @@ #include "DEG_depsgraph.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "wm.h" +#include "wm_event_system.h" #include "wm_files.h" #include "wm_window.h" -#include "wm_event_system.h" static RecentFile *wm_file_history_find(const char *filepath); static void wm_history_file_free(RecentFile *recent); diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c index 73c7a6209ee..58eb194c7f7 100644 --- a/source/blender/windowmanager/intern/wm_files_link.c +++ b/source/blender/windowmanager/intern/wm_files_link.c @@ -23,28 +23,28 @@ * Functions for dealing with append/link operators and helpers. */ -#include -#include -#include -#include -#include #include +#include #include +#include +#include +#include +#include #include "MEM_guardedalloc.h" #include "DNA_ID.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" #include "DNA_windowmanager_types.h" -#include "BLI_blenlib.h" #include "BLI_bitmap.h" +#include "BLI_blenlib.h" +#include "BLI_ghash.h" #include "BLI_linklist.h" #include "BLI_math.h" #include "BLI_memarena.h" #include "BLI_utildefines.h" -#include "BLI_ghash.h" #include "BLO_readfile.h" diff --git a/source/blender/windowmanager/intern/wm_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c index ffb37544e49..71ae44297e7 100644 --- a/source/blender/windowmanager/intern/wm_gesture.c +++ b/source/blender/windowmanager/intern/wm_gesture.c @@ -24,17 +24,17 @@ */ #include "DNA_screen_types.h" -#include "DNA_vec_types.h" #include "DNA_userdef_types.h" +#include "DNA_vec_types.h" #include "DNA_windowmanager_types.h" #include "MEM_guardedalloc.h" #include "BLI_bitmap_draw_2d.h" #include "BLI_blenlib.h" +#include "BLI_lasso_2d.h" #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BLI_lasso_2d.h" #include "BKE_context.h" diff --git a/source/blender/windowmanager/intern/wm_gesture_ops.c b/source/blender/windowmanager/intern/wm_gesture_ops.c index 341bd4a16f7..11beb7d2fd5 100644 --- a/source/blender/windowmanager/intern/wm_gesture_ops.c +++ b/source/blender/windowmanager/intern/wm_gesture_ops.c @@ -35,12 +35,12 @@ #include "BKE_context.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "wm.h" -#include "wm_event_types.h" #include "wm_event_system.h" +#include "wm_event_types.h" #include "ED_screen.h" #include "ED_select_utils.h" diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 7b04b40e626..fda0cb70c5b 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -23,8 +23,8 @@ * Manage initializing resources and correctly shutting down. */ -#include #include +#include #include #ifdef _WIN32 @@ -45,36 +45,36 @@ #include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_threads.h" -#include "BLI_utildefines.h" #include "BLI_timer.h" +#include "BLI_utildefines.h" -#include "BLO_writefile.h" #include "BLO_undofile.h" +#include "BLO_writefile.h" -#include "BKE_blendfile.h" #include "BKE_blender.h" +#include "BKE_blendfile.h" #include "BKE_callbacks.h" #include "BKE_context.h" #include "BKE_font.h" #include "BKE_global.h" #include "BKE_icons.h" +#include "BKE_keyconfig.h" #include "BKE_lib_remap.h" #include "BKE_main.h" #include "BKE_mball_tessellate.h" #include "BKE_node.h" #include "BKE_report.h" -#include "BKE_screen.h" #include "BKE_scene.h" +#include "BKE_screen.h" #include "BKE_sound.h" -#include "BKE_keyconfig.h" #include "BKE_addon.h" #include "BKE_appdir.h" +#include "BKE_mask.h" /* free mask clipboard */ +#include "BKE_material.h" /* BKE_material_copybuf_clear */ #include "BKE_sequencer.h" /* free seq clipboard */ #include "BKE_studiolight.h" -#include "BKE_material.h" /* BKE_material_copybuf_clear */ #include "BKE_tracking.h" /* free tracking clipboard */ -#include "BKE_mask.h" /* free mask clipboard */ #include "RE_engine.h" #include "RE_pipeline.h" /* RE_ free stuff */ @@ -85,43 +85,43 @@ # include "BPY_extern.h" #endif -#include "GHOST_Path-api.h" #include "GHOST_C-api.h" +#include "GHOST_Path-api.h" #include "RNA_define.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" +#include "wm.h" #include "wm_cursors.h" #include "wm_event_system.h" -#include "wm.h" #include "wm_files.h" +#include "wm_platform_support.h" #include "wm_surface.h" #include "wm_window.h" -#include "wm_platform_support.h" #include "ED_anim_api.h" #include "ED_armature.h" #include "ED_gpencil.h" -#include "ED_keyframing.h" #include "ED_keyframes_edit.h" +#include "ED_keyframing.h" #include "ED_node.h" #include "ED_render.h" -#include "ED_space_api.h" #include "ED_screen.h" -#include "ED_util.h" +#include "ED_space_api.h" #include "ED_undo.h" +#include "ED_util.h" -#include "UI_interface.h" -#include "UI_resources.h" #include "BLF_api.h" #include "BLT_lang.h" +#include "UI_interface.h" +#include "UI_resources.h" -#include "GPU_material.h" #include "GPU_draw.h" #include "GPU_init_exit.h" +#include "GPU_material.h" #include "BKE_sound.h" #include "COM_compositor.h" diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c index 9dedab8cc55..33ea6dc54cc 100644 --- a/source/blender/windowmanager/intern/wm_jobs.c +++ b/source/blender/windowmanager/intern/wm_jobs.c @@ -38,8 +38,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "wm_event_types.h" #include "wm.h" +#include "wm_event_types.h" #include "PIL_time.h" diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index a8c52aa1314..c1a4595ec6b 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -32,18 +32,18 @@ #include "DNA_windowmanager_types.h" #include "DNA_workspace_types.h" -#include "MEM_guardedalloc.h" #include "CLG_log.h" +#include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BLF_api.h" #include "BKE_context.h" -#include "BKE_idprop.h" #include "BKE_global.h" +#include "BKE_idprop.h" #include "BKE_main.h" #include "BKE_screen.h" #include "BKE_workspace.h" diff --git a/source/blender/windowmanager/intern/wm_menu_type.c b/source/blender/windowmanager/intern/wm_menu_type.c index f657eb951bf..28dd1984bf0 100644 --- a/source/blender/windowmanager/intern/wm_menu_type.c +++ b/source/blender/windowmanager/intern/wm_menu_type.c @@ -27,8 +27,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_screen.h" diff --git a/source/blender/windowmanager/intern/wm_operator_props.c b/source/blender/windowmanager/intern/wm_operator_props.c index e11d636ffc9..93cd757ea93 100644 --- a/source/blender/windowmanager/intern/wm_operator_props.c +++ b/source/blender/windowmanager/intern/wm_operator_props.c @@ -26,8 +26,8 @@ #include "DNA_space_types.h" -#include "BLI_rect.h" #include "BLI_math_base.h" +#include "BLI_rect.h" #include "UI_resources.h" diff --git a/source/blender/windowmanager/intern/wm_operator_type.c b/source/blender/windowmanager/intern/wm_operator_type.c index 7244b0a0d9a..015f2b0448d 100644 --- a/source/blender/windowmanager/intern/wm_operator_type.c +++ b/source/blender/windowmanager/intern/wm_operator_type.c @@ -25,16 +25,16 @@ #include "CLG_log.h" #include "DNA_ID.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" #include "DNA_userdef_types.h" #include "DNA_windowmanager_types.h" #include "BLT_translation.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_idprop.h" diff --git a/source/blender/windowmanager/intern/wm_operator_utils.c b/source/blender/windowmanager/intern/wm_operator_utils.c index c3dab133e44..4a786329e1a 100644 --- a/source/blender/windowmanager/intern/wm_operator_utils.c +++ b/source/blender/windowmanager/intern/wm_operator_utils.c @@ -22,8 +22,8 @@ #include -#include "BLI_utildefines.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_global.h" diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index b67d05d8b7a..625e7878b07 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -24,13 +24,13 @@ * as well as some generic operators and shared operator properties. */ -#include -#include -#include -#include -#include #include +#include #include +#include +#include +#include +#include #ifdef WIN32 # include "GHOST_C-api.h" @@ -43,8 +43,8 @@ #include "DNA_ID.h" #include "DNA_brush_types.h" #include "DNA_object_types.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" #include "DNA_userdef_types.h" #include "DNA_windowmanager_types.h" diff --git a/source/blender/windowmanager/intern/wm_panel_type.c b/source/blender/windowmanager/intern/wm_panel_type.c index 4324ae03b2c..1d2fecd0de6 100644 --- a/source/blender/windowmanager/intern/wm_panel_type.c +++ b/source/blender/windowmanager/intern/wm_panel_type.c @@ -30,8 +30,8 @@ #include "DNA_windowmanager_types.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" #include "BKE_screen.h" diff --git a/source/blender/windowmanager/intern/wm_platform_support.c b/source/blender/windowmanager/intern/wm_platform_support.c index 73ba4b550c9..65e1cd45e02 100644 --- a/source/blender/windowmanager/intern/wm_platform_support.c +++ b/source/blender/windowmanager/intern/wm_platform_support.c @@ -25,12 +25,12 @@ #include -#include "BLI_sys_types.h" #include "BLI_dynstr.h" -#include "BLI_path_util.h" #include "BLI_fileops.h" -#include "BLI_string.h" #include "BLI_linklist.h" +#include "BLI_path_util.h" +#include "BLI_string.h" +#include "BLI_sys_types.h" #include "BLT_translation.h" diff --git a/source/blender/windowmanager/intern/wm_playanim.c b/source/blender/windowmanager/intern/wm_playanim.c index ac5fd522664..c6eb1393ffe 100644 --- a/source/blender/windowmanager/intern/wm_playanim.c +++ b/source/blender/windowmanager/intern/wm_playanim.c @@ -27,16 +27,16 @@ * this could be made into its own module, alongside creator. */ -#include #include +#include #include #include -#include +#include #ifndef WIN32 -# include # include # include +# include #else # include #endif @@ -44,30 +44,30 @@ #include "PIL_time.h" -#include "BLI_utildefines.h" #include "BLI_fileops.h" #include "BLI_listbase.h" #include "BLI_path_util.h" #include "BLI_string.h" +#include "BLI_utildefines.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "BKE_image.h" #include "BIF_glutil.h" #include "GPU_context.h" -#include "GPU_matrix.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" #include "GPU_init_exit.h" +#include "GPU_matrix.h" #include "GPU_state.h" +#include "BLF_api.h" #include "DNA_scene_types.h" #include "ED_datafiles.h" /* for fonts */ #include "GHOST_C-api.h" -#include "BLF_api.h" #include "DEG_depsgraph.h" diff --git a/source/blender/windowmanager/intern/wm_splash_screen.c b/source/blender/windowmanager/intern/wm_splash_screen.c index dcf09e9cbc5..9c7ed52b0f9 100644 --- a/source/blender/windowmanager/intern/wm_splash_screen.c +++ b/source/blender/windowmanager/intern/wm_splash_screen.c @@ -34,8 +34,8 @@ #include "CLG_log.h" #include "DNA_ID.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" #include "DNA_userdef_types.h" #include "DNA_windowmanager_types.h" @@ -49,8 +49,8 @@ #include "BLF_api.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "ED_screen.h" diff --git a/source/blender/windowmanager/intern/wm_surface.c b/source/blender/windowmanager/intern/wm_surface.c index cb575cc8f7d..043b584bbbd 100644 --- a/source/blender/windowmanager/intern/wm_surface.c +++ b/source/blender/windowmanager/intern/wm_surface.c @@ -28,14 +28,14 @@ #include "GHOST_C-api.h" #include "GPU_batch_presets.h" +#include "GPU_context.h" #include "GPU_framebuffer.h" #include "GPU_immediate.h" -#include "GPU_context.h" #include "MEM_guardedalloc.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "wm.h" #include "wm_surface.h" diff --git a/source/blender/windowmanager/intern/wm_toolsystem.c b/source/blender/windowmanager/intern/wm_toolsystem.c index e721fd21b88..4cfd1d1e0c0 100644 --- a/source/blender/windowmanager/intern/wm_toolsystem.c +++ b/source/blender/windowmanager/intern/wm_toolsystem.c @@ -26,16 +26,16 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_string.h" #include "BLI_listbase.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" #include "DNA_ID.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_space_types.h" #include "DNA_windowmanager_types.h" #include "DNA_workspace_types.h" -#include "DNA_object_types.h" #include "BKE_brush.h" #include "BKE_context.h" @@ -49,9 +49,9 @@ #include "RNA_enum_types.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" /* own include */ +#include "WM_types.h" static void toolsystem_reinit_with_toolref(bContext *C, WorkSpace *UNUSED(workspace), diff --git a/source/blender/windowmanager/intern/wm_uilist_type.c b/source/blender/windowmanager/intern/wm_uilist_type.c index e79f18eed6f..f886e01f5a3 100644 --- a/source/blender/windowmanager/intern/wm_uilist_type.c +++ b/source/blender/windowmanager/intern/wm_uilist_type.c @@ -26,8 +26,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" #include "BKE_screen.h" diff --git a/source/blender/windowmanager/intern/wm_utils.c b/source/blender/windowmanager/intern/wm_utils.c index b227065e3cf..163ab257beb 100644 --- a/source/blender/windowmanager/intern/wm_utils.c +++ b/source/blender/windowmanager/intern/wm_utils.c @@ -20,8 +20,8 @@ * Generic helper utilities that aren't associated with a particular area. */ -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index eaa0fa7b7a5..a3e1814f8d2 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -25,8 +25,8 @@ */ #include -#include #include +#include #include #include "DNA_listBase.h" @@ -38,8 +38,8 @@ #include "GHOST_C-api.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLT_translation.h" @@ -60,32 +60,32 @@ #include "WM_types.h" #include "wm.h" #include "wm_draw.h" +#include "wm_event_system.h" #include "wm_files.h" #include "wm_platform_support.h" #include "wm_window.h" #include "wm_window_private.h" -#include "wm_event_system.h" #include "ED_anim_api.h" +#include "ED_fileselect.h" #include "ED_render.h" #include "ED_scene.h" #include "ED_screen.h" -#include "ED_fileselect.h" #include "UI_interface.h" #include "UI_interface_icons.h" #include "PIL_time.h" +#include "BLF_api.h" #include "GPU_batch.h" #include "GPU_batch_presets.h" -#include "GPU_draw.h" -#include "GPU_platform.h" -#include "GPU_framebuffer.h" -#include "GPU_init_exit.h" -#include "GPU_immediate.h" #include "GPU_context.h" -#include "BLF_api.h" +#include "GPU_draw.h" +#include "GPU_framebuffer.h" +#include "GPU_immediate.h" +#include "GPU_init_exit.h" +#include "GPU_platform.h" #include "UI_resources.h" diff --git a/source/blender/windowmanager/intern/wm_xr.c b/source/blender/windowmanager/intern/wm_xr.c index ef6fa6d28f2..95c0f353298 100644 --- a/source/blender/windowmanager/intern/wm_xr.c +++ b/source/blender/windowmanager/intern/wm_xr.c @@ -58,8 +58,8 @@ #include "UI_interface.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "wm.h" #include "wm_surface.h" diff --git a/source/blender/windowmanager/message_bus/intern/wm_message_bus.c b/source/blender/windowmanager/message_bus/intern/wm_message_bus.c index 2cb8cc40995..fd5237a70a5 100644 --- a/source/blender/windowmanager/message_bus/intern/wm_message_bus.c +++ b/source/blender/windowmanager/message_bus/intern/wm_message_bus.c @@ -24,15 +24,15 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "WM_types.h" -#include "message_bus/wm_message_bus.h" #include "message_bus/intern/wm_message_bus_intern.h" +#include "message_bus/wm_message_bus.h" /* -------------------------------------------------------------------------- */ /** \name Public API diff --git a/source/blender/windowmanager/message_bus/intern/wm_message_bus_rna.c b/source/blender/windowmanager/message_bus/intern/wm_message_bus_rna.c index 97ca879736e..460dca57e4f 100644 --- a/source/blender/windowmanager/message_bus/intern/wm_message_bus_rna.c +++ b/source/blender/windowmanager/message_bus/intern/wm_message_bus_rna.c @@ -25,12 +25,12 @@ #include "DNA_ID.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "message_bus/intern/wm_message_bus_intern.h" #include "RNA_access.h" diff --git a/source/blender/windowmanager/message_bus/intern/wm_message_bus_static.c b/source/blender/windowmanager/message_bus/intern/wm_message_bus_static.c index f3784b35499..c47cec4b3e4 100644 --- a/source/blender/windowmanager/message_bus/intern/wm_message_bus_static.c +++ b/source/blender/windowmanager/message_bus/intern/wm_message_bus_static.c @@ -24,12 +24,12 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "message_bus/intern/wm_message_bus_intern.h" /* -------------------------------------------------------------------------- */ diff --git a/source/creator/creator.c b/source/creator/creator.c index 76b632ba060..a6c0e50e527 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -25,8 +25,8 @@ #include #ifdef WIN32 -# include # include "utfconv.h" +# include #endif #if defined(WITH_TBB_MALLOC) && defined(_MSC_VER) && defined(NDEBUG) @@ -41,10 +41,10 @@ #include "DNA_genfile.h" #include "BLI_args.h" -#include "BLI_threads.h" -#include "BLI_utildefines.h" #include "BLI_string.h" #include "BLI_system.h" +#include "BLI_threads.h" +#include "BLI_utildefines.h" /* mostly init functions */ #include "BKE_appdir.h" @@ -55,15 +55,15 @@ #include "BKE_context.h" #include "BKE_font.h" #include "BKE_global.h" +#include "BKE_gpencil_modifier.h" #include "BKE_idtype.h" +#include "BKE_image.h" #include "BKE_material.h" #include "BKE_modifier.h" -#include "BKE_gpencil_modifier.h" #include "BKE_node.h" +#include "BKE_particle.h" #include "BKE_shader_fx.h" #include "BKE_sound.h" -#include "BKE_image.h" -#include "BKE_particle.h" #include "BKE_volume.h" #include "DEG_depsgraph.h" diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c index 565cf60d2e1..7b5a448fc53 100644 --- a/source/creator/creator_args.c +++ b/source/creator/creator_args.c @@ -20,9 +20,9 @@ #ifndef WITH_PYTHON_MODULE +# include # include # include -# include # include "MEM_guardedalloc.h" @@ -33,15 +33,15 @@ # endif # include "BLI_args.h" -# include "BLI_threads.h" -# include "BLI_utildefines.h" +# include "BLI_fileops.h" # include "BLI_listbase.h" +# include "BLI_mempool.h" +# include "BLI_path_util.h" # include "BLI_string.h" # include "BLI_string_utf8.h" -# include "BLI_path_util.h" -# include "BLI_fileops.h" -# include "BLI_mempool.h" # include "BLI_system.h" +# include "BLI_threads.h" +# include "BLI_utildefines.h" # include "BLO_readfile.h" /* only for BLO_has_bfile_extension */ diff --git a/source/creator/creator_signals.c b/source/creator/creator_signals.c index dff23837203..7f7a03f0465 100644 --- a/source/creator/creator_signals.c +++ b/source/creator/creator_signals.c @@ -31,24 +31,24 @@ # endif # ifdef WIN32 -# include # include +# include # endif +# include # include # include -# include # include "BLI_sys_types.h" # ifdef WIN32 # include "BLI_winstuff.h" # endif -# include "BLI_utildefines.h" -# include "BLI_string.h" -# include "BLI_path_util.h" # include "BLI_fileops.h" +# include "BLI_path_util.h" +# include "BLI_string.h" # include "BLI_system.h" +# include "BLI_utildefines.h" # include BLI_SYSTEM_PID_H # include "BKE_appdir.h" /* BKE_tempdir_base */ diff --git a/tests/gtests/alembic/abc_export_test.cc b/tests/gtests/alembic/abc_export_test.cc index 3bddd2df6ba..238fab2f872 100644 --- a/tests/gtests/alembic/abc_export_test.cc +++ b/tests/gtests/alembic/abc_export_test.cc @@ -1,13 +1,13 @@ #include "testing/testing.h" // Keep first since utildefines defines AT which conflicts with STL -#include "intern/abc_util.h" #include "intern/abc_exporter.h" +#include "intern/abc_util.h" extern "C" { -#include "BLI_utildefines.h" #include "BKE_main.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "DNA_scene_types.h" } diff --git a/tests/gtests/alembic/abc_matrix_test.cc b/tests/gtests/alembic/abc_matrix_test.cc index daffea15d0a..59ccd57937a 100644 --- a/tests/gtests/alembic/abc_matrix_test.cc +++ b/tests/gtests/alembic/abc_matrix_test.cc @@ -4,8 +4,8 @@ #include "intern/abc_util.h" extern "C" { -#include "BLI_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" } TEST(abc_matrix, CreateRotationMatrixY_YfromZ) diff --git a/tests/gtests/blenlib/BLI_array_ref_test.cc b/tests/gtests/blenlib/BLI_array_ref_test.cc index 538fadc1cf9..aacd6113161 100644 --- a/tests/gtests/blenlib/BLI_array_ref_test.cc +++ b/tests/gtests/blenlib/BLI_array_ref_test.cc @@ -1,6 +1,6 @@ -#include "testing/testing.h" #include "BLI_array_ref.h" #include "BLI_vector.h" +#include "testing/testing.h" using namespace BLI; diff --git a/tests/gtests/blenlib/BLI_array_store_test.cc b/tests/gtests/blenlib/BLI_array_store_test.cc index 3bca66b613e..5e8548911a2 100644 --- a/tests/gtests/blenlib/BLI_array_store_test.cc +++ b/tests/gtests/blenlib/BLI_array_store_test.cc @@ -6,13 +6,13 @@ extern "C" { #include "BLI_array_store.h" -#include "BLI_sys_types.h" -#include "BLI_utildefines.h" -#include "BLI_listbase.h" #include "BLI_array_utils.h" -#include "BLI_string.h" +#include "BLI_listbase.h" #include "BLI_rand.h" #include "BLI_ressource_strings.h" +#include "BLI_string.h" +#include "BLI_sys_types.h" +#include "BLI_utildefines.h" } /* print memory savings */ diff --git a/tests/gtests/blenlib/BLI_array_test.cc b/tests/gtests/blenlib/BLI_array_test.cc index 33f84928d3d..dd09c2d20f8 100644 --- a/tests/gtests/blenlib/BLI_array_test.cc +++ b/tests/gtests/blenlib/BLI_array_test.cc @@ -1,5 +1,5 @@ -#include "testing/testing.h" #include "BLI_array_cxx.h" +#include "testing/testing.h" using namespace BLI; diff --git a/tests/gtests/blenlib/BLI_array_utils_test.cc b/tests/gtests/blenlib/BLI_array_utils_test.cc index fd9caed58f0..d6da9787768 100644 --- a/tests/gtests/blenlib/BLI_array_utils_test.cc +++ b/tests/gtests/blenlib/BLI_array_utils_test.cc @@ -3,8 +3,8 @@ #include "testing/testing.h" extern "C" { -#include "BLI_utildefines.h" #include "BLI_array_utils.h" +#include "BLI_utildefines.h" #include "BLI_utildefines_stack.h" } diff --git a/tests/gtests/blenlib/BLI_delaunay_2d_test.cc b/tests/gtests/blenlib/BLI_delaunay_2d_test.cc index 79e47211049..6065ccc4e57 100644 --- a/tests/gtests/blenlib/BLI_delaunay_2d_test.cc +++ b/tests/gtests/blenlib/BLI_delaunay_2d_test.cc @@ -12,8 +12,8 @@ extern "C" { #include "BLI_delaunay_2d.h" } -#include #include +#include #include #define DO_REGULAR_TESTS 1 diff --git a/tests/gtests/blenlib/BLI_edgehash_test.cc b/tests/gtests/blenlib/BLI_edgehash_test.cc index 0ca251fee50..982f5b35565 100644 --- a/tests/gtests/blenlib/BLI_edgehash_test.cc +++ b/tests/gtests/blenlib/BLI_edgehash_test.cc @@ -1,12 +1,12 @@ /* Apache License, Version 2.0 */ #include "testing/testing.h" -#include #include +#include extern "C" { -#include "BLI_utildefines.h" #include "BLI_edgehash.h" +#include "BLI_utildefines.h" } #define VALUE_1 POINTER_FROM_INT(1) diff --git a/tests/gtests/blenlib/BLI_ghash_performance_test.cc b/tests/gtests/blenlib/BLI_ghash_performance_test.cc index 631adfc7a6b..ed00fb759cd 100644 --- a/tests/gtests/blenlib/BLI_ghash_performance_test.cc +++ b/tests/gtests/blenlib/BLI_ghash_performance_test.cc @@ -1,17 +1,17 @@ /* Apache License, Version 2.0 */ -#include "testing/testing.h" #include "BLI_ressource_strings.h" +#include "testing/testing.h" #define GHASH_INTERNAL_API #include "MEM_guardedalloc.h" extern "C" { -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_rand.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "PIL_time_utildefines.h" } diff --git a/tests/gtests/blenlib/BLI_ghash_test.cc b/tests/gtests/blenlib/BLI_ghash_test.cc index d6841ad4d44..a4b727e82aa 100644 --- a/tests/gtests/blenlib/BLI_ghash_test.cc +++ b/tests/gtests/blenlib/BLI_ghash_test.cc @@ -5,9 +5,9 @@ #define GHASH_INTERNAL_API extern "C" { -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_rand.h" +#include "BLI_utildefines.h" } #define TESTCASE_SIZE 10000 diff --git a/tests/gtests/blenlib/BLI_heap_simple_test.cc b/tests/gtests/blenlib/BLI_heap_simple_test.cc index bad5c40eb66..f4d614def9e 100644 --- a/tests/gtests/blenlib/BLI_heap_simple_test.cc +++ b/tests/gtests/blenlib/BLI_heap_simple_test.cc @@ -6,11 +6,11 @@ #include "MEM_guardedalloc.h" extern "C" { -#include "BLI_sys_types.h" #include "BLI_compiler_attrs.h" #include "BLI_heap_simple.h" -#include "BLI_utildefines.h" #include "BLI_rand.h" +#include "BLI_sys_types.h" +#include "BLI_utildefines.h" }; #define SIZE 1024 diff --git a/tests/gtests/blenlib/BLI_heap_test.cc b/tests/gtests/blenlib/BLI_heap_test.cc index ddec706eb0e..cda13e62bb8 100644 --- a/tests/gtests/blenlib/BLI_heap_test.cc +++ b/tests/gtests/blenlib/BLI_heap_test.cc @@ -8,8 +8,8 @@ extern "C" { #include "BLI_compiler_attrs.h" #include "BLI_heap.h" -#include "BLI_utildefines.h" #include "BLI_rand.h" +#include "BLI_utildefines.h" }; #define SIZE 1024 diff --git a/tests/gtests/blenlib/BLI_index_range_test.cc b/tests/gtests/blenlib/BLI_index_range_test.cc index c5c1f9a875b..60da18b6baf 100644 --- a/tests/gtests/blenlib/BLI_index_range_test.cc +++ b/tests/gtests/blenlib/BLI_index_range_test.cc @@ -1,6 +1,6 @@ -#include "testing/testing.h" #include "BLI_index_range.h" #include "BLI_vector.h" +#include "testing/testing.h" using BLI::ArrayRef; using BLI::IndexRange; diff --git a/tests/gtests/blenlib/BLI_kdopbvh_test.cc b/tests/gtests/blenlib/BLI_kdopbvh_test.cc index e0762f22840..333f7ffbf44 100644 --- a/tests/gtests/blenlib/BLI_kdopbvh_test.cc +++ b/tests/gtests/blenlib/BLI_kdopbvh_test.cc @@ -9,8 +9,8 @@ extern "C" { #include "BLI_compiler_attrs.h" #include "BLI_kdopbvh.h" -#include "BLI_rand.h" #include "BLI_math_vector.h" +#include "BLI_rand.h" } #include "stubs/bf_intern_eigen_stubs.h" diff --git a/tests/gtests/blenlib/BLI_linklist_lockfree_test.cc b/tests/gtests/blenlib/BLI_linklist_lockfree_test.cc index 265637ef32c..f1bd02e0d9e 100644 --- a/tests/gtests/blenlib/BLI_linklist_lockfree_test.cc +++ b/tests/gtests/blenlib/BLI_linklist_lockfree_test.cc @@ -4,10 +4,10 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_linklist_lockfree.h" #include "BLI_task.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" TEST(LockfreeLinkList, Init) { diff --git a/tests/gtests/blenlib/BLI_listbase_test.cc b/tests/gtests/blenlib/BLI_listbase_test.cc index 5ecf0533763..32dbd49c8fc 100644 --- a/tests/gtests/blenlib/BLI_listbase_test.cc +++ b/tests/gtests/blenlib/BLI_listbase_test.cc @@ -7,9 +7,9 @@ extern "C" { #include "BLI_array_utils.h" #include "BLI_listbase.h" -#include "BLI_string.h" #include "BLI_path_util.h" #include "BLI_ressource_strings.h" +#include "BLI_string.h" } /* local validation function */ diff --git a/tests/gtests/blenlib/BLI_map_test.cc b/tests/gtests/blenlib/BLI_map_test.cc index e91f809abba..7be23157e94 100644 --- a/tests/gtests/blenlib/BLI_map_test.cc +++ b/tests/gtests/blenlib/BLI_map_test.cc @@ -1,6 +1,6 @@ -#include "testing/testing.h" #include "BLI_map.h" #include "BLI_set.h" +#include "testing/testing.h" using BLI::Map; using IntFloatMap = Map; diff --git a/tests/gtests/blenlib/BLI_memiter_test.cc b/tests/gtests/blenlib/BLI_memiter_test.cc index 07ef0745845..05602dcc1c8 100644 --- a/tests/gtests/blenlib/BLI_memiter_test.cc +++ b/tests/gtests/blenlib/BLI_memiter_test.cc @@ -8,8 +8,8 @@ extern "C" { #include "BLI_array_utils.h" #include "BLI_memiter.h" -#include "BLI_string.h" #include "BLI_ressource_strings.h" +#include "BLI_string.h" } TEST(memiter, Nop) diff --git a/tests/gtests/blenlib/BLI_optional_test.cc b/tests/gtests/blenlib/BLI_optional_test.cc index 2e672967680..a25a3cbd588 100644 --- a/tests/gtests/blenlib/BLI_optional_test.cc +++ b/tests/gtests/blenlib/BLI_optional_test.cc @@ -1,5 +1,5 @@ -#include "testing/testing.h" #include "BLI_optional.h" +#include "testing/testing.h" #include using namespace BLI; diff --git a/tests/gtests/blenlib/BLI_path_util_test.cc b/tests/gtests/blenlib/BLI_path_util_test.cc index 401ba2d5ffb..18d7a9c4fea 100644 --- a/tests/gtests/blenlib/BLI_path_util_test.cc +++ b/tests/gtests/blenlib/BLI_path_util_test.cc @@ -3,10 +3,10 @@ #include "testing/testing.h" extern "C" { +#include "../../../source/blender/imbuf/IMB_imbuf.h" #include "BLI_fileops.h" #include "BLI_path_util.h" #include "BLI_string.h" -#include "../../../source/blender/imbuf/IMB_imbuf.h" #ifdef _WIN32 # include "../../../source/blender/blenkernel/BKE_global.h" diff --git a/tests/gtests/blenlib/BLI_polyfill_2d_test.cc b/tests/gtests/blenlib/BLI_polyfill_2d_test.cc index bb9f739a71e..911137bb83b 100644 --- a/tests/gtests/blenlib/BLI_polyfill_2d_test.cc +++ b/tests/gtests/blenlib/BLI_polyfill_2d_test.cc @@ -12,20 +12,20 @@ #include "MEM_guardedalloc.h" extern "C" { -#include "BLI_utildefines.h" #include "BLI_array_utils.h" -#include "BLI_polyfill_2d.h" #include "BLI_edgehash.h" #include "BLI_math.h" +#include "BLI_polyfill_2d.h" +#include "BLI_utildefines.h" #ifdef USE_OBJ_PREVIEW # include "BLI_string.h" #endif #ifdef USE_BEAUTIFY -# include "BLI_polyfill_2d_beautify.h" -# include "BLI_memarena.h" # include "BLI_heap.h" +# include "BLI_memarena.h" +# include "BLI_polyfill_2d_beautify.h" #endif } diff --git a/tests/gtests/blenlib/BLI_set_test.cc b/tests/gtests/blenlib/BLI_set_test.cc index 5baf069557e..555140f805c 100644 --- a/tests/gtests/blenlib/BLI_set_test.cc +++ b/tests/gtests/blenlib/BLI_set_test.cc @@ -1,6 +1,6 @@ -#include "testing/testing.h" #include "BLI_set.h" #include "BLI_vector.h" +#include "testing/testing.h" using BLI::Set; using BLI::Vector; diff --git a/tests/gtests/blenlib/BLI_stack_cxx_test.cc b/tests/gtests/blenlib/BLI_stack_cxx_test.cc index 272bba05cb8..6376259927b 100644 --- a/tests/gtests/blenlib/BLI_stack_cxx_test.cc +++ b/tests/gtests/blenlib/BLI_stack_cxx_test.cc @@ -1,5 +1,5 @@ -#include "testing/testing.h" #include "BLI_stack_cxx.h" +#include "testing/testing.h" using BLI::Stack; using IntStack = Stack; diff --git a/tests/gtests/blenlib/BLI_stack_test.cc b/tests/gtests/blenlib/BLI_stack_test.cc index a3fd5efadf0..359e61c6f47 100644 --- a/tests/gtests/blenlib/BLI_stack_test.cc +++ b/tests/gtests/blenlib/BLI_stack_test.cc @@ -4,9 +4,9 @@ #include extern "C" { +#include "BLI_array.h" #include "BLI_stack.h" #include "BLI_utildefines.h" -#include "BLI_array.h" }; #define SIZE 1024 diff --git a/tests/gtests/blenlib/BLI_string_map_test.cc b/tests/gtests/blenlib/BLI_string_map_test.cc index dfe96d63297..4cb67d5fbac 100644 --- a/tests/gtests/blenlib/BLI_string_map_test.cc +++ b/tests/gtests/blenlib/BLI_string_map_test.cc @@ -1,6 +1,6 @@ -#include "testing/testing.h" #include "BLI_string_map.h" #include "BLI_vector.h" +#include "testing/testing.h" using namespace BLI; diff --git a/tests/gtests/blenlib/BLI_string_ref_test.cc b/tests/gtests/blenlib/BLI_string_ref_test.cc index 38a970455c0..a268bf3215a 100644 --- a/tests/gtests/blenlib/BLI_string_ref_test.cc +++ b/tests/gtests/blenlib/BLI_string_ref_test.cc @@ -1,6 +1,6 @@ -#include "testing/testing.h" #include "BLI_string_ref.h" #include "BLI_vector.h" +#include "testing/testing.h" using BLI::StringRef; using BLI::StringRefNull; diff --git a/tests/gtests/blenlib/BLI_string_test.cc b/tests/gtests/blenlib/BLI_string_test.cc index a35f9fe067e..aae0c12c8b2 100644 --- a/tests/gtests/blenlib/BLI_string_test.cc +++ b/tests/gtests/blenlib/BLI_string_test.cc @@ -10,10 +10,10 @@ #include extern "C" { -#include "BLI_utildefines.h" #include "BLI_string.h" #include "BLI_string_utf8.h" #include "BLI_string_utils.h" +#include "BLI_utildefines.h" } using std::initializer_list; diff --git a/tests/gtests/blenlib/BLI_string_utf8_test.cc b/tests/gtests/blenlib/BLI_string_utf8_test.cc index 01a9549044a..3e2ade40019 100644 --- a/tests/gtests/blenlib/BLI_string_utf8_test.cc +++ b/tests/gtests/blenlib/BLI_string_utf8_test.cc @@ -3,9 +3,9 @@ #include "testing/testing.h" extern "C" { -#include "BLI_utildefines.h" #include "BLI_string.h" #include "BLI_string_utf8.h" +#include "BLI_utildefines.h" } /* Note that 'common' utf-8 variants of string functions (like copy, etc.) are tested in diff --git a/tests/gtests/blenlib/BLI_task_performance_test.cc b/tests/gtests/blenlib/BLI_task_performance_test.cc index c5af75f1eb2..db596340464 100644 --- a/tests/gtests/blenlib/BLI_task_performance_test.cc +++ b/tests/gtests/blenlib/BLI_task_performance_test.cc @@ -1,7 +1,7 @@ /* Apache License, Version 2.0 */ -#include "testing/testing.h" #include "BLI_ressource_strings.h" +#include "testing/testing.h" #include "atomic_ops.h" diff --git a/tests/gtests/blenlib/BLI_vector_set_test.cc b/tests/gtests/blenlib/BLI_vector_set_test.cc index 675e5a154d5..5ec51337aa7 100644 --- a/tests/gtests/blenlib/BLI_vector_set_test.cc +++ b/tests/gtests/blenlib/BLI_vector_set_test.cc @@ -1,5 +1,5 @@ -#include "testing/testing.h" #include "BLI_vector_set.h" +#include "testing/testing.h" using BLI::VectorSet; using IntVectorSet = VectorSet; diff --git a/tests/gtests/blenlib/BLI_vector_test.cc b/tests/gtests/blenlib/BLI_vector_test.cc index 6cf67fb2488..2402ee9627f 100644 --- a/tests/gtests/blenlib/BLI_vector_test.cc +++ b/tests/gtests/blenlib/BLI_vector_test.cc @@ -1,5 +1,5 @@ -#include "testing/testing.h" #include "BLI_vector.h" +#include "testing/testing.h" #include using BLI::Vector; diff --git a/tests/gtests/blenloader/blendfile_loading_base_test.cc b/tests/gtests/blenloader/blendfile_loading_base_test.cc index 4f871bc7ddf..62befae90cd 100644 --- a/tests/gtests/blenloader/blendfile_loading_base_test.cc +++ b/tests/gtests/blenloader/blendfile_loading_base_test.cc @@ -31,13 +31,13 @@ extern "C" { #include "BKE_node.h" #include "BKE_scene.h" -#include "BLI_threads.h" #include "BLI_path_util.h" +#include "BLI_threads.h" #include "BLO_readfile.h" -#include "DEG_depsgraph_build.h" #include "DEG_depsgraph.h" +#include "DEG_depsgraph_build.h" #include "DNA_genfile.h" /* for DNA_sdna_current_init() */ #include "DNA_windowmanager_types.h" diff --git a/tests/gtests/blenloader/blendfile_loading_base_test.h b/tests/gtests/blenloader/blendfile_loading_base_test.h index 466bbcd2392..6ed32168737 100644 --- a/tests/gtests/blenloader/blendfile_loading_base_test.h +++ b/tests/gtests/blenloader/blendfile_loading_base_test.h @@ -18,8 +18,8 @@ #ifndef __BLENDFILE_LOADING_BASE_TEST_H__ #define __BLENDFILE_LOADING_BASE_TEST_H__ -#include "testing/testing.h" #include "DEG_depsgraph.h" +#include "testing/testing.h" struct BlendFileData; struct Depsgraph; diff --git a/tests/gtests/bmesh/bmesh_core_test.cc b/tests/gtests/bmesh/bmesh_core_test.cc index 7531568af87..25c48e9fd36 100644 --- a/tests/gtests/bmesh/bmesh_core_test.cc +++ b/tests/gtests/bmesh/bmesh_core_test.cc @@ -1,8 +1,8 @@ #include "testing/testing.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "bmesh.h" -#include "BLI_math.h" TEST(bmesh_core, BMVertCreate) { diff --git a/tests/gtests/testing/mock_log.h b/tests/gtests/testing/mock_log.h index e3414fa1533..7d0a94a4971 100644 --- a/tests/gtests/testing/mock_log.h +++ b/tests/gtests/testing/mock_log.h @@ -40,8 +40,8 @@ #include -#include "gmock/gmock.h" #include "glog/logging.h" +#include "gmock/gmock.h" // Needed to make the scoped mock log tests work without modification. namespace ceres { diff --git a/tests/gtests/testing/testing.h b/tests/gtests/testing/testing.h index 67138e4f874..32cb6e7f18a 100644 --- a/tests/gtests/testing/testing.h +++ b/tests/gtests/testing/testing.h @@ -3,8 +3,8 @@ #include -#include "glog/logging.h" #include "gflags/gflags.h" +#include "glog/logging.h" #include "gtest/gtest.h" #define EXPECT_V3_NEAR(a, b, eps) \