diff options
| -rw-r--r-- | intern/ghost/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | intern/ghost/GHOST_Types.h | 2 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_XrSession.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/BKE_packedFile.h | 2 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/readfile.h | 2 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_cache_impl.h | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/intern/CMakeLists.txt | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt index 611da8d6a44..68fc9637e02 100644 --- a/intern/ghost/CMakeLists.txt +++ b/intern/ghost/CMakeLists.txt @@ -368,11 +368,11 @@ if(WITH_XR_OPENXR) GHOST_IXrContext.h intern/GHOST_IXrGraphicsBinding.h - intern/GHOST_Xr_intern.h - intern/GHOST_Xr_openxr_includes.h intern/GHOST_XrContext.h intern/GHOST_XrSession.h intern/GHOST_XrSwapchain.h + intern/GHOST_Xr_intern.h + intern/GHOST_Xr_openxr_includes.h ) list(APPEND INC_SYS ${XR_OPENXR_SDK_INCLUDE_DIR} diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h index 70c4d3ef00c..637935d9142 100644 --- a/intern/ghost/GHOST_Types.h +++ b/intern/ghost/GHOST_Types.h @@ -598,8 +598,8 @@ typedef void (*GHOST_TimerProcPtr)(struct GHOST_TimerTaskHandle__ *task, GHOST_T #ifdef WITH_XR_OPENXR -struct GHOST_XrError; struct GHOST_XrDrawViewInfo; +struct GHOST_XrError; /** * The XR view (i.e. the OpenXR runtime) may require a different graphics library than OpenGL. An * offscreen texture of the viewport will then be drawn into using OpenGL, but the final texture diff --git a/intern/ghost/intern/GHOST_XrSession.h b/intern/ghost/intern/GHOST_XrSession.h index 1d862839200..9c1ed3756d4 100644 --- a/intern/ghost/intern/GHOST_XrSession.h +++ b/intern/ghost/intern/GHOST_XrSession.h @@ -28,8 +28,8 @@ class GHOST_XrContext; class GHOST_XrSwapchain; -struct OpenXRSessionData; struct GHOST_XrDrawInfo; +struct OpenXRSessionData; class GHOST_XrSession { public: diff --git a/source/blender/blenkernel/BKE_packedFile.h b/source/blender/blenkernel/BKE_packedFile.h index 16d9b5b2c8b..fb2578b81b0 100644 --- a/source/blender/blenkernel/BKE_packedFile.h +++ b/source/blender/blenkernel/BKE_packedFile.h @@ -36,8 +36,8 @@ struct Main; struct PackedFile; struct ReportList; struct VFont; -struct bSound; struct Volume; +struct bSound; enum ePF_FileCompare { PF_CMP_EQUAL = 0, diff --git a/source/blender/blenloader/intern/readfile.h b/source/blender/blenloader/intern/readfile.h index 5100cf5051b..5be7e703d6b 100644 --- a/source/blender/blenloader/intern/readfile.h +++ b/source/blender/blenloader/intern/readfile.h @@ -30,8 +30,8 @@ #include "DNA_windowmanager_types.h" /* for ReportType */ #include "zlib.h" -struct IDNameLib_Map; struct GSet; +struct IDNameLib_Map; struct Key; struct MemFile; struct Object; diff --git a/source/blender/draw/intern/draw_cache_impl.h b/source/blender/draw/intern/draw_cache_impl.h index b3450bf4715..3ce8a7d4e43 100644 --- a/source/blender/draw/intern/draw_cache_impl.h +++ b/source/blender/draw/intern/draw_cache_impl.h @@ -32,7 +32,6 @@ struct ModifierData; struct PTCacheEdit; struct ParticleSystem; -struct bGPdata; struct Curve; struct Hair; struct Lattice; @@ -40,6 +39,7 @@ struct Mesh; struct MetaBall; struct PointCloud; struct Volume; +struct bGPdata; /* Expose via BKE callbacks */ void DRW_mball_batch_cache_dirty_tag(struct MetaBall *mb, int mode); diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 4489dcda989..f2ec567abf1 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -59,8 +59,8 @@ #include "BKE_curveprofile.h" #include "BKE_global.h" #include "BKE_gpencil_modifier.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_override.h" diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt index f8f765c6ece..a101e96e958 100644 --- a/source/blender/makesdna/intern/CMakeLists.txt +++ b/source/blender/makesdna/intern/CMakeLists.txt @@ -134,8 +134,8 @@ set(SRC ../DNA_camera_defaults.h ../DNA_curve_defaults.h ../DNA_defaults.h - ../DNA_image_defaults.h ../DNA_hair_defaults.h + ../DNA_image_defaults.h ../DNA_lattice_defaults.h ../DNA_light_defaults.h ../DNA_lightprobe_defaults.h |