From 9a4c019255b1711edd65640f4f33f21df97c2636 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 17 Aug 2020 12:39:08 +1000 Subject: Cleanup: header order, trailing space --- source/blender/blenlib/BLI_compiler_compat.h | 1 - source/blender/compositor/COM_compositor.h | 1 - source/blender/draw/intern/smaa_textures.h | 1 - source/blender/gpu/intern/gpu_backend.hh | 2 +- source/blender/gpu/opengl/gl_drawlist.cc | 2 +- source/blender/makesdna/DNA_scene_defaults.h | 1 - 6 files changed, 2 insertions(+), 6 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenlib/BLI_compiler_compat.h b/source/blender/blenlib/BLI_compiler_compat.h index 0870d01872a..bd8f84cedd6 100644 --- a/source/blender/blenlib/BLI_compiler_compat.h +++ b/source/blender/blenlib/BLI_compiler_compat.h @@ -55,4 +55,3 @@ template static inline T decltype_helper(T x) #else # define BLI_NOINLINE #endif - diff --git a/source/blender/compositor/COM_compositor.h b/source/blender/compositor/COM_compositor.h index b200fa8d266..79c1ebcfe9f 100644 --- a/source/blender/compositor/COM_compositor.h +++ b/source/blender/compositor/COM_compositor.h @@ -362,4 +362,3 @@ void COM_deinitialize(void); #ifdef __cplusplus } #endif - diff --git a/source/blender/draw/intern/smaa_textures.h b/source/blender/draw/intern/smaa_textures.h index 7556f3a1952..fcf0ced1eed 100644 --- a/source/blender/draw/intern/smaa_textures.h +++ b/source/blender/draw/intern/smaa_textures.h @@ -15081,4 +15081,3 @@ static const unsigned char searchTexBytes[] = { }; /* clang-format off */ - diff --git a/source/blender/gpu/intern/gpu_backend.hh b/source/blender/gpu/intern/gpu_backend.hh index ba382e3c3fc..25d165098a7 100644 --- a/source/blender/gpu/intern/gpu_backend.hh +++ b/source/blender/gpu/intern/gpu_backend.hh @@ -25,9 +25,9 @@ #pragma once +#include "gpu_batch_private.hh" #include "gpu_context_private.hh" #include "gpu_drawlist_private.hh" -#include "gpu_batch_private.hh" namespace blender { namespace gpu { diff --git a/source/blender/gpu/opengl/gl_drawlist.cc b/source/blender/gpu/opengl/gl_drawlist.cc index c121fb9ba2c..575b2c989e4 100644 --- a/source/blender/gpu/opengl/gl_drawlist.cc +++ b/source/blender/gpu/opengl/gl_drawlist.cc @@ -237,4 +237,4 @@ void GLDrawList::submit(void) command_len_ = 0; } -/** \} */ \ No newline at end of file +/** \} */ diff --git a/source/blender/makesdna/DNA_scene_defaults.h b/source/blender/makesdna/DNA_scene_defaults.h index ec64eea0aae..69580da8c5f 100644 --- a/source/blender/makesdna/DNA_scene_defaults.h +++ b/source/blender/makesdna/DNA_scene_defaults.h @@ -364,4 +364,3 @@ } /* clang-format off */ - -- cgit v1.2.3