Merge branch 'main' into asset-browser-grid-view

build_files/build_environment/cmake/harvest.cmake

@@ -218,6 +218,7 @@ else()
   harvest(openimagedenoise/lib openimagedenoise/lib "*.a")
   harvest(embree/include embree/include "*.h")
   harvest(embree/lib embree/lib "*.a")
+  harvest(embree/lib embree/lib "*${SHAREDLIBEXT}*")
   harvest(openpgl/include openpgl/include "*.h")
   harvest(openpgl/lib openpgl/lib "*.a")
   harvest(openpgl/lib/cmake/openpgl-${OPENPGL_SHORT_VERSION} openpgl/lib/cmake/openpgl "*.cmake")

doc/python_api/sphinx_doc_gen.py

@@ -1853,8 +1853,6 @@ def pyrna2sphinx(basepath):
                 fw("   %s\n\n" % operator_description)
                 for prop in op.args:
                     write_param("   ", fw, prop)
-                if op.args:
-                    fw("\n")
 
                 location = op.get_location()
                 if location != (None, None):
@@ -1865,9 +1863,12 @@ def pyrna2sphinx(basepath):
                     else:
                         url_base = API_BASEURL
 
-                    fw("   :file:`%s\\:%d <%s/%s#L%d>`_\n\n" %
+                    fw("   :File: `%s\\:%d <%s/%s#L%d>`__\n\n" %
                        (location[0], location[1], url_base, location[0], location[1]))
 
+                if op.args:
+                    fw("\n")
+
             file.close()
 
     if "bpy.ops" not in EXCLUDE_MODULES:

extern/cuew/include/cuew.h

@@ -127,7 +127,7 @@ typedef uint32_t cuuint32_t;
 typedef uint64_t cuuint64_t;
 #endif
 
-#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined (__aarch64__)
+#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined (__aarch64__) || defined(__ppc64__) || defined(__PPC64__)
 typedef unsigned long long CUdeviceptr;
 #else
 typedef unsigned int CUdeviceptr;

extern/hipew/include/hipew.h

@@ -84,7 +84,7 @@ typedef uint32_t hipuint32_t;
 typedef uint64_t hipuint64_t;
 #endif
 
-#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined (__aarch64__)
+#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined (__aarch64__) || defined(__ppc64__) || defined(__PPC64__)
 typedef unsigned long long hipDeviceptr_t;
 #else
 typedef unsigned int hipDeviceptr_t;

intern/cycles/app/CMakeLists.txt

@@ -51,6 +51,12 @@ if(WITH_CYCLES_STANDALONE AND WITH_CYCLES_STANDALONE_GUI)
 endif()
 
 if(WITH_USD)
+  # Silence warning from USD headers using deprecated TBB header.
+  add_definitions(
+    -D__TBB_show_deprecation_message_atomic_H
+    -D__TBB_show_deprecation_message_task_H
+  )
+
   list(APPEND INC_SYS
     ${USD_INCLUDE_DIRS}
   )

intern/cycles/device/metal/kernel.mm

@@ -445,12 +445,10 @@ void MetalKernelPipeline::compile()
   const std::string function_name = std::string("cycles_metal_") +
                                     device_kernel_as_string(device_kernel);
 
-  NSString *entryPoint = [@(function_name.c_str()) copy];
-
   NSError *error = NULL;
   if (@available(macOS 11.0, *)) {
     MTLFunctionDescriptor *func_desc = [MTLIntersectionFunctionDescriptor functionDescriptor];
-    func_desc.name = entryPoint;
+    func_desc.name = [@(function_name.c_str()) copy];
 
     if (pso_type != PSO_GENERIC) {
       func_desc.constantValues = GetConstantValues(&kernel_data_);
@@ -462,8 +460,6 @@ void MetalKernelPipeline::compile()
     function = [mtlLibrary newFunctionWithDescriptor:func_desc error:&error];
   }
 
-  [entryPoint release];
-
   if (function == nil) {
     NSString *err = [error localizedDescription];
     string errors = [err UTF8String];
@@ -471,7 +467,7 @@ void MetalKernelPipeline::compile()
     return;
   }
 
-  function.label = [entryPoint copy];
+  function.label = [@(function_name.c_str()) copy];
 
   if (use_metalrt) {
     if (@available(macOS 11.0, *)) {

intern/cycles/hydra/CMakeLists.txt

@@ -80,6 +80,12 @@ if(EXISTS ${USD_INCLUDE_DIR}/pxr/imaging/hgiGL)
   list(APPEND SRC_HD_CYCLES_HEADERS display_driver.h)
 endif()
 
+# Silence warning from USD headers using deprecated TBB header.
+add_definitions(
+  -D__TBB_show_deprecation_message_atomic_H
+  -D__TBB_show_deprecation_message_task_H
+)
+
 include_directories(${INC})
 include_directories(SYSTEM ${INC_SYS})
 

intern/cycles/hydra/display_driver.cpp

@@ -4,6 +4,12 @@
 
 #ifdef _WIN32
 // Include first to avoid "NOGDI" definition set in Cycles headers
+#  ifndef NOMINMAX
+#    define NOMINMAX
+#  endif
+#  ifndef WIN32_LEAN_AND_MEAN
+#    define WIN32_LEAN_AND_MEAN
+#  endif
 #  include <Windows.h>
 #endif
 

intern/cycles/hydra/node_util.cpp

@@ -370,6 +370,16 @@ VtValue convertFromCyclesArray(const array<SrcType> &value)
   return VtValue(convertedValue);
 }
 
+template<> VtValue convertFromCyclesArray<float2, GfVec2f>(const array<float2> &value)
+{
+  VtVec2fArray convertedValue;
+  convertedValue.reserve(value.size());
+  for (const auto &element : value) {
+    convertedValue.push_back(GfVec2f(element.x, element.y));
+  }
+  return VtValue(convertedValue);
+}
+
 template<> VtValue convertFromCyclesArray<float3, GfVec3f>(const array<float3> &value)
 {
   VtVec3fArray convertedValue;

intern/cycles/kernel/svm/tex_coord.h

@@ -18,7 +18,7 @@ ccl_device_noinline int svm_node_tex_coord(KernelGlobals kg,
                                            uint4 node,
                                            int offset)
 {
-  float3 data;
+  float3 data = zero_float3();
   uint type = node.y;
   uint out_offset = node.z;
 
@@ -100,7 +100,7 @@ ccl_device_noinline int svm_node_tex_coord_bump_dx(KernelGlobals kg,
                                                    int offset)
 {
 #ifdef __RAY_DIFFERENTIALS__
-  float3 data;
+  float3 data = zero_float3();
   uint type = node.y;
   uint out_offset = node.z;
 
@@ -185,7 +185,7 @@ ccl_device_noinline int svm_node_tex_coord_bump_dy(KernelGlobals kg,
                                                    int offset)
 {
 #ifdef __RAY_DIFFERENTIALS__
-  float3 data;
+  float3 data = zero_float3();
   uint type = node.y;
   uint out_offset = node.z;
 

intern/cycles/scene/alembic.cpp

@@ -247,13 +247,16 @@ size_t CachedData::memory_used() const
 static M44d convert_yup_zup(const M44d &mtx, float scale_mult)
 {
   V3d scale, shear, rotation, translation;
-  extractSHRT(mtx,
-              scale,
-              shear,
-              rotation,
-              translation,
-              true,
-              IMATH_INTERNAL_NAMESPACE::Euler<double>::XZY);
+
+  if (!extractSHRT(mtx,
+                   scale,
+                   shear,
+                   rotation,
+                   translation,
+                   true,
+                   IMATH_INTERNAL_NAMESPACE::Euler<double>::XZY)) {
+    return mtx;
+  }
 
   M44d rot_mat, scale_mat, trans_mat;
   rot_mat.setEulerAngles(V3d(rotation.x, -rotation.z, rotation.y));

intern/cycles/scene/hair.cpp

@@ -531,7 +531,7 @@ PrimitiveType Hair::primitive_type() const
 
 /* Fill in coordinates for curve transparency shader evaluation on device. */
 static int fill_shader_input(const Hair *hair,
-                             const int object_index,
+                             const size_t object_index,
                              device_vector<KernelShaderEvalInput> &d_input)
 {
   int d_input_size = 0;

intern/cycles/scene/image.cpp

@@ -86,7 +86,7 @@ ImageHandle::ImageHandle(const ImageHandle &other)
     : tile_slots(other.tile_slots), manager(other.manager)
 {
   /* Increase image user count. */
-  foreach (const int slot, tile_slots) {
+  foreach (const size_t slot, tile_slots) {
     manager->add_image_user(slot);
   }
 }
@@ -97,7 +97,7 @@ ImageHandle &ImageHandle::operator=(const ImageHandle &other)
   manager = other.manager;
   tile_slots = other.tile_slots;
 
-  foreach (const int slot, tile_slots) {
+  foreach (const size_t slot, tile_slots) {
     manager->add_image_user(slot);
   }
 
@@ -111,7 +111,7 @@ ImageHandle::~ImageHandle()
 
 void ImageHandle::clear()
 {
-  foreach (const int slot, tile_slots) {
+  foreach (const size_t slot, tile_slots) {
     manager->remove_image_user(slot);
   }
 
@@ -165,7 +165,7 @@ vector<int4> ImageHandle::get_svm_slots() const
   for (size_t i = 0; i < num_nodes; i++) {
     int4 node;
 
-    int slot = tile_slots[2 * i];
+    size_t slot = tile_slots[2 * i];
     node.x = manager->images[slot]->loader->get_tile_number();
     node.y = slot;
 
@@ -387,7 +387,7 @@ void ImageManager::load_image_metadata(Image *img)
 
 ImageHandle ImageManager::add_image(const string &filename, const ImageParams &params)
 {
-  const int slot = add_image_slot(new OIIOImageLoader(filename), params, false);
+  const size_t slot = add_image_slot(new OIIOImageLoader(filename), params, false);
 
   ImageHandle handle;
   handle.tile_slots.push_back(slot);
@@ -408,13 +408,13 @@ ImageHandle ImageManager::add_image(const string &filename,
     /* Since we don't have information about the exact tile format used in this code location,
      * just attempt all replacement patterns that Blender supports. */
     if (tile != 0) {
-      string_replace(tile_filename, "<UDIM>", string_printf("%04d", tile));
+      string_replace(tile_filename, "<UDIM>", string_printf("%04d", (int)tile));
 
       int u = ((tile - 1001) % 10);
       int v = ((tile - 1001) / 10);
       string_replace(tile_filename, "<UVTILE>", string_printf("u%d_v%d", u + 1, v + 1));
     }
-    const int slot = add_image_slot(new OIIOImageLoader(tile_filename), params, false);
+    const size_t slot = add_image_slot(new OIIOImageLoader(tile_filename), params, false);
     handle.tile_slots.push_back(slot);
   }
 
@@ -425,7 +425,7 @@ ImageHandle ImageManager::add_image(ImageLoader *loader,
                                     const ImageParams &params,
                                     const bool builtin)
 {
-  const int slot = add_image_slot(loader, params, builtin);
+  const size_t slot = add_image_slot(loader, params, builtin);
 
   ImageHandle handle;
   handle.tile_slots.push_back(slot);
@@ -438,7 +438,7 @@ ImageHandle ImageManager::add_image(const vector<ImageLoader *> &loaders,
 {
   ImageHandle handle;
   for (ImageLoader *loader : loaders) {
-    const int slot = add_image_slot(loader, params, true);
+    const size_t slot = add_image_slot(loader, params, true);
     handle.tile_slots.push_back(slot);
   }
 
@@ -446,9 +446,9 @@ ImageHandle ImageManager::add_image(const vector<ImageLoader *> &loaders,
   return handle;
 }
 
-int ImageManager::add_image_slot(ImageLoader *loader,
-                                 const ImageParams &params,
-                                 const bool builtin)
+size_t ImageManager::add_image_slot(ImageLoader *loader,
+                                    const ImageParams &params,
+                                    const bool builtin)
 {
   Image *img;
   size_t slot;
@@ -492,7 +492,7 @@ int ImageManager::add_image_slot(ImageLoader *loader,
   return slot;
 }
 
-void ImageManager::add_image_user(int slot)
+void ImageManager::add_image_user(size_t slot)
 {
   thread_scoped_lock device_lock(images_mutex);
   Image *image = images[slot];
@@ -501,7 +501,7 @@ void ImageManager::add_image_user(int slot)
   image->users++;
 }
 
-void ImageManager::remove_image_user(int slot)
+void ImageManager::remove_image_user(size_t slot)
 {
   thread_scoped_lock device_lock(images_mutex);
   Image *image = images[slot];
@@ -682,7 +682,7 @@ bool ImageManager::file_load_image(Image *img, int texture_limit)
   return true;
 }
 
-void ImageManager::device_load_image(Device *device, Scene *scene, int slot, Progress *progress)
+void ImageManager::device_load_image(Device *device, Scene *scene, size_t slot, Progress *progress)
 {
   if (progress->get_cancel()) {
     return;
@@ -698,7 +698,7 @@ void ImageManager::device_load_image(Device *device, Scene *scene, int slot, Pro
   ImageDataType type = img->metadata.type;
 
   /* Name for debugging. */
-  img->mem_name = string_printf("tex_image_%s_%03d", name_from_type(type), slot);
+  img->mem_name = string_printf("tex_image_%s_%03d", name_from_type(type), (int)slot);
 
   /* Free previous texture in slot. */
   if (img->mem) {
@@ -819,7 +819,7 @@ void ImageManager::device_load_image(Device *device, Scene *scene, int slot, Pro
   img->need_load = false;
 }
 
-void ImageManager::device_free_image(Device *, int slot)
+void ImageManager::device_free_image(Device *, size_t slot)
 {
   Image *img = images[slot];
   if (img == NULL) {
@@ -874,7 +874,10 @@ void ImageManager::device_update(Device *device, Scene *scene, Progress &progres
   need_update_ = false;
 }
 
-void ImageManager::device_update_slot(Device *device, Scene *scene, int slot, Progress *progress)
+void ImageManager::device_update_slot(Device *device,
+                                      Scene *scene,
+                                      size_t slot,
+                                      Progress *progress)
 {
   Image *img = images[slot];
   assert(img != NULL);

intern/cycles/scene/image.h

@@ -156,7 +156,7 @@ class ImageHandle {
   ImageManager *get_manager() const;
 
  protected:
-  vector<int> tile_slots;
+  vector<size_t> tile_slots;
   ImageManager *manager;
 
   friend class ImageManager;
@@ -179,7 +179,7 @@ class ImageManager {
   ImageHandle add_image(const vector<ImageLoader *> &loaders, const ImageParams &params);
 
   void device_update(Device *device, Scene *scene, Progress &progress);
-  void device_update_slot(Device *device, Scene *scene, int slot, Progress *progress);
+  void device_update_slot(Device *device, Scene *scene, size_t slot, Progress *progress);
   void device_free(Device *device);
 
   void device_load_builtin(Device *device, Scene *scene, Progress &progress);
@@ -223,17 +223,17 @@ class ImageManager {
   vector<Image *> images;
   void *osl_texture_system;
 
-  int add_image_slot(ImageLoader *loader, const ImageParams &params, const bool builtin);
-  void add_image_user(int slot);
-  void remove_image_user(int slot);
+  size_t add_image_slot(ImageLoader *loader, const ImageParams &params, const bool builtin);
+  void add_image_user(size_t slot);
+  void remove_image_user(size_t slot);
 
   void load_image_metadata(Image *img);
 
   template<TypeDesc::BASETYPE FileFormat, typename StorageType>
   bool file_load_image(Image *img, int texture_limit);
 
-  void device_load_image(Device *device, Scene *scene, int slot, Progress *progress);
-  void device_free_image(Device *device, int slot);
+  void device_load_image(Device *device, Scene *scene, size_t slot, Progress *progress);
+  void device_free_image(Device *device, size_t slot);
 
   friend class ImageHandle;
 };

intern/cycles/scene/light.cpp

@@ -264,9 +264,9 @@ void LightManager::device_update_distribution(Device *,
 
     /* Count emissive triangles. */
     Mesh *mesh = static_cast<Mesh *>(object->get_geometry());
-    size_t mesh_num_triangles = mesh->num_triangles();
+    int mesh_num_triangles = static_cast<int>(mesh->num_triangles());
 
-    for (size_t i = 0; i < mesh_num_triangles; i++) {
+    for (int i = 0; i < mesh_num_triangles; i++) {
       int shader_index = mesh->get_shader()[i];
       Shader *shader = (shader_index < mesh->get_used_shaders().size()) ?
                            static_cast<Shader *>(mesh->get_used_shaders()[shader_index]) :

intern/cycles/scene/mesh_displace.cpp

@@ -35,7 +35,7 @@ static float3 compute_face_normal(const Mesh::Triangle &t, float3 *verts)
 /* Fill in coordinates for mesh displacement shader evaluation on device. */
 static int fill_shader_input(const Scene *scene,
                              const Mesh *mesh,
-                             const int object_index,
+                             const size_t object_index,
                              device_vector<KernelShaderEvalInput> &d_input)
 {
   int d_input_size = 0;

intern/cycles/util/half.h

@@ -40,7 +40,7 @@ ccl_device_inline float half_to_float(half h_in)
  * unsigned shorts. */
 class half {
  public:
-  half() : v(0) {}
+  half() = default;
   half(const unsigned short &i) : v(i) {}
   operator unsigned short()
   {

intern/ghost/CMakeLists.txt

@@ -14,62 +14,62 @@ set(INC_SYS
 )
 
 set(SRC
-  intern/GHOST_Buttons.cpp
-  intern/GHOST_C-api.cpp
-  intern/GHOST_CallbackEventConsumer.cpp
-  intern/GHOST_Context.cpp
-  intern/GHOST_ContextNone.cpp
-  intern/GHOST_DisplayManager.cpp
-  intern/GHOST_EventManager.cpp
-  intern/GHOST_ISystem.cpp
-  intern/GHOST_ISystemPaths.cpp
-  intern/GHOST_ModifierKeys.cpp
-  intern/GHOST_Path-api.cpp
-  intern/GHOST_PathUtils.cpp
-  intern/GHOST_Rect.cpp
-  intern/GHOST_System.cpp
-  intern/GHOST_TimerManager.cpp
-  intern/GHOST_Window.cpp
-  intern/GHOST_WindowManager.cpp
+  intern/GHOST_Buttons.cc
+  intern/GHOST_C-api.cc
+  intern/GHOST_CallbackEventConsumer.cc
+  intern/GHOST_Context.cc
+  intern/GHOST_ContextNone.cc
+  intern/GHOST_DisplayManager.cc
+  intern/GHOST_EventManager.cc
+  intern/GHOST_ISystem.cc
+  intern/GHOST_ISystemPaths.cc
+  intern/GHOST_ModifierKeys.cc
+  intern/GHOST_Path-api.cc
+  intern/GHOST_PathUtils.cc
+  intern/GHOST_Rect.cc
+  intern/GHOST_System.cc
+  intern/GHOST_TimerManager.cc
+  intern/GHOST_Window.cc
+  intern/GHOST_WindowManager.cc
 
   GHOST_C-api.h
-  GHOST_IContext.h
-  GHOST_IEvent.h
-  GHOST_IEventConsumer.h
-  GHOST_ISystem.h
-  GHOST_ISystemPaths.h
-  GHOST_ITimerTask.h
-  GHOST_IWindow.h
-  GHOST_Path-api.h
-  GHOST_Rect.h
+  GHOST_IContext.hh
+  GHOST_IEvent.hh
+  GHOST_IEventConsumer.hh
+  GHOST_ISystem.hh
+  GHOST_ISystemPaths.hh
+  GHOST_ITimerTask.hh
+  GHOST_IWindow.hh
+  GHOST_Path-api.hh
+  GHOST_Rect.hh
   GHOST_Types.h
 
-  intern/GHOST_Buttons.h
-  intern/GHOST_CallbackEventConsumer.h
-  intern/GHOST_Context.h
-  intern/GHOST_ContextNone.h
-  intern/GHOST_Debug.h
-  intern/GHOST_DisplayManager.h
-  intern/GHOST_Event.h
-  intern/GHOST_EventButton.h
-  intern/GHOST_EventCursor.h
-  intern/GHOST_EventDragnDrop.h
-  intern/GHOST_EventKey.h
-  intern/GHOST_EventManager.h
-  intern/GHOST_EventString.h
-  intern/GHOST_EventTrackpad.h
-  intern/GHOST_EventWheel.h
-  intern/GHOST_ModifierKeys.h
-  intern/GHOST_PathUtils.h
-  intern/GHOST_System.h
-  intern/GHOST_SystemPaths.h
-  intern/GHOST_TimerManager.h
-  intern/GHOST_TimerTask.h
-  intern/GHOST_Util.h
-  intern/GHOST_Window.h
-  intern/GHOST_WindowManager.h
-  intern/GHOST_utildefines.h
-  intern/GHOST_utildefines_variadic.h
+  intern/GHOST_Buttons.hh
+  intern/GHOST_CallbackEventConsumer.hh
+  intern/GHOST_Context.hh
+  intern/GHOST_ContextNone.hh
+  intern/GHOST_Debug.hh
+  intern/GHOST_DisplayManager.hh
+  intern/GHOST_Event.hh
+  intern/GHOST_EventButton.hh
+  intern/GHOST_EventCursor.hh
+  intern/GHOST_EventDragnDrop.hh
+  intern/GHOST_EventKey.hh
+  intern/GHOST_EventManager.hh
+  intern/GHOST_EventString.hh
+  intern/GHOST_EventTrackpad.hh
+  intern/GHOST_EventWheel.hh
+  intern/GHOST_ModifierKeys.hh
+  intern/GHOST_PathUtils.hh
+  intern/GHOST_System.hh
+  intern/GHOST_SystemPaths.hh
+  intern/GHOST_TimerManager.hh
+  intern/GHOST_TimerTask.hh
+  intern/GHOST_Util.hh
+  intern/GHOST_Window.hh
+  intern/GHOST_WindowManager.hh
+  intern/GHOST_utildefines.hh
+  intern/GHOST_utildefines_variadic.hh
 )
 
 set(LIB
@@ -78,9 +78,9 @@ set(LIB
 
 if(WITH_VULKAN_BACKEND)
   list(APPEND SRC
-    intern/GHOST_ContextVK.cpp
+    intern/GHOST_ContextVK.cc
 
-    intern/GHOST_ContextVK.h
+    intern/GHOST_ContextVK.hh
   )
 
   list(APPEND INC_SYS
@@ -98,9 +98,9 @@ endif()
 
 if(WITH_GHOST_DEBUG)
   list(APPEND SRC
-    intern/GHOST_EventPrinter.cpp
+    intern/GHOST_EventPrinter.cc
 
-    intern/GHOST_EventPrinter.h
+    intern/GHOST_EventPrinter.hh
   )
   add_definitions(-DWITH_GHOST_DEBUG)
 endif()
@@ -109,10 +109,10 @@ if(WITH_INPUT_NDOF)
   add_definitions(-DWITH_INPUT_NDOF)
 
   list(APPEND SRC
-    intern/GHOST_NDOFManager.cpp
+    intern/GHOST_NDOFManager.cc
 
-    intern/GHOST_EventNDOF.h
-    intern/GHOST_NDOFManager.h
+    intern/GHOST_EventNDOF.hh
+    intern/GHOST_NDOFManager.hh
   )
 
   list(APPEND INC_SYS
@@ -124,24 +124,24 @@ if(WITH_INPUT_NDOF)
 endif()
 
 list(APPEND SRC
-  intern/GHOST_DisplayManagerNULL.h
-  intern/GHOST_SystemHeadless.h
-  intern/GHOST_WindowNULL.h
+  intern/GHOST_DisplayManagerNULL.hh
+  intern/GHOST_SystemHeadless.hh
+  intern/GHOST_WindowNULL.hh
 )
 
 if(WITH_HEADLESS)
   add_definitions(-DWITH_HEADLESS)
 elseif(WITH_GHOST_SDL)
   list(APPEND SRC
-    intern/GHOST_ContextSDL.cpp
-    intern/GHOST_DisplayManagerSDL.cpp
-    intern/GHOST_SystemSDL.cpp
-    intern/GHOST_WindowSDL.cpp
+    intern/GHOST_ContextSDL.cc
+    intern/GHOST_DisplayManagerSDL.cc
+    intern/GHOST_SystemSDL.cc
+    intern/GHOST_WindowSDL.cc
 
-    intern/GHOST_ContextSDL.h
-    intern/GHOST_DisplayManagerSDL.h
-    intern/GHOST_SystemSDL.h
-    intern/GHOST_WindowSDL.h
+    intern/GHOST_ContextSDL.hh
+    intern/GHOST_DisplayManagerSDL.hh
+    intern/GHOST_SystemSDL.hh
+    intern/GHOST_WindowSDL.hh
   )
   add_definitions(-DWITH_GHOST_SDL)
 
@@ -167,23 +167,23 @@ elseif(APPLE AND NOT WITH_GHOST_X11)
     intern/GHOST_SystemCocoa.mm
     intern/GHOST_WindowCocoa.mm
 
-    intern/GHOST_DisplayManagerCocoa.h
-    intern/GHOST_SystemCocoa.h
-    intern/GHOST_WindowCocoa.h
-    intern/GHOST_WindowViewCocoa.h
+    intern/GHOST_DisplayManagerCocoa.hh
+    intern/GHOST_SystemCocoa.hh
+    intern/GHOST_WindowCocoa.hh
+    intern/GHOST_WindowViewCocoa.hh
   )
 
   list(APPEND SRC
     intern/GHOST_ContextCGL.mm
 
-    intern/GHOST_ContextCGL.h
+    intern/GHOST_ContextCGL.hh
   )
 
   if(WITH_INPUT_NDOF)
     list(APPEND SRC
       intern/GHOST_NDOFManagerCocoa.mm
 
-      intern/GHOST_NDOFManagerCocoa.h
+      intern/GHOST_NDOFManagerCocoa.hh
     )
   endif()
 
@@ -199,22 +199,22 @@ elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND)
     )
 
     list(APPEND SRC
-      intern/GHOST_DisplayManagerX11.cpp
-      intern/GHOST_SystemX11.cpp
-      intern/GHOST_TaskbarX11.cpp
-      intern/GHOST_WindowX11.cpp
+      intern/GHOST_DisplayManagerX11.cc
+      intern/GHOST_SystemX11.cc
+      intern/GHOST_TaskbarX11.cc
+      intern/GHOST_WindowX11.cc
 
-      intern/GHOST_DisplayManagerX11.h
-      intern/GHOST_IconX11.h
-      intern/GHOST_SystemX11.h
-      intern/GHOST_TaskbarX11.h
-      intern/GHOST_WindowX11.h
+      intern/GHOST_DisplayManagerX11.hh
+      intern/GHOST_IconX11.hh
+      intern/GHOST_SystemX11.hh
+      intern/GHOST_TaskbarX11.hh
+      intern/GHOST_WindowX11.hh
     )
 
     list(APPEND SRC
-      intern/GHOST_ContextGLX.cpp
+      intern/GHOST_ContextGLX.cc
 
-      intern/GHOST_ContextGLX.h
+      intern/GHOST_ContextGLX.hh
     )
 
     if(WITH_GHOST_XDND)
@@ -229,9 +229,9 @@ elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND)
       )
 
       list(APPEND SRC
-        intern/GHOST_DropTargetX11.cpp
+        intern/GHOST_DropTargetX11.cc
 
-        intern/GHOST_DropTargetX11.h
+        intern/GHOST_DropTargetX11.hh
       )
     endif()
 
@@ -336,13 +336,13 @@ elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND)
     endif()
 
     list(APPEND SRC
-      intern/GHOST_SystemWayland.cpp
-      intern/GHOST_WindowWayland.cpp
+      intern/GHOST_SystemWayland.cc
+      intern/GHOST_WindowWayland.cc
 
-      intern/GHOST_SystemWayland.h
-      intern/GHOST_WaylandCursorSettings.h
-      intern/GHOST_WaylandUtils.h
-      intern/GHOST_WindowWayland.h
+      intern/GHOST_SystemWayland.hh
+      intern/GHOST_WaylandCursorSettings.hh
+      intern/GHOST_WaylandUtils.hh
+      intern/GHOST_WindowWayland.hh
     )
 
     set(INC_DST ${CMAKE_CURRENT_BINARY_DIR}/libwayland)
@@ -441,9 +441,9 @@ elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND)
 
   if(WITH_INPUT_NDOF)
     list(APPEND SRC
-      intern/GHOST_NDOFManagerUnix.cpp
+      intern/GHOST_NDOFManagerUnix.cc
 
-      intern/GHOST_NDOFManagerUnix.h
+      intern/GHOST_NDOFManagerUnix.hh
     )
   endif()
 
@@ -463,67 +463,67 @@ elseif(WIN32)
   )
 
   list(APPEND SRC
-    intern/GHOST_ContextD3D.cpp
-    intern/GHOST_DisplayManagerWin32.cpp
-    intern/GHOST_DropTargetWin32.cpp
-    intern/GHOST_SystemWin32.cpp
-    intern/GHOST_TrackpadWin32.cpp
-    intern/GHOST_WindowWin32.cpp
-    intern/GHOST_Wintab.cpp
+    intern/GHOST_ContextD3D.cc
+    intern/GHOST_DisplayManagerWin32.cc
+    intern/GHOST_DropTargetWin32.cc
+    intern/GHOST_SystemWin32.cc
+    intern/GHOST_TrackpadWin32.cc
+    intern/GHOST_WindowWin32.cc
+    intern/GHOST_Wintab.cc
 
-    intern/GHOST_ContextD3D.h
-    intern/GHOST_DisplayManagerWin32.h
-    intern/GHOST_DropTargetWin32.h
-    intern/GHOST_SystemWin32.h
-    intern/GHOST_TaskbarWin32.h
-    intern/GHOST_TrackpadWin32.h
-    intern/GHOST_WindowWin32.h
-    intern/GHOST_Wintab.h
+    intern/GHOST_ContextD3D.hh
+    intern/GHOST_DisplayManagerWin32.hh
+    intern/GHOST_DropTargetWin32.hh
+    intern/GHOST_SystemWin32.hh
+    intern/GHOST_TaskbarWin32.hh
+    intern/GHOST_TrackpadWin32.hh
+    intern/GHOST_WindowWin32.hh
+    intern/GHOST_Wintab.hh
   )
 
   list(APPEND SRC
-    intern/GHOST_ContextWGL.cpp
+    intern/GHOST_ContextWGL.cc
 
-    intern/GHOST_ContextWGL.h
+    intern/GHOST_ContextWGL.hh
   )
 
   if(WITH_INPUT_IME)
     add_definitions(-DWITH_INPUT_IME)
 
     list(APPEND SRC
-      intern/GHOST_ImeWin32.cpp
+      intern/GHOST_ImeWin32.cc
 
-      intern/GHOST_ImeWin32.h
+      intern/GHOST_ImeWin32.hh
     )
   endif()
 
   if(WITH_INPUT_NDOF)
     list(APPEND SRC
-      intern/GHOST_NDOFManagerWin32.cpp
+      intern/GHOST_NDOFManagerWin32.cc
 
-      intern/GHOST_NDOFManagerWin32.h
+      intern/GHOST_NDOFManagerWin32.hh
     )
   endif()
 endif()
 
 if(UNIX AND NOT APPLE)
   list(APPEND SRC
-    intern/GHOST_ContextEGL.cpp
+    intern/GHOST_ContextEGL.cc
 
-    intern/GHOST_ContextEGL.h
+    intern/GHOST_ContextEGL.hh
   )
 endif()
 
 if(APPLE)
   list(APPEND SRC
-    intern/GHOST_SystemPathsCocoa.h
+    intern/GHOST_SystemPathsCocoa.hh
     intern/GHOST_SystemPathsCocoa.mm
   )
 
 elseif(UNIX)
   list(APPEND SRC
-    intern/GHOST_SystemPathsUnix.cpp
-    intern/GHOST_SystemPathsUnix.h
+    intern/GHOST_SystemPathsUnix.cc
+    intern/GHOST_SystemPathsUnix.hh
   )
 
   if(NOT WITH_INSTALL_PORTABLE)
@@ -532,8 +532,8 @@ elseif(UNIX)
 
 elseif(WIN32)
   list(APPEND SRC
-    intern/GHOST_SystemPathsWin32.cpp
-    intern/GHOST_SystemPathsWin32.h
+    intern/GHOST_SystemPathsWin32.cc
+    intern/GHOST_SystemPathsWin32.hh
   )
 
   list(APPEND INC
@@ -544,25 +544,25 @@ endif()
 
 if(WITH_XR_OPENXR)
   list(APPEND SRC
-    intern/GHOST_Xr.cpp
-    intern/GHOST_XrAction.cpp
-    intern/GHOST_XrContext.cpp
-    intern/GHOST_XrControllerModel.cpp
-    intern/GHOST_XrEvent.cpp
-    intern/GHOST_XrGraphicsBinding.cpp
-    intern/GHOST_XrSession.cpp
-    intern/GHOST_XrSwapchain.cpp
+    intern/GHOST_Xr.cc
+    intern/GHOST_XrAction.cc
+    intern/GHOST_XrContext.cc
+    intern/GHOST_XrControllerModel.cc
+    intern/GHOST_XrEvent.cc
+    intern/GHOST_XrGraphicsBinding.cc
+    intern/GHOST_XrSession.cc
+    intern/GHOST_XrSwapchain.cc
 
-    GHOST_IXrContext.h
-    intern/GHOST_IXrGraphicsBinding.h
-    intern/GHOST_XrAction.h
-    intern/GHOST_XrContext.h
-    intern/GHOST_XrControllerModel.h
-    intern/GHOST_XrException.h
-    intern/GHOST_XrSession.h
-    intern/GHOST_XrSwapchain.h
-    intern/GHOST_Xr_intern.h
-    intern/GHOST_Xr_openxr_includes.h
+    GHOST_IXrContext.hh
+    intern/GHOST_IXrGraphicsBinding.hh
+    intern/GHOST_XrAction.hh
+    intern/GHOST_XrContext.hh
+    intern/GHOST_XrControllerModel.hh
+    intern/GHOST_XrException.hh
+    intern/GHOST_XrSession.hh
+    intern/GHOST_XrSwapchain.hh
+    intern/GHOST_Xr_intern.hh
+    intern/GHOST_Xr_openxr_includes.hh
 
     # Header only library.
     ../../extern/tinygltf/tiny_gltf.h

intern/ghost/GHOST_IEventConsumer.hh

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "GHOST_IEvent.h"
+#include "GHOST_IEvent.hh"
 
 /**
  * Interface class for objects interested in receiving events.

intern/ghost/GHOST_ISystem.hh

@@ -12,9 +12,9 @@
 
 #include <stdlib.h>
 
-#include "GHOST_IContext.h"
-#include "GHOST_ITimerTask.h"
-#include "GHOST_IWindow.h"
+#include "GHOST_IContext.hh"
+#include "GHOST_ITimerTask.hh"
+#include "GHOST_IWindow.hh"
 #include "GHOST_Types.h"
 
 class GHOST_IEventConsumer;
@@ -77,12 +77,12 @@ class GHOST_IEventConsumer;
  *
  * \subsection cplusplus_api The C++ API consists of the following files:
  *
- * - GHOST_IEvent.h
- * - GHOST_IEventConsumer.h
- * - GHOST_ISystem.h
- * - GHOST_ITimerTask.h
- * - GHOST_IWindow.h
- * - GHOST_Rect.h
+ * - GHOST_IEvent.hh
+ * - GHOST_IEventConsumer.hh
+ * - GHOST_ISystem.hh
+ * - GHOST_ITimerTask.hh
+ * - GHOST_IWindow.hh
+ * - GHOST_Rect.hh
  * - GHOST_Types.h
  *
  * For an example of using the C++-API, have a look at the GHOST_C-Test.cpp

intern/ghost/GHOST_IWindow.hh

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "GHOST_Rect.h"
+#include "GHOST_Rect.hh"
 #include "GHOST_Types.h"
 
 #include <stdlib.h>

intern/ghost/intern/GHOST_Buttons.cc

@@ -5,7 +5,7 @@
  * \ingroup GHOST
  */
 
-#include "GHOST_Buttons.h"
+#include "GHOST_Buttons.hh"
 
 GHOST_Buttons::GHOST_Buttons()
 {

intern/ghost/intern/GHOST_C-api.cc

@@ -11,16 +11,16 @@
 #include <cstring>
 
 #include "GHOST_C-api.h"
-#include "GHOST_IEvent.h"
-#include "GHOST_IEventConsumer.h"
-#include "GHOST_ISystem.h"
-#include "intern/GHOST_Debug.h"
+#include "GHOST_IEvent.hh"
+#include "GHOST_IEventConsumer.hh"
+#include "GHOST_ISystem.hh"
+#include "intern/GHOST_Debug.hh"
 #ifdef WITH_XR_OPENXR
-#  include "GHOST_IXrContext.h"
-#  include "intern/GHOST_XrSession.h"
+#  include "GHOST_IXrContext.hh"
+#  include "intern/GHOST_XrSession.hh"
 #endif
-#include "intern/GHOST_CallbackEventConsumer.h"
-#include "intern/GHOST_XrException.h"
+#include "intern/GHOST_CallbackEventConsumer.hh"
+#include "intern/GHOST_XrException.hh"
 
 GHOST_SystemHandle GHOST_CreateSystem(void)
 {

intern/ghost/intern/GHOST_CallbackEventConsumer.cc

@@ -9,9 +9,9 @@
  * Copyright (C) 2001 NaN Technologies B.V.
  */
 
-#include "GHOST_CallbackEventConsumer.h"
+#include "GHOST_CallbackEventConsumer.hh"
 #include "GHOST_C-api.h"
-#include "GHOST_Debug.h"
+#include "GHOST_Debug.hh"
 
 GHOST_CallbackEventConsumer::GHOST_CallbackEventConsumer(GHOST_EventCallbackProcPtr eventCallback,
                                                          GHOST_TUserDataPtr userData)

intern/ghost/intern/GHOST_CallbackEventConsumer.hh

@@ -9,7 +9,7 @@
 #pragma once
 
 #include "GHOST_C-api.h"
-#include "GHOST_IEventConsumer.h"
+#include "GHOST_IEventConsumer.hh"
 
 /**
  * Event consumer that will forward events to a call-back routine.

intern/ghost/intern/GHOST_Context.cc

@@ -7,7 +7,7 @@
  * Definition of GHOST_Context class.
  */
 
-#include "GHOST_Context.h"
+#include "GHOST_Context.hh"
 
 #ifdef _WIN32
 #  include <epoxy/wgl.h>

intern/ghost/intern/GHOST_Context.hh

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "GHOST_IContext.h"
+#include "GHOST_IContext.hh"
 #include "GHOST_Types.h"
 
 #include <epoxy/gl.h>

intern/ghost/intern/GHOST_ContextCGL.hh

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "GHOST_Context.h"
+#include "GHOST_Context.hh"
 
 #include <Cocoa/Cocoa.h>
 #include <Metal/Metal.h>

intern/ghost/intern/GHOST_ContextCGL.mm

@@ -13,7 +13,7 @@
 #  pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
-#include "GHOST_ContextCGL.h"
+#include "GHOST_ContextCGL.hh"
 
 #include <Cocoa/Cocoa.h>
 #include <Metal/Metal.h>

intern/ghost/intern/GHOST_ContextD3D.cc

@@ -12,8 +12,8 @@
 
 #include <epoxy/wgl.h>
 
-#include "GHOST_ContextD3D.h"
-#include "GHOST_ContextWGL.h" /* For shared drawing */
+#include "GHOST_ContextD3D.hh"
+#include "GHOST_ContextWGL.hh" /* For shared drawing */
 
 HMODULE GHOST_ContextD3D::s_d3d_lib = NULL;
 PFN_D3D11_CREATE_DEVICE GHOST_ContextD3D::s_D3D11CreateDeviceFn = NULL;

intern/ghost/intern/GHOST_ContextD3D.hh

@@ -12,7 +12,7 @@
 
 #include <D3D11.h>
 
-#include "GHOST_Context.h"
+#include "GHOST_Context.hh"
 
 class GHOST_ContextD3D : public GHOST_Context {
   /* XR code needs low level graphics data to send to OpenXR. */

intern/ghost/intern/GHOST_ContextEGL.cc

@@ -7,7 +7,7 @@
  * Definition of GHOST_ContextEGL class.
  */
 
-#include "GHOST_ContextEGL.h"
+#include "GHOST_ContextEGL.hh"
 
 #include <set>
 #include <sstream>

intern/ghost/intern/GHOST_ContextEGL.hh

@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "GHOST_Context.h"
-#include "GHOST_System.h"
+#include "GHOST_Context.hh"
+#include "GHOST_System.hh"
 
 #include <epoxy/egl.h>
 #include <epoxy/gl.h>

intern/ghost/intern/GHOST_ContextGLX.cc

@@ -7,8 +7,8 @@
  * Definition of GHOST_ContextGLX class.
  */
 
-#include "GHOST_ContextGLX.h"
-#include "GHOST_SystemX11.h"
+#include "GHOST_ContextGLX.hh"
+#include "GHOST_SystemX11.hh"
 
 #include <vector>
 

intern/ghost/intern/GHOST_ContextGLX.hh

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "GHOST_Context.h"
+#include "GHOST_Context.hh"
 
 #include <epoxy/glx.h>
 

intern/ghost/intern/GHOST_ContextNone.cc

@@ -7,7 +7,7 @@
  * Definition of GHOST_ContextNone class.
  */
 
-#include "GHOST_ContextNone.h"
+#include "GHOST_ContextNone.hh"
 
 GHOST_TSuccess GHOST_ContextNone::swapBuffers()
 {

intern/ghost/intern/GHOST_ContextNone.hh

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "GHOST_Context.h"
+#include "GHOST_Context.hh"
 
 class GHOST_ContextNone : public GHOST_Context {
  public:

intern/ghost/intern/GHOST_ContextSDL.cc

@@ -7,7 +7,7 @@
  * Definition of GHOST_ContextSDL class.
  */
 
-#include "GHOST_ContextSDL.h"
+#include "GHOST_ContextSDL.hh"
 
 #include <vector>
 

intern/ghost/intern/GHOST_ContextSDL.hh

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "GHOST_Context.h"
+#include "GHOST_Context.hh"
 
 extern "C" {
 #include "SDL.h"

intern/ghost/intern/GHOST_ContextVK.cc

@@ -4,7 +4,7 @@
  * \ingroup GHOST
  */
 
-#include "GHOST_ContextVK.h"
+#include "GHOST_ContextVK.hh"
 
 #ifdef _WIN32
 #  include <vulkan/vulkan_win32.h>

intern/ghost/intern/GHOST_ContextVK.hh

@@ -6,16 +6,16 @@
 
 #pragma once
 
-#include "GHOST_Context.h"
+#include "GHOST_Context.hh"
 
 #ifdef _WIN32
-#  include "GHOST_SystemWin32.h"
+#  include "GHOST_SystemWin32.hh"
 #elif defined(__APPLE__)
-#  include "GHOST_SystemCocoa.h"
+#  include "GHOST_SystemCocoa.hh"
 #else
-#  include "GHOST_SystemX11.h"
+#  include "GHOST_SystemX11.hh"
 #  ifdef WITH_GHOST_WAYLAND
-#    include "GHOST_SystemWayland.h"
+#    include "GHOST_SystemWayland.hh"
 #  else
 #    define wl_surface void
 #    define wl_display void

intern/ghost/intern/GHOST_ContextWGL.cc

@@ -7,7 +7,7 @@
  * Definition of GHOST_ContextWGL class.
  */
 
-#include "GHOST_ContextWGL.h"
+#include "GHOST_ContextWGL.hh"
 
 #include <tchar.h>
 

intern/ghost/intern/GHOST_ContextWGL.hh

@@ -9,7 +9,7 @@
 
 //#define WIN32_COMPOSITING
 
-#include "GHOST_Context.h"
+#include "GHOST_Context.hh"
 
 #include <epoxy/wgl.h>
 

intern/ghost/intern/GHOST_DisplayManager.cc

@@ -9,8 +9,8 @@
  * Copyright (C) 2001 NaN Technologies B.V.
  */
 
-#include "GHOST_DisplayManager.h"
-#include "GHOST_Debug.h"
+#include "GHOST_DisplayManager.hh"
+#include "GHOST_Debug.hh"
 
 GHOST_DisplayManager::GHOST_DisplayManager() : m_settingsInitialized(false) {}
 

intern/ghost/intern/GHOST_DisplayManagerCocoa.hh

@@ -12,7 +12,7 @@
 #  error Apple only!
 #endif  // __APPLE__
 
-#include "GHOST_DisplayManager.h"
+#include "GHOST_DisplayManager.hh"
 
 /**
  * Manages system displays  (Mac OSX/Cocoa implementation).

intern/ghost/intern/GHOST_DisplayManagerCocoa.mm

@@ -3,8 +3,8 @@
 
 #include <Cocoa/Cocoa.h>
 
-#include "GHOST_Debug.h"
-#include "GHOST_DisplayManagerCocoa.h"
+#include "GHOST_Debug.hh"
+#include "GHOST_DisplayManagerCocoa.hh"
 
 // We do not support multiple monitors at the moment
 

intern/ghost/intern/GHOST_DisplayManagerNULL.hh

@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "GHOST_DisplayManager.h"
-#include "GHOST_SystemHeadless.h"
+#include "GHOST_DisplayManager.hh"
+#include "GHOST_SystemHeadless.hh"
 
 class GHOST_SystemHeadless;
 

intern/ghost/intern/GHOST_DisplayManagerSDL.cc

@@ -8,10 +8,10 @@
  * \ingroup GHOST
  */
 
-#include "GHOST_DisplayManagerSDL.h"
-#include "GHOST_SystemSDL.h"
+#include "GHOST_DisplayManagerSDL.hh"
+#include "GHOST_SystemSDL.hh"
 
-#include "GHOST_WindowManager.h"
+#include "GHOST_WindowManager.hh"
 
 GHOST_DisplayManagerSDL::GHOST_DisplayManagerSDL(GHOST_SystemSDL *system)
     : GHOST_DisplayManager(), m_system(system)

intern/ghost/intern/GHOST_DisplayManagerSDL.hh

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "GHOST_DisplayManager.h"
+#include "GHOST_DisplayManager.hh"
 
 extern "C" {
 #include "SDL.h"

intern/ghost/intern/GHOST_DisplayManagerWin32.cc

@@ -5,8 +5,8 @@
  * \ingroup GHOST
  */
 
-#include "GHOST_DisplayManagerWin32.h"
-#include "GHOST_Debug.h"
+#include "GHOST_DisplayManagerWin32.hh"
+#include "GHOST_Debug.hh"
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>

intern/ghost/intern/GHOST_DisplayManagerWin32.hh

@@ -12,7 +12,7 @@
 #  error WIN32 only!
 #endif  // WIN32
 
-#include "GHOST_DisplayManager.h"
+#include "GHOST_DisplayManager.hh"
 
 /**
  * Manages system displays  (WIN32 implementation).

intern/ghost/intern/GHOST_DisplayManagerX11.cc

@@ -14,8 +14,8 @@
 #  include <X11/extensions/xf86vmode.h>
 #endif
 
-#include "GHOST_DisplayManagerX11.h"
-#include "GHOST_SystemX11.h"
+#include "GHOST_DisplayManagerX11.hh"
+#include "GHOST_SystemX11.hh"
 
 GHOST_DisplayManagerX11::GHOST_DisplayManagerX11(GHOST_SystemX11 *system)
     : GHOST_DisplayManager(), m_system(system)

intern/ghost/intern/GHOST_DisplayManagerX11.hh

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "GHOST_DisplayManager.h"
+#include "GHOST_DisplayManager.hh"
 
 class GHOST_SystemX11;
 

intern/ghost/intern/GHOST_DropTargetWin32.cc

@@ -5,8 +5,8 @@
  * \ingroup GHOST
  */
 
-#include "GHOST_DropTargetWin32.h"
-#include "GHOST_Debug.h"
+#include "GHOST_DropTargetWin32.hh"
+#include "GHOST_Debug.hh"
 #include <shellapi.h>
 
 #include "utf_winfunc.h"

intern/ghost/intern/GHOST_DropTargetWin32.hh

@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "GHOST_SystemWin32.h"
-#include "GHOST_WindowWin32.h"
+#include "GHOST_SystemWin32.hh"
+#include "GHOST_WindowWin32.hh"
 #include <GHOST_Types.h>
 #include <string.h>
 

intern/ghost/intern/GHOST_DropTargetX11.cc

@@ -5,10 +5,10 @@
  * \ingroup GHOST
  */
 
-#include "GHOST_DropTargetX11.h"
-#include "GHOST_Debug.h"
-#include "GHOST_PathUtils.h"
-#include "GHOST_utildefines.h"
+#include "GHOST_DropTargetX11.hh"
+#include "GHOST_Debug.hh"
+#include "GHOST_PathUtils.hh"
+#include "GHOST_utildefines.hh"
 
 #include <cassert>
 #include <cctype>

intern/ghost/intern/GHOST_DropTargetX11.hh

@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "GHOST_SystemX11.h"
-#include "GHOST_WindowX11.h"
+#include "GHOST_SystemX11.hh"
+#include "GHOST_WindowX11.hh"
 #include <GHOST_Types.h>
 
 #include "xdnd.h"

intern/ghost/intern/GHOST_Event.hh

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "GHOST_IEvent.h"
+#include "GHOST_IEvent.hh"
 
 /**
  * Base class for events received the operating system.

intern/ghost/intern/GHOST_EventButton.hh

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "GHOST_Event.h"
-#include "GHOST_Window.h"
+#include "GHOST_Event.hh"
+#include "GHOST_Window.hh"
 
 /**
  * Mouse button event.

intern/ghost/intern/GHOST_EventCursor.hh

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "GHOST_Event.h"
+#include "GHOST_Event.hh"
 
 /**
  * Cursor event.

intern/ghost/intern/GHOST_EventDragnDrop.hh

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "GHOST_Event.h"
+#include "GHOST_Event.hh"
 extern "C" {
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"

intern/ghost/intern/GHOST_EventKey.hh

@@ -10,7 +10,7 @@
 
 #include <string.h>
 
-#include "GHOST_Event.h"
+#include "GHOST_Event.hh"
 
 /**
  * Key event.

intern/ghost/intern/GHOST_EventManager.cc

@@ -9,8 +9,8 @@
  * Copyright (C) 2001 NaN Technologies B.V.
  */
 
-#include "GHOST_EventManager.h"
-#include "GHOST_Debug.h"
+#include "GHOST_EventManager.hh"
+#include "GHOST_Debug.hh"
 #include <algorithm>
 
 GHOST_EventManager::GHOST_EventManager() {}

intern/ghost/intern/GHOST_EventManager.hh

@@ -11,7 +11,7 @@
 #include <deque>
 #include <vector>
 
-#include "GHOST_IEventConsumer.h"
+#include "GHOST_IEventConsumer.hh"
 
 /**
  * Manages an event stack and a list of event consumers.

intern/ghost/intern/GHOST_EventNDOF.hh

@@ -10,7 +10,7 @@
 #  error NDOF code included in non-NDOF-enabled build
 #endif
 
-#include "GHOST_Event.h"
+#include "GHOST_Event.hh"
 
 class GHOST_EventNDOFMotion : public GHOST_Event {
  protected:

intern/ghost/intern/GHOST_EventPrinter.cc

@@ -6,10 +6,10 @@
  * Declaration of GHOST_EventPrinter class.
  */
 
-#include "GHOST_EventPrinter.h"
-#include "GHOST_Debug.h"
-#include "GHOST_EventDragnDrop.h"
-#include "GHOST_EventKey.h"
+#include "GHOST_EventPrinter.hh"
+#include "GHOST_Debug.hh"
+#include "GHOST_EventDragnDrop.hh"
+#include "GHOST_EventKey.hh"
 #include <iostream>
 
 #include <cstdio>

intern/ghost/intern/GHOST_EventPrinter.hh

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "GHOST_IEventConsumer.h"
+#include "GHOST_IEventConsumer.hh"
 
 /**
  * An Event consumer that prints all the events to standard out.

intern/ghost/intern/GHOST_EventString.hh

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "GHOST_Event.h"
+#include "GHOST_Event.hh"
 
 /**
  * Generic class for events with string data

intern/ghost/intern/GHOST_EventTrackpad.hh

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "GHOST_Event.h"
+#include "GHOST_Event.hh"
 
 /**
  * Trackpad (scroll, magnify, rotate, ...) event.

intern/ghost/intern/GHOST_EventWheel.hh

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "GHOST_Event.h"
+#include "GHOST_Event.hh"
 
 /**
  * Mouse wheel event.

intern/ghost/intern/GHOST_ISystem.cc

@@ -11,22 +11,22 @@
 
 #include <stdexcept>
 
-#include "GHOST_ISystem.h"
-#include "GHOST_SystemHeadless.h"
+#include "GHOST_ISystem.hh"
+#include "GHOST_SystemHeadless.hh"
 
 #if defined(WITH_GHOST_X11) && defined(WITH_GHOST_WAYLAND)
-#  include "GHOST_SystemWayland.h"
-#  include "GHOST_SystemX11.h"
+#  include "GHOST_SystemWayland.hh"
+#  include "GHOST_SystemX11.hh"
 #elif defined(WITH_GHOST_X11)
-#  include "GHOST_SystemX11.h"
+#  include "GHOST_SystemX11.hh"
 #elif defined(WITH_GHOST_WAYLAND)
-#  include "GHOST_SystemWayland.h"
+#  include "GHOST_SystemWayland.hh"
 #elif defined(WITH_GHOST_SDL)
-#  include "GHOST_SystemSDL.h"
+#  include "GHOST_SystemSDL.hh"
 #elif defined(WIN32)
-#  include "GHOST_SystemWin32.h"
+#  include "GHOST_SystemWin32.hh"
 #elif defined(__APPLE__)
-#  include "GHOST_SystemCocoa.h"
+#  include "GHOST_SystemCocoa.hh"
 #endif
 
 GHOST_ISystem *GHOST_ISystem::m_system = nullptr;

intern/ghost/intern/GHOST_ISystemPaths.cc

@@ -9,15 +9,15 @@
  * Copyright (C) 2001 NaN Technologies B.V.
  */
 
-#include "GHOST_ISystemPaths.h"
+#include "GHOST_ISystemPaths.hh"
 
 #ifdef WIN32
-#  include "GHOST_SystemPathsWin32.h"
+#  include "GHOST_SystemPathsWin32.hh"
 #else
 #  ifdef __APPLE__
-#    include "GHOST_SystemPathsCocoa.h"
+#    include "GHOST_SystemPathsCocoa.hh"
 #  else
-#    include "GHOST_SystemPathsUnix.h"
+#    include "GHOST_SystemPathsUnix.hh"
 #  endif
 #endif
 

intern/ghost/intern/GHOST_IXrGraphicsBinding.hh

@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 
-#include "GHOST_Xr_openxr_includes.h"
+#include "GHOST_Xr_openxr_includes.hh"
 
 class GHOST_IXrGraphicsBinding {
  public:

intern/ghost/intern/GHOST_ImeWin32.cc

@@ -7,9 +7,9 @@
 
 #ifdef WITH_INPUT_IME
 
-#  include "GHOST_ImeWin32.h"
+#  include "GHOST_ImeWin32.hh"
 #  include "GHOST_C-api.h"
-#  include "GHOST_WindowWin32.h"
+#  include "GHOST_WindowWin32.hh"
 #  include "utfconv.h"
 
 /* ISO_639-1 2-Letter Abbreviations. */

intern/ghost/intern/GHOST_ImeWin32.hh

@@ -14,8 +14,8 @@
 
 #  include <string>
 
-#  include "GHOST_Event.h"
-#  include "GHOST_Rect.h"
+#  include "GHOST_Event.hh"
+#  include "GHOST_Rect.hh"
 #  include <vector>
 
 /* MSDN LOCALE_SISO639LANGNAME states maximum length of 9, including terminating null. */

intern/ghost/intern/GHOST_ModifierKeys.cc

@@ -9,8 +9,8 @@
  * Copyright (C) 2001 NaN Technologies B.V.
  */
 
-#include "GHOST_ModifierKeys.h"
-#include "GHOST_Debug.h"
+#include "GHOST_ModifierKeys.hh"
+#include "GHOST_Debug.hh"
 
 GHOST_ModifierKeys::GHOST_ModifierKeys()
 {

intern/ghost/intern/GHOST_NDOFManager.cc

@@ -1,11 +1,11 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "GHOST_NDOFManager.h"
-#include "GHOST_Debug.h"
-#include "GHOST_EventKey.h"
-#include "GHOST_EventNDOF.h"
-#include "GHOST_WindowManager.h"
-#include "GHOST_utildefines.h"
+#include "GHOST_NDOFManager.hh"
+#include "GHOST_Debug.hh"
+#include "GHOST_EventKey.hh"
+#include "GHOST_EventNDOF.hh"
+#include "GHOST_WindowManager.hh"
+#include "GHOST_utildefines.hh"
 
 /* Logging, use `ghost.ndof.*` prefix. */
 #include "CLG_log.h"

intern/ghost/intern/GHOST_NDOFManager.hh

@@ -6,7 +6,7 @@
 #  error NDOF code included in non-NDOF-enabled build
 #endif
 
-#include "GHOST_System.h"
+#include "GHOST_System.hh"
 
 typedef enum {
   NDOF_UnknownDevice = 0,

intern/ghost/intern/GHOST_NDOFManagerCocoa.hh

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "GHOST_NDOFManager.h"
+#include "GHOST_NDOFManager.hh"
 
 // Event capture is handled within the NDOF manager on Macintosh,
 // so there's no need for SystemCocoa to look for them.

intern/ghost/intern/GHOST_NDOFManagerCocoa.mm

@@ -2,8 +2,8 @@
 
 #define DEBUG_NDOF_DRIVER false
 
-#include "GHOST_NDOFManagerCocoa.h"
-#include "GHOST_SystemCocoa.h"
+#include "GHOST_NDOFManagerCocoa.hh"
+#include "GHOST_SystemCocoa.hh"
 
 #include <dlfcn.h>
 #include <stdint.h>

intern/ghost/intern/GHOST_NDOFManagerUnix.cc

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "GHOST_NDOFManagerUnix.h"
-#include "GHOST_System.h"
+#include "GHOST_NDOFManagerUnix.hh"
+#include "GHOST_System.hh"
 
 /* Logging, use `ghost.ndof.unix.*` prefix. */
 #include "CLG_log.h"

intern/ghost/intern/GHOST_NDOFManagerUnix.hh

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "GHOST_NDOFManager.h"
+#include "GHOST_NDOFManager.hh"
 
 /* Event capture is handled within the NDOF manager on Linux,
  * so there's no need for SystemX11 to look for them. */

intern/ghost/intern/GHOST_NDOFManagerWin32.cc

@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "GHOST_NDOFManagerWin32.h"
+#include "GHOST_NDOFManagerWin32.hh"
 
 GHOST_NDOFManagerWin32::GHOST_NDOFManagerWin32(GHOST_System &sys) : GHOST_NDOFManager(sys)
 {

intern/ghost/intern/GHOST_NDOFManagerWin32.hh

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "GHOST_NDOFManager.h"
+#include "GHOST_NDOFManager.hh"
 
 class GHOST_NDOFManagerWin32 : public GHOST_NDOFManager {
  public:

intern/ghost/intern/GHOST_Path-api.cc

@@ -7,10 +7,10 @@
 
 #include <cstdio>
 
-#include "GHOST_ISystemPaths.h"
-#include "GHOST_Path-api.h"
+#include "GHOST_ISystemPaths.hh"
+#include "GHOST_Path-api.hh"
 #include "GHOST_Types.h"
-#include "intern/GHOST_Debug.h"
+#include "intern/GHOST_Debug.hh"
 
 GHOST_TSuccess GHOST_CreateSystemPaths()
 {

intern/ghost/intern/GHOST_PathUtils.cc

@@ -11,7 +11,7 @@
 #include <cstdlib>
 #include <cstring>
 
-#include "GHOST_PathUtils.h"
+#include "GHOST_PathUtils.hh"
 #include "GHOST_Types.h"
 
 /* Based on: https://stackoverflow.com/a/2766963/432509 */

intern/ghost/intern/GHOST_Rect.cc

@@ -5,7 +5,7 @@
  * \ingroup GHOST
  */
 
-#include "GHOST_Rect.h"
+#include "GHOST_Rect.hh"
 
 void GHOST_Rect::inset(int32_t i)
 {