Use the new dissolve function for all operators.

The new functions keep links between the selected nodes intact when
disconnecting them from their surroundings.

CMakeLists.txt

@@ -349,7 +349,7 @@ mark_as_advanced(WITH_SYSTEM_GLOG)
 option(WITH_FREESTYLE     "Enable Freestyle (advanced edges rendering)" ON)
 
 # Misc
-if(WIN32)
+if(WIN32 OR APPLE)
   option(WITH_INPUT_IME "Enable Input Method Editor (IME) for complex Asian character input" ON)
 endif()
 option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON)
@@ -1705,22 +1705,18 @@ if(WITH_PYTHON)
   endif()
 endif()
 
-if(MSVC)
-  string(APPEND CMAKE_CXX_FLAGS " /std:c++17")
-  # Make MSVC properly report the value of the __cplusplus preprocessor macro
-  # Available MSVC 15.7 (1914) and up, without this it reports 199711L regardless
-  # of the C++ standard chosen above
-  if(MSVC_VERSION GREATER 1913)
-    string(APPEND CMAKE_CXX_FLAGS " /Zc:__cplusplus")
-  endif()
-elseif(
-  CMAKE_COMPILER_IS_GNUCC OR
-  CMAKE_C_COMPILER_ID MATCHES "Clang" OR
-  CMAKE_C_COMPILER_ID MATCHES "Intel"
-)
-  string(APPEND CMAKE_CXX_FLAGS " -std=c++17")
-else()
-  message(FATAL_ERROR "Unknown compiler ${CMAKE_C_COMPILER_ID}, can't enable C++17 build")
+# Select C++17 as the standard for C++ projects.
+set(CMAKE_CXX_STANDARD 17)
+# If C++17 is not available, downgrading to an earlier standard is NOT OK.
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+# Do not enable compiler specific language extentions.
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+# Make MSVC properly report the value of the __cplusplus preprocessor macro
+# Available MSVC 15.7 (1914) and up, without this it reports 199711L regardless
+# of the C++ standard chosen above.
+if(MSVC AND MSVC_VERSION GREATER 1913)
+  string(APPEND CMAKE_CXX_FLAGS " /Zc:__cplusplus")
 endif()
 
 # Visual Studio has all standards it supports available by default
@@ -1915,6 +1911,7 @@ if(FIRST_RUN)
   info_cfg_option(WITH_IK_ITASC)
   info_cfg_option(WITH_IK_SOLVER)
   info_cfg_option(WITH_INPUT_NDOF)
+  info_cfg_option(WITH_INPUT_IME)
   info_cfg_option(WITH_INTERNATIONAL)
   info_cfg_option(WITH_OPENCOLLADA)
   info_cfg_option(WITH_OPENCOLORIO)

build_files/build_environment/CMakeLists.txt

@@ -56,6 +56,7 @@ else()
 endif()
 
 include(cmake/zlib.cmake)
+include(cmake/zstd.cmake)
 include(cmake/openal.cmake)
 include(cmake/png.cmake)
 include(cmake/jpeg.cmake)
@@ -164,6 +165,7 @@ endif()
 if(UNIX AND NOT APPLE)
   include(cmake/libglu.cmake)
   include(cmake/mesa.cmake)
+  include(cmake/wayland_protocols.cmake)
 endif()
 
 include(cmake/harvest.cmake)

build_files/build_environment/cmake/download.cmake

@@ -87,7 +87,9 @@ download_source(LIBGLU)
 download_source(MESA)
 download_source(NASM)
 download_source(XR_OPENXR_SDK)
+download_source(WL_PROTOCOLS)
 download_source(ISPC)
 download_source(GMP)
 download_source(POTRACE)
 download_source(HARU)
+download_source(ZSTD)

build_files/build_environment/cmake/harvest.cmake

@@ -126,6 +126,8 @@ if(UNIX AND NOT APPLE)
 
   harvest(xml2/include xml2/include "*.h")
   harvest(xml2/lib xml2/lib "*.a")
+
+  harvest(wayland-protocols/share/wayland-protocols wayland-protocols/share/wayland-protocols/ "*.xml")
 else()
   harvest(blosc/lib openvdb/lib "*.a")
   harvest(xml2/lib opencollada/lib "*.a")
@@ -190,6 +192,8 @@ harvest(potrace/include potrace/include "*.h")
 harvest(potrace/lib potrace/lib "*.a")
 harvest(haru/include haru/include "*.h")
 harvest(haru/lib haru/lib "*.a")
+harvest(zstd/include zstd/include "*.h")
+harvest(zstd/lib zstd/lib "*.a")
 
 if(UNIX AND NOT APPLE)
   harvest(libglu/lib mesa/lib "*.so*")

build_files/build_environment/cmake/versions.cmake

@@ -216,9 +216,9 @@ set(OPENVDB_HASH 01b490be16cc0e15c690f9a153c21461)
 set(OPENVDB_HASH_TYPE MD5)
 set(OPENVDB_FILE openvdb-${OPENVDB_VERSION}.tar.gz)
 
-set(NANOVDB_GIT_UID e62f7a0bf1e27397223c61ddeaaf57edf111b77f)
+set(NANOVDB_GIT_UID dc37d8a631922e7bef46712947dc19b755f3e841)
 set(NANOVDB_URI https://github.com/AcademySoftwareFoundation/openvdb/archive/${NANOVDB_GIT_UID}.tar.gz)
-set(NANOVDB_HASH 90919510bc6ccd630fedc56f748cb199)
+set(NANOVDB_HASH e7b9e863ec2f3b04ead171dec2322807)
 set(NANOVDB_HASH_TYPE MD5)
 set(NANOVDB_FILE nano-vdb-${NANOVDB_GIT_UID}.tar.gz)
 
@@ -456,12 +456,18 @@ set(NASM_HASH aded8b796c996a486a56e0515c83e414116decc3b184d88043480b32eb0a8589)
 set(NASM_HASH_TYPE SHA256)
 set(NASM_FILE nasm-${NASM_VERSION}.tar.gz)
 
-set(XR_OPENXR_SDK_VERSION 1.0.14)
+set(XR_OPENXR_SDK_VERSION 1.0.17)
 set(XR_OPENXR_SDK_URI https://github.com/KhronosGroup/OpenXR-SDK/archive/release-${XR_OPENXR_SDK_VERSION}.tar.gz)
-set(XR_OPENXR_SDK_HASH 0df6b2fd6045423451a77ff6bc3e1a75)
+set(XR_OPENXR_SDK_HASH bf0fd8828837edff01047474e90013e1)
 set(XR_OPENXR_SDK_HASH_TYPE MD5)
 set(XR_OPENXR_SDK_FILE OpenXR-SDK-${XR_OPENXR_SDK_VERSION}.tar.gz)
 
+set(WL_PROTOCOLS_VERSION 1.21)
+set(WL_PROTOCOLS_FILE wayland-protocols-${WL_PROTOCOLS_VERSION}.tar.gz)
+set(WL_PROTOCOLS_URI https://gitlab.freedesktop.org/wayland/wayland-protocols/-/archive/${WL_PROTOCOLS_VERSION}/${WL_PROTOCOLS_FILE})
+set(WL_PROTOCOLS_HASH af5ca07e13517cdbab33504492cef54a)
+set(WL_PROTOCOLS_HASH_TYPE MD5)
+
 if(BLENDER_PLATFORM_ARM)
   # Unreleased version with macOS arm support.
   set(ISPC_URI https://github.com/ispc/ispc/archive/f5949c055eb9eeb93696978a3da4bfb3a6a30b35.zip)
@@ -494,5 +500,11 @@ set(HARU_HASH 4f916aa49c3069b3a10850013c507460)
 set(HARU_HASH_TYPE MD5)
 set(HARU_FILE libharu-${HARU_VERSION}.tar.gz)
 
+set(ZSTD_VERSION 1.5.0)
+set(ZSTD_URI https://github.com/facebook/zstd/releases/download/v${ZSTD_VERSION}/zstd-${ZSTD_VERSION}.tar.gz)
+set(ZSTD_HASH 5194fbfa781fcf45b98c5e849651aa7b3b0a008c6b72d4a0db760f3002291e94)
+set(ZSTD_HASH_TYPE SHA256)
+set(ZSTD_FILE zstd-${ZSTD_VERSION}.tar.gz)
+
 set(SSE2NEON_GIT https://github.com/DLTcollab/sse2neon.git)
 set(SSE2NEON_GIT_HASH fe5ff00bb8d19b327714a3c290f3e2ce81ba3525)

build_files/build_environment/cmake/wayland_protocols.cmake

@@ -0,0 +1,27 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+ExternalProject_Add(external_wayland_protocols
+  URL file://${PACKAGE_DIR}/${WL_PROTOCOLS_FILE}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH ${WL_PROTOCOLS_HASH_TYPE}=${WL_PROTOCOLS_HASH}
+  PREFIX ${BUILD_DIR}/wayland-protocols
+  CONFIGURE_COMMAND meson --prefix ${LIBDIR}/wayland-protocols . ../external_wayland_protocols -Dtests=false
+  BUILD_COMMAND ninja
+  INSTALL_COMMAND ninja install
+)

build_files/build_environment/cmake/zstd.cmake

@@ -0,0 +1,51 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+set(ZSTD_EXTRA_ARGS
+  -DZSTD_BUILD_PROGRAMS=OFF
+  -DZSTD_BUILD_SHARED=OFF
+  -DZSTD_BUILD_STATIC=ON
+  -DZSTD_BUILD_TESTS=OFF
+  -DZSTD_LEGACY_SUPPORT=OFF
+  -DZSTD_LZ4_SUPPORT=OFF
+  -DZSTD_LZMA_SUPPORT=OFF
+  -DZSTD_MULTITHREAD_SUPPORT=ON
+  -DZSTD_PROGRAMS_LINK_SHARED=OFF
+  -DZSTD_USE_STATIC_RUNTIME=OFF
+  -DZSTD_ZLIB_SUPPORT=OFF
+)
+
+ExternalProject_Add(external_zstd
+  URL file://${PACKAGE_DIR}/${ZSTD_FILE}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH ${ZSTD_HASH_TYPE}=${ZSTD_HASH}
+  PREFIX ${BUILD_DIR}/zstd
+  SOURCE_SUBDIR build/cmake
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zstd ${DEFAULT_CMAKE_FLAGS} ${ZSTD_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/zstd
+)
+
+if(WIN32)
+  if(BUILD_MODE STREQUAL Release)
+    ExternalProject_Add_Step(external_zstd after_install
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zstd/lib/zstd_static${LIBEXT} ${HARVEST_TARGET}/zstd/lib/zstd_static${LIBEXT}
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/zstd/include/ ${HARVEST_TARGET}/zstd/include/
+      DEPENDEES install
+    )
+  endif()
+endif()

build_files/build_environment/install_deps.sh

@@ -572,7 +572,7 @@ FFMPEG_FORCE_REBUILD=false
 FFMPEG_SKIP=false
 _ffmpeg_list_sep=";"
 
-XR_OPENXR_VERSION="1.0.14"
+XR_OPENXR_VERSION="1.0.17"
 XR_OPENXR_VERSION_SHORT="1.0"
 XR_OPENXR_VERSION_MIN="1.0.8"
 XR_OPENXR_VERSION_MAX="2.0"
@@ -1073,7 +1073,7 @@ OPENVDB_SOURCE=( "https://github.com/AcademySoftwareFoundation/openvdb/archive/v
 #~ OPENVDB_SOURCE_REPO_BRANCH="dev"
 
 NANOVDB_USE_REPO=false
-NANOVDB_SOURCE_REPO_UID="e62f7a0bf1e27397223c61ddeaaf57edf111b77f"
+NANOVDB_SOURCE_REPO_UID="dc37d8a631922e7bef46712947dc19b755f3e841"
 NANOVDB_SOURCE=( "https://github.com/AcademySoftwareFoundation/openvdb/archive/${NANOVDB_SOURCE_REPO_UID}.tar.gz" )
 
 ALEMBIC_USE_REPO=false
@@ -1108,9 +1108,9 @@ FFMPEG_SOURCE=( "http://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2" )
 
 XR_OPENXR_USE_REPO=false
 XR_OPENXR_SOURCE=("https://github.com/KhronosGroup/OpenXR-SDK/archive/release-${XR_OPENXR_VERSION}.tar.gz")
-#~ XR_OPENXR_SOURCE_REPO=("https://github.com/KhronosGroup/OpenXR-SDK.git")
-#~ XR_OPENXR_REPO_UID="5900c51562769b03bea699dc0352cae56acb6419d"
-#~ XR_OPENXR_REPO_BRANCH="master"
+XR_OPENXR_SOURCE_REPO=("https://github.com/KhronosGroup/OpenXR-SDK.git")
+XR_OPENXR_REPO_UID="bf21ccb1007bb531b45d9978919a56ea5059c245"
+XR_OPENXR_REPO_BRANCH="master"
 
 # C++11 is required now
 CXXFLAGS_BACK=$CXXFLAGS
@@ -1128,6 +1128,7 @@ Those libraries should be available as packages in all recent distributions (opt
     * Basics of dev environment (cmake, gcc, svn , git, ...).
     * libjpeg, libpng, libtiff, [openjpeg2], [libopenal].
     * libx11, libxcursor, libxi, libxrandr, libxinerama (and other libx... as needed).
+    * libwayland-client0, libwayland-cursor0, libwayland-egl1, libxkbcommon0, libdbus-1-3, libegl1 (Wayland)
     * libsqlite3, libbz2, libssl, libfftw3, libxml2, libtinyxml, yasm, libyaml-cpp.
     * libsdl2, libglew, libpugixml, libpotrace, [libgmp], [libglewmx], fontconfig, [libharu/libhpdf].\""
 
@@ -2737,7 +2738,7 @@ _init_openvdb() {
   _git=false
   _inst=$INST/openvdb-$OPENVDB_VERSION_SHORT
   _inst_shortcut=$INST/openvdb
-  
+
   _openvdb_source=$OPENVDB_SOURCE
   if [ "$WITH_NANOVDB" = true ]; then
     _openvdb_source=$NANOVDB_SOURCE
@@ -2842,7 +2843,7 @@ compile_OPENVDB() {
     if [ -d $INST/blosc ]; then
       cmake_d="$cmake_d -D Blosc_ROOT=$INST/blosc"
     fi
-  
+
     cmake $cmake_d ..
 
     make -j$THREADS install
@@ -3839,6 +3840,7 @@ install_DEB() {
   _packages="gawk cmake cmake-curses-gui build-essential libjpeg-dev libpng-dev libtiff-dev \
              git libfreetype6-dev libfontconfig-dev libx11-dev flex bison libxxf86vm-dev \
              libxcursor-dev libxi-dev wget libsqlite3-dev libxrandr-dev libxinerama-dev \
+             libwayland-dev wayland-protocols libegl-dev libxkbcommon-dev libdbus-1-dev linux-libc-dev \
              libbz2-dev libncurses5-dev libssl-dev liblzma-dev libreadline-dev \
              libopenal-dev libglew-dev yasm $THEORA_DEV $VORBIS_DEV $OGG_DEV \
              libsdl2-dev libfftw3-dev patch bzip2 libxml2-dev libtinyxml-dev libjemalloc-dev \
@@ -4508,6 +4510,7 @@ install_RPM() {
   _packages="gcc gcc-c++ git make cmake tar bzip2 xz findutils flex bison fontconfig-devel \
              libtiff-devel libjpeg-devel libpng-devel sqlite-devel fftw-devel SDL2-devel \
              libX11-devel libXi-devel libXcursor-devel libXrandr-devel libXinerama-devel \
+             wayland-devel wayland-protocols-devel mesa-libEGL-devel libxkbcommon-devel dbus-devel kernel-headers \
              wget ncurses-devel readline-devel $OPENJPEG_DEV openal-soft-devel \
              glew-devel yasm $THEORA_DEV $VORBIS_DEV $OGG_DEV patch \
              libxml2-devel yaml-cpp-devel tinyxml-devel jemalloc-devel \

build_files/build_environment/patches/ffmpeg.diff

@@ -68,3 +68,32 @@
 +
      return ret;
  }
+--- a/libavcodec/rl.c
++++ b/libavcodec/rl.c
+@@ -71,7 +71,7 @@ av_cold void ff_rl_init(RLTable *rl,
+ av_cold void ff_rl_init_vlc(RLTable *rl, unsigned static_size)
+ {
+     int i, q;
+-    VLC_TYPE table[1500][2] = {{0}};
++    VLC_TYPE (*table)[2] = av_calloc(sizeof(VLC_TYPE), 1500 * 2);
+     VLC vlc = { .table = table, .table_allocated = static_size };
+     av_assert0(static_size <= FF_ARRAY_ELEMS(table));
+     init_vlc(&vlc, 9, rl->n + 1, &rl->table_vlc[0][1], 4, 2, &rl->table_vlc[0][0], 4, 2, INIT_VLC_USE_NEW_STATIC);
+@@ -80,8 +80,10 @@ av_cold void ff_rl_init_vlc(RLTable *rl, unsigned static_size)
+         int qmul = q * 2;
+         int qadd = (q - 1) | 1;
+ 
+-        if (!rl->rl_vlc[q])
++        if (!rl->rl_vlc[q]){
++            av_free(table);
+             return;
++        }
+ 
+         if (q == 0) {
+             qmul = 1;
+@@ -113,4 +115,5 @@ av_cold void ff_rl_init_vlc(RLTable *rl, unsigned static_size)
+             rl->rl_vlc[q][i].run   = run;
+         }
+     }
++    av_free(table);
+ }

build_files/cmake/cmake_consistency_check_config.py

@@ -8,6 +8,9 @@ IGNORE_SOURCE = (
     # specific source files
     "extern/audaspace/",
 
+    # Use for `WIN32` only.
+    "source/creator/blender_launcher_win32.c",
+
     # specific source files
     "extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp",
     "extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp",

build_files/cmake/config/blender_full.cmake

@@ -29,6 +29,7 @@ set(WITH_IMAGE_OPENEXR       ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_OPENJPEG      ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_TIFF          ON  CACHE BOOL "" FORCE)
 set(WITH_INPUT_NDOF          ON  CACHE BOOL "" FORCE)
+set(WITH_INPUT_IME           ON  CACHE BOOL "" FORCE)
 set(WITH_INTERNATIONAL       ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV               ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE)

build_files/cmake/config/blender_release.cmake

@@ -30,6 +30,7 @@ set(WITH_IMAGE_OPENEXR       ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_OPENJPEG      ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_TIFF          ON  CACHE BOOL "" FORCE)
 set(WITH_INPUT_NDOF          ON  CACHE BOOL "" FORCE)
+set(WITH_INPUT_IME           ON  CACHE BOOL "" FORCE)
 set(WITH_INTERNATIONAL       ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV               ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE)

build_files/windows/autodetect_msvc.cmd

@@ -1,9 +1,9 @@
 echo No explicit msvc version requested, autodetecting version.
 
-call "%~dp0\detect_msvc2017.cmd"
+call "%~dp0\detect_msvc2019.cmd"
 if %ERRORLEVEL% EQU 0 goto DetectionComplete
 
-call "%~dp0\detect_msvc2019.cmd"
+call "%~dp0\detect_msvc2017.cmd"
 if %ERRORLEVEL% EQU 0 goto DetectionComplete
 
 call "%~dp0\detect_msvc2022.cmd"

doc/python_api/examples/bpy.app.handlers.2.py

@@ -12,6 +12,7 @@ such cases, lock the interface (Render → Lock Interface or
 Below is an example of a mesh that is altered from a handler:
 """
 
+
 def frame_change_pre(scene):
     # A triangle that shifts in the z direction
     zshift = scene.frame_current * 0.1

doc/python_api/examples/bpy.app.timers.5.py

@@ -16,10 +16,12 @@ execution_queue = queue.Queue()
 def run_in_main_thread(function):
     execution_queue.put(function)
 
+
 def execute_queued_functions():
     while not execution_queue.empty():
         function = execution_queue.get()
         function()
     return 1.0
 
+
 bpy.app.timers.register(execute_queued_functions)

doc/python_api/examples/bpy.msgbus.1.py

@@ -31,11 +31,13 @@ owner = object()
 
 subscribe_to = bpy.context.object.location
 
+
 def msgbus_callback(*args):
     # This will print:
     # Something changed! (1, 2, 3)
     print("Something changed!", args)
 
+
 bpy.msgbus.subscribe_rna(
     key=subscribe_to,
     owner=owner,

doc/python_api/examples/bpy.types.Depsgraph.7.py

@@ -44,7 +44,7 @@ class OBJECT_OT_object_to_curve(bpy.types.Operator):
         # Remove temporary curve.
         obj.to_curve_clear()
         # Invoke to_curve() with applying modifiers.
-        curve_with_modifiers = obj.to_curve(depsgraph, apply_modifiers = True)
+        curve_with_modifiers = obj.to_curve(depsgraph, apply_modifiers=True)
         self.report({'INFO'}, f"{len(curve_with_modifiers.splines)} splines in new curve with modifiers.")
         # Remove temporary curve.
         obj.to_curve_clear()

doc/python_api/examples/gpu.6.py

@@ -21,6 +21,7 @@ batch = batch_for_shader(
     },
 )
 
+
 def draw():
     shader.bind()
     shader.uniform_sampler("image", texture)

extern/audaspace/include/devices/SoftwareDevice.h

@@ -265,6 +265,12 @@ protected:
 	 */
 	void setSpecs(Specs specs);
 
+	/**
+	 * Sets the audio output specification of the device.
+	 * \param specs The output specification.
+	 */
+	void setSpecs(DeviceSpecs specs);
+
 	/**
 	 * Empty default constructor. To setup the device call the function create()
 	 * and to uninitialize call destroy().

extern/audaspace/include/respec/Mixer.h

@@ -87,6 +87,12 @@ public:
 	 */
 	void setSpecs(Specs specs);
 
+	/**
+	 * Sets the target specification for superposing.
+	 * \param specs The target specification.
+	 */
+	void setSpecs(DeviceSpecs specs);
+
 	/**
 	 * Mixes a buffer.
 	 * \param buffer The buffer to superpose.

extern/audaspace/plugins/pulseaudio/PulseAudioDevice.cpp

@@ -78,6 +78,7 @@ void PulseAudioDevice::runMixingThread()
 			if(shouldStop())
 			{
 				AUD_pa_stream_cork(m_stream, 1, nullptr, nullptr);
+				AUD_pa_stream_flush(m_stream, nullptr, nullptr);
 				doStop();
 				return;
 			}
@@ -86,7 +87,10 @@ void PulseAudioDevice::runMixingThread()
 		if(AUD_pa_stream_is_corked(m_stream))
 			AUD_pa_stream_cork(m_stream, 0, nullptr, nullptr);
 
-		AUD_pa_mainloop_iterate(m_mainloop, true, nullptr);
+		// similar to AUD_pa_mainloop_iterate(m_mainloop, false, nullptr); except with a longer timeout
+		AUD_pa_mainloop_prepare(m_mainloop, 1 << 14);
+		AUD_pa_mainloop_poll(m_mainloop);
+		AUD_pa_mainloop_dispatch(m_mainloop);
 	}
 }
 

extern/audaspace/plugins/pulseaudio/PulseAudioSymbols.h

@@ -24,6 +24,7 @@ PULSEAUDIO_SYMBOL(pa_context_unref);
 PULSEAUDIO_SYMBOL(pa_stream_begin_write);
 PULSEAUDIO_SYMBOL(pa_stream_connect_playback);
 PULSEAUDIO_SYMBOL(pa_stream_cork);
+PULSEAUDIO_SYMBOL(pa_stream_flush);
 PULSEAUDIO_SYMBOL(pa_stream_is_corked);
 PULSEAUDIO_SYMBOL(pa_stream_new);
 PULSEAUDIO_SYMBOL(pa_stream_set_buffer_attr);
@@ -35,3 +36,6 @@ PULSEAUDIO_SYMBOL(pa_mainloop_free);
 PULSEAUDIO_SYMBOL(pa_mainloop_get_api);
 PULSEAUDIO_SYMBOL(pa_mainloop_new);
 PULSEAUDIO_SYMBOL(pa_mainloop_iterate);
+PULSEAUDIO_SYMBOL(pa_mainloop_prepare);
+PULSEAUDIO_SYMBOL(pa_mainloop_poll);
+PULSEAUDIO_SYMBOL(pa_mainloop_dispatch);

extern/audaspace/plugins/wasapi/WASAPIDevice.cpp

@@ -31,65 +31,81 @@ template <class T> void SafeRelease(T **ppT)
 	}
 }
 
-void WASAPIDevice::runMixingThread()
+HRESULT WASAPIDevice::setupRenderClient(IAudioRenderClient*& render_client, UINT32& buffer_size)
 {
-	UINT32 buffer_size;
+	const IID IID_IAudioRenderClient = __uuidof(IAudioRenderClient);
+
 	UINT32 padding;
 	UINT32 length;
 	data_t* buffer;
 
-	IAudioRenderClient* render_client = nullptr;
+	HRESULT result;
 
-	{
-		std::lock_guard<ILockable> lock(*this);
+	if(FAILED(result = m_audio_client->GetBufferSize(&buffer_size)))
+		return result;
 
-		const IID IID_IAudioRenderClient = __uuidof(IAudioRenderClient);
+	if(FAILED(result = m_audio_client->GetService(IID_IAudioRenderClient, reinterpret_cast<void**>(&render_client))))
+		return result;
 
-		if(FAILED(m_audio_client->GetBufferSize(&buffer_size)))
-			goto init_error;
+	if(FAILED(result = m_audio_client->GetCurrentPadding(&padding)))
+		return result;
 
-		if(FAILED(m_audio_client->GetService(IID_IAudioRenderClient, reinterpret_cast<void**>(&render_client))))
-			goto init_error;
+	length = buffer_size - padding;
 
-		if(FAILED(m_audio_client->GetCurrentPadding(&padding)))
-			goto init_error;
+	if(FAILED(result = render_client->GetBuffer(length, &buffer)))
+		return result;
 
-		length = buffer_size - padding;
+	mix((data_t*)buffer, length);
 
-		if(FAILED(render_client->GetBuffer(length, &buffer)))
-			goto init_error;
-
-		mix((data_t*)buffer, length);
-
-		if(FAILED(render_client->ReleaseBuffer(length, 0)))
-		{
-			init_error:
-				SafeRelease(&render_client);
-				doStop();
-				return;
-		}
-	}
+	if(FAILED(result = render_client->ReleaseBuffer(length, 0)))
+		return result;
 
 	m_audio_client->Start();
 
-	auto sleepDuration = std::chrono::milliseconds(buffer_size * 1000 / int(m_specs.rate) / 2);
+	return result;
+}
+
+void WASAPIDevice::runMixingThread()
+{
+	UINT32 buffer_size;
+
+	IAudioRenderClient* render_client = nullptr;
+
+	std::chrono::milliseconds sleep_duration;
+
+	bool run_init = true;
 
 	for(;;)
 	{
+		HRESULT result = S_OK;
+
 		{
+			UINT32 padding;
+			UINT32 length;
+			data_t* buffer;
 			std::lock_guard<ILockable> lock(*this);
 
-			if(FAILED(m_audio_client->GetCurrentPadding(&padding)))
+			if(run_init)
+			{
+				result = setupRenderClient(render_client, buffer_size);
+
+				if(FAILED(result))
+					goto stop_thread;
+
+				sleep_duration = std::chrono::milliseconds(buffer_size * 1000 / int(m_specs.rate) / 2);
+			}
+
+			if(FAILED(result = m_audio_client->GetCurrentPadding(&padding)))
 				goto stop_thread;
 
 			length = buffer_size - padding;
 
-			if(FAILED(render_client->GetBuffer(length, &buffer)))
+			if(FAILED(result = render_client->GetBuffer(length, &buffer)))
 				goto stop_thread;
 
 			mix((data_t*)buffer, length);
 
-			if(FAILED(render_client->ReleaseBuffer(length, 0)))
+			if(FAILED(result = render_client->ReleaseBuffer(length, 0)))
 				goto stop_thread;
 
 			// stop thread
@@ -98,53 +114,51 @@ void WASAPIDevice::runMixingThread()
 				stop_thread:
 					m_audio_client->Stop();
 					SafeRelease(&render_client);
-					doStop();
-					return;
+
+					if(result == AUDCLNT_E_DEVICE_INVALIDATED)
+					{
+						DeviceSpecs specs = m_specs;
+						if(!setupDevice(specs))
+							result = S_FALSE;
+						else
+						{
+							setSpecs(specs);
+
+							run_init = true;
+						}
+					}
+
+					if(result != AUDCLNT_E_DEVICE_INVALIDATED)
+					{
+						doStop();
+						return;
+					}
 			}
 		}
 
-		std::this_thread::sleep_for(sleepDuration);
+		std::this_thread::sleep_for(sleep_duration);
 	}
 }
 
-WASAPIDevice::WASAPIDevice(DeviceSpecs specs, int buffersize) :
-	m_imm_device_enumerator(nullptr),
-	m_imm_device(nullptr),
-	m_audio_client(nullptr),
-
-	m_wave_format_extensible({})
+bool WASAPIDevice::setupDevice(DeviceSpecs &specs)
 {
-	// initialize COM if it hasn't happened yet
-	CoInitializeEx(nullptr, COINIT_MULTITHREADED);
+	SafeRelease(&m_audio_client);
+	SafeRelease(&m_imm_device);
 
-	const CLSID CLSID_MMDeviceEnumerator = __uuidof(MMDeviceEnumerator);
-	const IID IID_IMMDeviceEnumerator = __uuidof(IMMDeviceEnumerator);
 	const IID IID_IAudioClient = __uuidof(IAudioClient);
 
+	if(FAILED(m_imm_device_enumerator->GetDefaultAudioEndpoint(eRender, eMultimedia, &m_imm_device)))
+		return false;
+
+	if(FAILED(m_imm_device->Activate(IID_IAudioClient, CLSCTX_ALL, nullptr, reinterpret_cast<void**>(&m_audio_client))))
+		return false;
+
 	WAVEFORMATEXTENSIBLE wave_format_extensible_closest_match;
 	WAVEFORMATEXTENSIBLE* closest_match_pointer = &wave_format_extensible_closest_match;
 
-	HRESULT result;
-
 	REFERENCE_TIME minimum_time = 0;
 	REFERENCE_TIME buffer_duration;
 
-	if(FAILED(CoCreateInstance(CLSID_MMDeviceEnumerator, nullptr, CLSCTX_ALL, IID_IMMDeviceEnumerator, reinterpret_cast<void**>(&m_imm_device_enumerator))))
-		goto error;
-
-	if(FAILED(m_imm_device_enumerator->GetDefaultAudioEndpoint(eRender, eMultimedia, &m_imm_device)))
-		goto error;
-
-	if(FAILED(m_imm_device->Activate(IID_IAudioClient, CLSCTX_ALL, nullptr, reinterpret_cast<void**>(&m_audio_client))))
-		goto error;
-
-	if(specs.channels == CHANNELS_INVALID)
-		specs.channels = CHANNELS_STEREO;
-	if(specs.format == FORMAT_INVALID)
-		specs.format = FORMAT_FLOAT32;
-	if(specs.rate == RATE_INVALID)
-		specs.rate = RATE_48000;
-
 	switch(specs.format)
 	{
 	case FORMAT_U8:
@@ -203,12 +217,14 @@ WASAPIDevice::WASAPIDevice(DeviceSpecs specs, int buffersize) :
 	m_wave_format_extensible.Format.cbSize = 22;
 	m_wave_format_extensible.Samples.wValidBitsPerSample = m_wave_format_extensible.Format.wBitsPerSample;
 
-	result = m_audio_client->IsFormatSupported(AUDCLNT_SHAREMODE_SHARED, reinterpret_cast<const WAVEFORMATEX*>(&m_wave_format_extensible), reinterpret_cast<WAVEFORMATEX**>(&closest_match_pointer));
+	HRESULT result = m_audio_client->IsFormatSupported(AUDCLNT_SHAREMODE_SHARED, reinterpret_cast<const WAVEFORMATEX*>(&m_wave_format_extensible), reinterpret_cast<WAVEFORMATEX**>(&closest_match_pointer));
 
 	if(result == S_FALSE)
 	{
+		bool errored = false;
+
 		if(closest_match_pointer->Format.wFormatTag != WAVE_FORMAT_EXTENSIBLE)
-			goto error;
+			goto closest_match_error;
 
 		specs.channels = Channels(closest_match_pointer->Format.nChannels);
 		specs.rate = closest_match_pointer->Format.nSamplesPerSec;
@@ -220,7 +236,7 @@ WASAPIDevice::WASAPIDevice(DeviceSpecs specs, int buffersize) :
 			else if(closest_match_pointer->Format.wBitsPerSample == 64)
 				specs.format = FORMAT_FLOAT64;
 			else
-				goto error;
+				goto closest_match_error;
 		}
 		else if(closest_match_pointer->SubFormat == KSDATAFORMAT_SUBTYPE_PCM)
 		{
@@ -239,44 +255,81 @@ WASAPIDevice::WASAPIDevice(DeviceSpecs specs, int buffersize) :
 				specs.format = FORMAT_S32;
 				break;
 			default:
-				goto error;
+				goto closest_match_error;
 				break;
 			}
 		}
 		else
-			goto error;
+			goto closest_match_error;
 
 		m_wave_format_extensible = *closest_match_pointer;
 
+		if(false)
+		{
+			closest_match_error:
+			errored = true;
+		}
+
 		if(closest_match_pointer != &wave_format_extensible_closest_match)
 		{
 			CoTaskMemFree(closest_match_pointer);
 			closest_match_pointer = &wave_format_extensible_closest_match;
 		}
+
+		if(errored)
+			return false;
 	}
 	else if(FAILED(result))
-		goto error;
+		return false;
 
 	if(FAILED(m_audio_client->GetDevicePeriod(nullptr, &minimum_time)))
-		goto error;
+		return false;
 
-	buffer_duration = REFERENCE_TIME(buffersize) * REFERENCE_TIME(10000000) / REFERENCE_TIME(specs.rate);
+	buffer_duration = REFERENCE_TIME(m_buffersize) * REFERENCE_TIME(10000000) / REFERENCE_TIME(specs.rate);
 
 	if(minimum_time > buffer_duration)
 		buffer_duration = minimum_time;
 
-	m_specs = specs;
-
 	if(FAILED(m_audio_client->Initialize(AUDCLNT_SHAREMODE_SHARED, 0, buffer_duration, 0, reinterpret_cast<WAVEFORMATEX*>(&m_wave_format_extensible), nullptr)))
+		return false;
+
+	return true;
+}
+
+WASAPIDevice::WASAPIDevice(DeviceSpecs specs, int buffersize) :
+	m_buffersize(buffersize),
+	m_imm_device_enumerator(nullptr),
+	m_imm_device(nullptr),
+	m_audio_client(nullptr),
+
+	m_wave_format_extensible({})
+{
+	// initialize COM if it hasn't happened yet
+	CoInitializeEx(nullptr, COINIT_MULTITHREADED);
+
+	const CLSID CLSID_MMDeviceEnumerator = __uuidof(MMDeviceEnumerator);
+	const IID IID_IMMDeviceEnumerator = __uuidof(IMMDeviceEnumerator);
+
+	if(specs.channels == CHANNELS_INVALID)
+		specs.channels = CHANNELS_STEREO;
+	if(specs.format == FORMAT_INVALID)
+		specs.format = FORMAT_FLOAT32;
+	if(specs.rate == RATE_INVALID)
+		specs.rate = RATE_48000;
+
+	if(FAILED(CoCreateInstance(CLSID_MMDeviceEnumerator, nullptr, CLSCTX_ALL, IID_IMMDeviceEnumerator, reinterpret_cast<void**>(&m_imm_device_enumerator))))
 		goto error;
 
+	if(!setupDevice(specs))
+		goto error;
+
+	m_specs = specs;
+
 	create();
 
 	return;
 
 	error:
-	if(closest_match_pointer != &wave_format_extensible_closest_match)
-		CoTaskMemFree(closest_match_pointer);
 	SafeRelease(&m_imm_device);
 	SafeRelease(&m_imm_device_enumerator);
 	SafeRelease(&m_audio_client);

extern/audaspace/plugins/wasapi/WASAPIDevice.h

@@ -43,16 +43,21 @@ AUD_NAMESPACE_BEGIN
 class AUD_PLUGIN_API WASAPIDevice : public ThreadedDevice
 {
 private:
+	int m_buffersize;
 	IMMDeviceEnumerator* m_imm_device_enumerator;
 	IMMDevice* m_imm_device;
 	IAudioClient* m_audio_client;
 	WAVEFORMATEXTENSIBLE m_wave_format_extensible;
 
+	AUD_LOCAL HRESULT setupRenderClient(IAudioRenderClient*& render_client, UINT32& buffer_size);
+
 	/**
 	 * Streaming thread main function.
 	 */
 	AUD_LOCAL void runMixingThread();
 
+	AUD_LOCAL bool setupDevice(DeviceSpecs& specs);
+
 	// delete copy constructor and operator=
 	WASAPIDevice(const WASAPIDevice&) = delete;
 	WASAPIDevice& operator=(const WASAPIDevice&) = delete;

extern/audaspace/src/devices/SoftwareDevice.cpp

@@ -756,6 +756,7 @@ void SoftwareDevice::mix(data_t* buffer, int length)
 			// get the buffer from the source
 			pos = 0;
 			len = length;
+			eos = false;
 
 			// update 3D Info
 			sound->update();
@@ -842,6 +843,27 @@ void SoftwareDevice::setSpecs(Specs specs)
 	{
 		sound->setSpecs(specs);
 	}
+
+	for(auto& sound : m_pausedSounds)
+	{
+		sound->setSpecs(specs);
+	}
+}
+
+void SoftwareDevice::setSpecs(DeviceSpecs specs)
+{
+	m_specs = specs;
+	m_mixer->setSpecs(specs);
+
+	for(auto& sound : m_playingSounds)
+	{
+		sound->setSpecs(specs.specs);
+	}
+
+	for(auto& sound : m_pausedSounds)
+	{
+		sound->setSpecs(specs.specs);
+	}
 }
 
 SoftwareDevice::SoftwareDevice()

extern/audaspace/src/respec/Mixer.cpp

@@ -21,9 +21,25 @@
 
 AUD_NAMESPACE_BEGIN
 
-Mixer::Mixer(DeviceSpecs specs) :
-	m_specs(specs)
+Mixer::Mixer(DeviceSpecs specs)
 {
+	setSpecs(specs);
+}
+
+DeviceSpecs Mixer::getSpecs() const
+{
+	return m_specs;
+}
+
+void Mixer::setSpecs(Specs specs)
+{
+	m_specs.specs = specs;
+}
+
+void Mixer::setSpecs(DeviceSpecs specs)
+{
+	m_specs = specs;
+
 	switch(m_specs.format)
 	{
 	case FORMAT_U8:
@@ -54,16 +70,6 @@ Mixer::Mixer(DeviceSpecs specs) :
 	}
 }
 
-DeviceSpecs Mixer::getSpecs() const
-{
-	return m_specs;
-}
-
-void Mixer::setSpecs(Specs specs)
-{
-	m_specs.specs = specs;
-}
-
 void Mixer::clear(int length)
 {
 	m_buffer.assureSize(length * AUD_SAMPLE_SIZE(m_specs));

extern/glog/README.blender

@@ -7,3 +7,4 @@ Local modifications:
   checks for functions and so are needed.
 * Added special definitions of HAVE_SNPRINTF and HAVE_LIB_GFLAGS
   in Windows' specific config.h.
+* Silenced syscall deprecation warnings on macOS >= 10.12.

extern/glog/src/raw_logging.cc

@@ -59,7 +59,7 @@
 # include <unistd.h>
 #endif
 
-#if defined(HAVE_SYSCALL_H) || defined(HAVE_SYS_SYSCALL_H)
+#if (defined(HAVE_SYSCALL_H) || defined(HAVE_SYS_SYSCALL_H)) && (!(defined OS_MACOSX))
 # define safe_write(fd, s, len)  syscall(SYS_write, fd, s, len)
 #else
   // Not so safe, but what can you do?

extern/glog/src/utilities.cc

@@ -259,7 +259,13 @@ pid_t GetTID() {
 #endif
   static bool lacks_gettid = false;
   if (!lacks_gettid) {
+#ifdef OS_MACOSX
+    uint64_t tid64;
+    const int error = pthread_threadid_np(NULL, &tid64);
+    pid_t tid = error ? -1 : (pid_t)tid64;
+#else
     pid_t tid = syscall(__NR_gettid);
+#endif
     if (tid != -1) {
       return tid;
     }

intern/atomic/intern/atomic_ops_unix.h

@@ -49,9 +49,9 @@
 
 #include "atomic_ops_utils.h"
 
-#if defined(__arm__)
-/* Attempt to fix compilation error on Debian armel kernel.
- * arm7 architecture does have both 32 and 64bit atomics, however
+#if defined(__arm__) || defined(__riscv)
+/* Attempt to fix compilation error on Debian armel and RISC-V kernels.
+ * Both architectures do have both 32 and 64bit atomics, however
  * its gcc doesn't have __GCC_HAVE_SYNC_COMPARE_AND_SWAP_n defined.
  */
 #  define JE_FORCE_SYNC_COMPARE_AND_SWAP_1

intern/cycles/blender/addon/properties.py

@@ -482,7 +482,7 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
 
     transparent_max_bounces: IntProperty(
         name="Transparent Max Bounces",
-        description="Maximum number of transparent bounces",
+        description="Maximum number of transparent bounces. This is independent of maximum number of other bounces ",
         min=0, max=1024,
         default=8,
     )

intern/cycles/blender/addon/ui.py

@@ -485,10 +485,12 @@ class CYCLES_RENDER_PT_light_paths_max_bounces(CyclesButtonsPanel, Panel):
         col = layout.column(align=True)
         col.prop(cscene, "diffuse_bounces", text="Diffuse")
         col.prop(cscene, "glossy_bounces", text="Glossy")
-        col.prop(cscene, "transparent_max_bounces", text="Transparency")
         col.prop(cscene, "transmission_bounces", text="Transmission")
         col.prop(cscene, "volume_bounces", text="Volume")
 
+        col = layout.column(align=True)
+        col.prop(cscene, "transparent_max_bounces", text="Transparent")
+
 
 class CYCLES_RENDER_PT_light_paths_clamping(CyclesButtonsPanel, Panel):
     bl_label = "Clamping"

intern/cycles/blender/blender_image.cpp

@@ -137,9 +137,9 @@ bool BlenderImageLoader::load_pixels(const ImageMetaData &metadata,
       /* Premultiply, byte images are always straight for Blender. */
       unsigned char *cp = (unsigned char *)pixels;
       for (size_t i = 0; i < num_pixels; i++, cp += channels) {
-        cp[0] = (cp[0] * cp[3]) >> 8;
-        cp[1] = (cp[1] * cp[3]) >> 8;
-        cp[2] = (cp[2] * cp[3]) >> 8;
+        cp[0] = (cp[0] * cp[3]) / 255;
+        cp[1] = (cp[1] * cp[3]) / 255;
+        cp[2] = (cp[2] * cp[3]) / 255;
       }
     }
   }

intern/cycles/blender/blender_object.cpp

@@ -109,23 +109,23 @@ void BlenderSync::sync_object_motion_init(BL::Object &b_parent, BL::Object &b_ob
   }
 
   Geometry *geom = object->get_geometry();
-  geom->set_use_motion_blur(false);
-  geom->set_motion_steps(0);
 
-  uint motion_steps;
+  int motion_steps = 0;
+  bool use_motion_blur = false;
 
   if (need_motion == Scene::MOTION_BLUR) {
     motion_steps = object_motion_steps(b_parent, b_ob, Object::MAX_MOTION_STEPS);
-    geom->set_motion_steps(motion_steps);
     if (motion_steps && object_use_deform_motion(b_parent, b_ob)) {
-      geom->set_use_motion_blur(true);
+      use_motion_blur = true;
     }
   }
   else {
     motion_steps = 3;
-    geom->set_motion_steps(motion_steps);
   }
 
+  geom->set_use_motion_blur(use_motion_blur);
+  geom->set_motion_steps(motion_steps);
+
   motion.resize(motion_steps, transform_empty());
 
   if (motion_steps) {

intern/cycles/blender/blender_sync.cpp

@@ -404,8 +404,6 @@ void BlenderSync::sync_film(BL::SpaceView3D &b_v3d)
 
   Film *film = scene->film;
 
-  vector<Pass> prevpasses = scene->passes;
-
   if (b_v3d) {
     film->set_display_pass(update_viewport_display_passes(b_v3d, scene->passes));
   }
@@ -435,11 +433,6 @@ void BlenderSync::sync_film(BL::SpaceView3D &b_v3d)
         break;
     }
   }
-
-  if (!Pass::equals(prevpasses, scene->passes)) {
-    film->tag_passes_update(scene, prevpasses, false);
-    film->tag_modified();
-  }
 }
 
 /* Render Layer */
@@ -749,10 +742,13 @@ vector<Pass> BlenderSync::sync_render_passes(BL::Scene &b_scene,
                                         DENOISING_CLEAN_ALL_PASSES);
   scene->film->set_denoising_prefiltered_pass(denoising.store_passes &&
                                               denoising.type == DENOISER_NLM);
-
   scene->film->set_pass_alpha_threshold(b_view_layer.pass_alpha_threshold());
-  scene->film->tag_passes_update(scene, passes);
-  scene->integrator->tag_update(scene, Integrator::UPDATE_ALL);
+
+  if (!Pass::equals(passes, scene->passes)) {
+    scene->film->tag_passes_update(scene, passes);
+    scene->film->tag_modified();
+    scene->integrator->tag_update(scene, Integrator::UPDATE_ALL);
+  }
 
   return passes;
 }

intern/cycles/blender/blender_viewport.cpp

@@ -40,8 +40,8 @@ BlenderViewportParameters::BlenderViewportParameters(BL::SpaceView3D &b_v3d)
   BL::View3DShading shading = b_v3d.shading();
   PointerRNA cshading = RNA_pointer_get(&shading.ptr, "cycles");
 
-  /* We only copy the shading parameters if we are in look dev mode. otherwise
-   * defaults are being used. These defaults mimic normal render settings */
+  /* We only copy the shading parameters if we are in look-dev mode.
+   * Otherwise defaults are being used. These defaults mimic normal render settings. */
   if (shading.type() == BL::View3DShading::type_RENDERED) {
     use_scene_world = shading.use_scene_world_render();
     use_scene_lights = shading.use_scene_lights_render();

intern/cycles/kernel/bvh/bvh_util.h

@@ -86,8 +86,7 @@ ccl_device_inline float3 smooth_surface_offset(KernelGlobals *kg, ShaderData *sd
   float3 P = V[0] * u + V[1] * v + V[2] * w; /* Local space */
   float3 n = N[0] * u + N[1] * v + N[2] * w; /* We get away without normalization */
 
-  n = normalize(
-      transform_direction_transposed_auto(&sd->ob_itfm, n)); /* Normal x scale, world space */
+  object_normal_transform(kg, sd, &n); /* Normal x scale, world space */
 
   /* Parabolic approximation */
   float a = dot(N[2] - N[0], V[0] - V[2]);

intern/cycles/kernel/geom/geom_curve_intersect.h

@@ -237,7 +237,7 @@ ccl_device bool curve_intersect_iterative(const float3 ray_dir,
         return false; /* Rejects NaNs */
       }
 
-      /* Backface culling. */
+      /* Back-face culling. */
       const float3 R = normalize(Q - P);
       const float3 U = dradiusdu * R + dPdu;
       const float3 V = cross(dPdu, R);
@@ -458,10 +458,12 @@ ccl_device_inline bool cylinder_culling_test(const float2 p1, const float2 p2, c
   return num * num <= r * r * den2;
 }
 
-/*! Intersects a ray with a quad with backface culling
- *  enabled. The quad v0,v1,v2,v3 is split into two triangles
- *  v0,v1,v3 and v2,v3,v1. The edge v1,v2 decides which of the two
- *  triangles gets intersected. */
+/**
+ * Intersects a ray with a quad with back-face culling
+ * enabled. The quad v0,v1,v2,v3 is split into two triangles
+ * v0,v1,v3 and v2,v3,v1. The edge v1,v2 decides which of the two
+ * triangles gets intersected.
+ */
 ccl_device_inline bool ribbon_intersect_quad(const float ray_tfar,
                                              const float3 quad_v0,
                                              const float3 quad_v1,

intern/cycles/kernel/kernel_bake.h

@@ -40,7 +40,7 @@ ccl_device_noinline void compute_light_pass(
   /* Evaluate surface shader. */
   shader_eval_surface(kg, sd, &state, NULL, state.flag);
 
-  /* TODO, disable more closures we don't need besides transparent */
+  /* TODO: disable more closures we don't need besides transparent. */
   shader_bsdf_disable_transparency(kg, sd);
 
   /* Init ray. */

intern/cycles/kernel/svm/svm_vector_rotate.h

@@ -50,24 +50,29 @@ ccl_device void svm_node_vector_rotate(ShaderData *sd,
     }
     else {
       float3 axis;
+      float axis_length;
       switch (type) {
         case NODE_VECTOR_ROTATE_TYPE_AXIS_X:
           axis = make_float3(1.0f, 0.0f, 0.0f);
+          axis_length = 1.0f;
           break;
         case NODE_VECTOR_ROTATE_TYPE_AXIS_Y:
           axis = make_float3(0.0f, 1.0f, 0.0f);
+          axis_length = 1.0f;
           break;
         case NODE_VECTOR_ROTATE_TYPE_AXIS_Z:
           axis = make_float3(0.0f, 0.0f, 1.0f);
+          axis_length = 1.0f;
           break;
         default:
-          axis = normalize(stack_load_float3(stack, axis_stack_offset));
+          axis = stack_load_float3(stack, axis_stack_offset);
+          axis_length = len(axis);
           break;
       }
       float angle = stack_load_float(stack, angle_stack_offset);
       angle = invert ? -angle : angle;
-      result = (len_squared(axis) != 0.0f) ?
-                   rotate_around_axis(vector - center, axis, angle) + center :
+      result = (axis_length != 0.0f) ?
+                   rotate_around_axis(vector - center, axis / axis_length, angle) + center :
                    vector;
     }
 

intern/cycles/render/camera.h

@@ -81,7 +81,7 @@ class Camera : public Node {
   /* ** Rolling shutter effect. ** */
   /* Defines rolling shutter effect type. */
   NODE_SOCKET_API(RollingShutterType, rolling_shutter_type)
-  /* Specifies exposure time of scanlines when using
+  /* Specifies exposure time of scan-lines when using
    * rolling shutter effect.
    */
   NODE_SOCKET_API(float, rolling_shutter_duration)

intern/cycles/render/image_vdb.cpp

@@ -16,8 +16,10 @@
 
 #include "render/image_vdb.h"
 
+#include "util/util_logging.h"
+#include "util/util_openvdb.h"
+
 #ifdef WITH_OPENVDB
-#  include <openvdb/openvdb.h>
 #  include <openvdb/tools/Dense.h>
 #endif
 #ifdef WITH_NANOVDB
@@ -26,6 +28,57 @@
 
 CCL_NAMESPACE_BEGIN
 
+#ifdef WITH_OPENVDB
+struct NumChannelsOp {
+  int num_channels = 0;
+
+  template<typename GridType, typename FloatGridType, typename FloatDataType, int channels>
+  bool operator()(const openvdb::GridBase::ConstPtr &)
+  {
+    num_channels = channels;
+    return true;
+  }
+};
+
+struct ToDenseOp {
+  openvdb::CoordBBox bbox;
+  void *pixels;
+
+  template<typename GridType, typename FloatGridType, typename FloatDataType, int channels>
+  bool operator()(const openvdb::GridBase::ConstPtr &grid)
+  {
+    openvdb::tools::Dense<FloatDataType, openvdb::tools::LayoutXYZ> dense(bbox,
+                                                                          (FloatDataType *)pixels);
+    openvdb::tools::copyToDense(*openvdb::gridConstPtrCast<GridType>(grid), dense);
+    return true;
+  }
+};
+
+#  ifdef WITH_NANOVDB
+struct ToNanoOp {
+  nanovdb::GridHandle<> nanogrid;
+
+  template<typename GridType, typename FloatGridType, typename FloatDataType, int channels>
+  bool operator()(const openvdb::GridBase::ConstPtr &grid)
+  {
+    if constexpr (!std::is_same_v<GridType, openvdb::MaskGrid>) {
+      try {
+        nanogrid = nanovdb::openToNanoVDB(
+            FloatGridType(*openvdb::gridConstPtrCast<GridType>(grid)));
+      }
+      catch (const std::exception &e) {
+        VLOG(1) << "Error converting OpenVDB to NanoVDB grid: " << e.what();
+      }
+      return true;
+    }
+    else {
+      return false;
+    }
+  }
+};
+#  endif
+#endif
+
 VDBImageLoader::VDBImageLoader(const string &grid_name) : grid_name(grid_name)
 {
 }
@@ -41,98 +94,40 @@ bool VDBImageLoader::load_metadata(const ImageDeviceFeatures &features, ImageMet
     return false;
   }
 
+  /* Get number of channels from type. */
+  NumChannelsOp op;
+  if (!openvdb::grid_type_operation(grid, op)) {
+    return false;
+  }
+
+  metadata.channels = op.num_channels;
+
+  /* Set data type. */
+#  ifdef WITH_NANOVDB
+  if (features.has_nanovdb) {
+    /* NanoVDB expects no inactive leaf nodes. */
+    /*openvdb::FloatGrid &pruned_grid = *openvdb::gridPtrCast<openvdb::FloatGrid>(grid);
+    openvdb::tools::pruneInactive(pruned_grid.tree());
+    nanogrid = nanovdb::openToNanoVDB(pruned_grid);*/
+    ToNanoOp op;
+    if (!openvdb::grid_type_operation(grid, op)) {
+      return false;
+    }
+    nanogrid = std::move(op.nanogrid);
+  }
+#  endif
+
+  /* Set dimensions. */
   bbox = grid->evalActiveVoxelBoundingBox();
   if (bbox.empty()) {
     return false;
   }
 
-  /* Set dimensions. */
   openvdb::Coord dim = bbox.dim();
   metadata.width = dim.x();
   metadata.height = dim.y();
   metadata.depth = dim.z();
 
-  /* Set data type. */
-  if (grid->isType<openvdb::FloatGrid>()) {
-    metadata.channels = 1;
-#  ifdef WITH_NANOVDB
-    if (features.has_nanovdb) {
-      nanogrid = nanovdb::openToNanoVDB(*openvdb::gridConstPtrCast<openvdb::FloatGrid>(grid));
-    }
-#  endif
-  }
-  else if (grid->isType<openvdb::Vec3fGrid>()) {
-    metadata.channels = 3;
-#  ifdef WITH_NANOVDB
-    if (features.has_nanovdb) {
-      nanogrid = nanovdb::openToNanoVDB(*openvdb::gridConstPtrCast<openvdb::Vec3fGrid>(grid));
-    }
-#  endif
-  }
-  else if (grid->isType<openvdb::BoolGrid>()) {
-    metadata.channels = 1;
-#  ifdef WITH_NANOVDB
-    if (features.has_nanovdb) {
-      nanogrid = nanovdb::openToNanoVDB(
-          openvdb::FloatGrid(*openvdb::gridConstPtrCast<openvdb::BoolGrid>(grid)));
-    }
-#  endif
-  }
-  else if (grid->isType<openvdb::DoubleGrid>()) {
-    metadata.channels = 1;
-#  ifdef WITH_NANOVDB
-    if (features.has_nanovdb) {
-      nanogrid = nanovdb::openToNanoVDB(
-          openvdb::FloatGrid(*openvdb::gridConstPtrCast<openvdb::DoubleGrid>(grid)));
-    }
-#  endif
-  }
-  else if (grid->isType<openvdb::Int32Grid>()) {
-    metadata.channels = 1;
-#  ifdef WITH_NANOVDB
-    if (features.has_nanovdb) {
-      nanogrid = nanovdb::openToNanoVDB(
-          openvdb::FloatGrid(*openvdb::gridConstPtrCast<openvdb::Int32Grid>(grid)));
-    }
-#  endif
-  }
-  else if (grid->isType<openvdb::Int64Grid>()) {
-    metadata.channels = 1;
-#  ifdef WITH_NANOVDB
-    if (features.has_nanovdb) {
-      nanogrid = nanovdb::openToNanoVDB(
-          openvdb::FloatGrid(*openvdb::gridConstPtrCast<openvdb::Int64Grid>(grid)));
-    }
-#  endif
-  }
-  else if (grid->isType<openvdb::Vec3IGrid>()) {
-    metadata.channels = 3;
-#  ifdef WITH_NANOVDB
-    if (features.has_nanovdb) {
-      nanogrid = nanovdb::openToNanoVDB(
-          openvdb::Vec3fGrid(*openvdb::gridConstPtrCast<openvdb::Vec3IGrid>(grid)));
-    }
-#  endif
-  }
-  else if (grid->isType<openvdb::Vec3dGrid>()) {
-    metadata.channels = 3;
-#  ifdef WITH_NANOVDB
-    if (features.has_nanovdb) {
-      nanogrid = nanovdb::openToNanoVDB(
-          openvdb::Vec3fGrid(*openvdb::gridConstPtrCast<openvdb::Vec3dGrid>(grid)));
-    }
-#  endif
-  }
-  else if (grid->isType<openvdb::MaskGrid>()) {
-    metadata.channels = 1;
-#  ifdef WITH_NANOVDB
-    return false;  // Unsupported
-#  endif
-  }
-  else {
-    return false;
-  }
-
 #  ifdef WITH_NANOVDB
   if (nanogrid) {
     metadata.byte_size = nanogrid.size();
@@ -200,45 +195,10 @@ bool VDBImageLoader::load_pixels(const ImageMetaData &, void *pixels, const size
   else
 #  endif
   {
-    if (grid->isType<openvdb::FloatGrid>()) {
-      openvdb::tools::Dense<float, openvdb::tools::LayoutXYZ> dense(bbox, (float *)pixels);
-      openvdb::tools::copyToDense(*openvdb::gridConstPtrCast<openvdb::FloatGrid>(grid), dense);
-    }
-    else if (grid->isType<openvdb::Vec3fGrid>()) {
-      openvdb::tools::Dense<openvdb::Vec3f, openvdb::tools::LayoutXYZ> dense(
-          bbox, (openvdb::Vec3f *)pixels);
-      openvdb::tools::copyToDense(*openvdb::gridConstPtrCast<openvdb::Vec3fGrid>(grid), dense);
-    }
-    else if (grid->isType<openvdb::BoolGrid>()) {
-      openvdb::tools::Dense<float, openvdb::tools::LayoutXYZ> dense(bbox, (float *)pixels);
-      openvdb::tools::copyToDense(*openvdb::gridConstPtrCast<openvdb::BoolGrid>(grid), dense);
-    }
-    else if (grid->isType<openvdb::DoubleGrid>()) {
-      openvdb::tools::Dense<float, openvdb::tools::LayoutXYZ> dense(bbox, (float *)pixels);
-      openvdb::tools::copyToDense(*openvdb::gridConstPtrCast<openvdb::DoubleGrid>(grid), dense);
-    }
-    else if (grid->isType<openvdb::Int32Grid>()) {
-      openvdb::tools::Dense<float, openvdb::tools::LayoutXYZ> dense(bbox, (float *)pixels);
-      openvdb::tools::copyToDense(*openvdb::gridConstPtrCast<openvdb::Int32Grid>(grid), dense);
-    }
-    else if (grid->isType<openvdb::Int64Grid>()) {
-      openvdb::tools::Dense<float, openvdb::tools::LayoutXYZ> dense(bbox, (float *)pixels);
-      openvdb::tools::copyToDense(*openvdb::gridConstPtrCast<openvdb::Int64Grid>(grid), dense);
-    }
-    else if (grid->isType<openvdb::Vec3IGrid>()) {
-      openvdb::tools::Dense<openvdb::Vec3f, openvdb::tools::LayoutXYZ> dense(
-          bbox, (openvdb::Vec3f *)pixels);
-      openvdb::tools::copyToDense(*openvdb::gridConstPtrCast<openvdb::Vec3IGrid>(grid), dense);
-    }
-    else if (grid->isType<openvdb::Vec3dGrid>()) {
-      openvdb::tools::Dense<openvdb::Vec3f, openvdb::tools::LayoutXYZ> dense(
-          bbox, (openvdb::Vec3f *)pixels);
-      openvdb::tools::copyToDense(*openvdb::gridConstPtrCast<openvdb::Vec3dGrid>(grid), dense);
-    }
-    else if (grid->isType<openvdb::MaskGrid>()) {
-      openvdb::tools::Dense<float, openvdb::tools::LayoutXYZ> dense(bbox, (float *)pixels);
-      openvdb::tools::copyToDense(*openvdb::gridConstPtrCast<openvdb::MaskGrid>(grid), dense);
-    }
+    ToDenseOp op;
+    op.pixels = pixels;
+    op.bbox = bbox;
+    openvdb::grid_type_operation(grid, op);
   }
   return true;
 #else

intern/cycles/render/scene.h

@@ -209,7 +209,7 @@ class SceneParams {
 
   int curve_subdivisions()
   {
-    /* Matching the tesselation rate limit in Embree. */
+    /* Matching the tessellation rate limit in Embree. */
     return clamp(1 << hair_subdivisions, 1, 16);
   }
 };

intern/cycles/render/session.cpp

@@ -227,66 +227,25 @@ void Session::run_gpu()
   progress.set_render_start_time();
 
   while (!progress.get_cancel()) {
-    /* advance to next tile */
-    bool no_tiles = !tile_manager.next();
+    const bool no_tiles = !run_update_for_next_iteration();
 
-    DeviceKernelStatus kernel_state = DEVICE_KERNEL_UNKNOWN;
     if (no_tiles) {
-      kernel_state = device->get_active_kernel_switch_state();
-    }
-
-    if (params.background) {
-      /* if no work left and in background mode, we can stop immediately */
-      if (no_tiles) {
+      if (params.background) {
+        /* if no work left and in background mode, we can stop immediately */
         progress.set_status("Finished");
         break;
       }
     }
 
-    else if (no_tiles && kernel_state == DEVICE_KERNEL_FEATURE_KERNEL_AVAILABLE) {
-      reset_gpu(tile_manager.params, params.samples);
+    if (run_wait_for_work(no_tiles)) {
+      continue;
     }
 
-    else {
-      /* if in interactive mode, and we are either paused or done for now,
-       * wait for pause condition notify to wake up again */
-      thread_scoped_lock pause_lock(pause_mutex);
-
-      if (!pause && !tile_manager.done()) {
-        /* reset could have happened after no_tiles was set, before this lock.
-         * in this case we shall not wait for pause condition
-         */
-      }
-      else if (pause || no_tiles) {
-        update_status_time(pause, no_tiles);
-
-        while (1) {
-          scoped_timer pause_timer;
-          pause_cond.wait(pause_lock);
-          if (pause) {
-            progress.add_skip_time(pause_timer, params.background);
-          }
-
-          update_status_time(pause, no_tiles);
-          progress.set_update();
-
-          if (!pause)
-            break;
-        }
-      }
-
-      if (progress.get_cancel())
-        break;
+    if (progress.get_cancel()) {
+      break;
     }
 
     if (!no_tiles) {
-      /* update scene */
-      scoped_timer update_timer;
-      if (update_scene()) {
-        profiler.reset(scene->shaders.size(), scene->objects.size());
-      }
-      progress.add_skip_time(update_timer, params.background);
-
       if (!device->error_message().empty())
         progress.set_error(device->error_message());
 
@@ -729,82 +688,27 @@ void Session::run_cpu()
   last_update_time = time_dt();
   last_display_time = last_update_time;
 
-  {
-    /* reset once to start */
-    thread_scoped_lock reset_lock(delayed_reset.mutex);
-    thread_scoped_lock buffers_lock(buffers_mutex);
-    thread_scoped_lock display_lock(display_mutex);
-
-    reset_(delayed_reset.params, delayed_reset.samples);
-    delayed_reset.do_reset = false;
-  }
-
   while (!progress.get_cancel()) {
-    /* advance to next tile */
-    bool no_tiles = !tile_manager.next();
+    const bool no_tiles = !run_update_for_next_iteration();
     bool need_copy_to_display_buffer = false;
 
-    DeviceKernelStatus kernel_state = DEVICE_KERNEL_UNKNOWN;
     if (no_tiles) {
-      kernel_state = device->get_active_kernel_switch_state();
-    }
-
-    if (params.background) {
-      /* if no work left and in background mode, we can stop immediately */
-      if (no_tiles) {
+      if (params.background) {
+        /* if no work left and in background mode, we can stop immediately */
         progress.set_status("Finished");
         break;
       }
     }
 
-    else if (no_tiles && kernel_state == DEVICE_KERNEL_FEATURE_KERNEL_AVAILABLE) {
-      reset_cpu(tile_manager.params, params.samples);
+    if (run_wait_for_work(no_tiles)) {
+      continue;
     }
 
-    else {
-      /* if in interactive mode, and we are either paused or done for now,
-       * wait for pause condition notify to wake up again */
-      thread_scoped_lock pause_lock(pause_mutex);
-
-      if (!pause && delayed_reset.do_reset) {
-        /* reset once to start */
-        thread_scoped_lock reset_lock(delayed_reset.mutex);
-        thread_scoped_lock buffers_lock(buffers_mutex);
-        thread_scoped_lock display_lock(display_mutex);
-
-        reset_(delayed_reset.params, delayed_reset.samples);
-        delayed_reset.do_reset = false;
-      }
-      else if (pause || no_tiles) {
-        update_status_time(pause, no_tiles);
-
-        while (1) {
-          scoped_timer pause_timer;
-          pause_cond.wait(pause_lock);
-          if (pause) {
-            progress.add_skip_time(pause_timer, params.background);
-          }
-
-          update_status_time(pause, no_tiles);
-          progress.set_update();
-
-          if (!pause)
-            break;
-        }
-      }
-
-      if (progress.get_cancel())
-        break;
+    if (progress.get_cancel()) {
+      break;
     }
 
     if (!no_tiles) {
-      /* update scene */
-      scoped_timer update_timer;
-      if (update_scene()) {
-        profiler.reset(scene->shaders.size(), scene->objects.size());
-      }
-      progress.add_skip_time(update_timer, params.background);
-
       if (!device->error_message().empty())
         progress.set_error(device->error_message());
 
@@ -894,6 +798,63 @@ void Session::run()
     progress.set_update();
 }
 
+bool Session::run_update_for_next_iteration()
+{
+  thread_scoped_lock scene_lock(scene->mutex);
+  thread_scoped_lock reset_lock(delayed_reset.mutex);
+
+  if (delayed_reset.do_reset) {
+    thread_scoped_lock buffers_lock(buffers_mutex);
+    reset_(delayed_reset.params, delayed_reset.samples);
+    delayed_reset.do_reset = false;
+  }
+
+  const bool have_tiles = tile_manager.next();
+
+  if (have_tiles) {
+    scoped_timer update_timer;
+    if (update_scene()) {
+      profiler.reset(scene->shaders.size(), scene->objects.size());
+    }
+    progress.add_skip_time(update_timer, params.background);
+  }
+
+  return have_tiles;
+}
+
+bool Session::run_wait_for_work(bool no_tiles)
+{
+  /* In an offline rendering there is no pause, and no tiles will mean the job is fully done. */
+  if (params.background) {
+    return false;
+  }
+
+  thread_scoped_lock pause_lock(pause_mutex);
+
+  if (!pause && !no_tiles) {
+    return false;
+  }
+
+  update_status_time(pause, no_tiles);
+
+  while (true) {
+    scoped_timer pause_timer;
+    pause_cond.wait(pause_lock);
+    if (pause) {
+      progress.add_skip_time(pause_timer, params.background);
+    }
+
+    update_status_time(pause, no_tiles);
+    progress.set_update();
+
+    if (!pause) {
+      break;
+    }
+  }
+
+  return no_tiles;
+}
+
 bool Session::draw(BufferParams &buffer_params, DeviceDrawParams &draw_params)
 {
   if (device_use_gl)
@@ -1012,8 +973,6 @@ void Session::wait()
 
 bool Session::update_scene()
 {
-  thread_scoped_lock scene_lock(scene->mutex);
-
   /* update camera if dimensions changed for progressive render. the camera
    * knows nothing about progressive or cropped rendering, it just gets the
    * image dimensions passed in */

intern/cycles/render/session.h

@@ -178,6 +178,9 @@ class Session {
 
   void run();
 
+  bool run_update_for_next_iteration();
+  bool run_wait_for_work(bool no_tiles);
+
   void update_status_time(bool show_pause = false, bool show_done = false);
 
   void render(bool use_denoise);

intern/cycles/util/util_openvdb.h

@@ -25,6 +25,42 @@ namespace openvdb {
 using Vec4fTree = tree::Tree4<Vec4f, 5, 4, 3>::Type;
 using Vec4fGrid = Grid<Vec4fTree>;
 
+/* Apply operation to known grid types. */
+template<typename OpType>
+bool grid_type_operation(const openvdb::GridBase::ConstPtr &grid, OpType &&op)
+{
+  if (grid->isType<openvdb::FloatGrid>()) {
+    return op.template operator()<openvdb::FloatGrid, openvdb::FloatGrid, float, 1>(grid);
+  }
+  else if (grid->isType<openvdb::Vec3fGrid>()) {
+    return op.template operator()<openvdb::Vec3fGrid, openvdb::Vec3fGrid, openvdb::Vec3f, 3>(grid);
+  }
+  else if (grid->isType<openvdb::BoolGrid>()) {
+    return op.template operator()<openvdb::BoolGrid, openvdb::FloatGrid, float, 1>(grid);
+  }
+  else if (grid->isType<openvdb::DoubleGrid>()) {
+    return op.template operator()<openvdb::DoubleGrid, openvdb::FloatGrid, float, 1>(grid);
+  }
+  else if (grid->isType<openvdb::Int32Grid>()) {
+    return op.template operator()<openvdb::Int32Grid, openvdb::FloatGrid, float, 1>(grid);
+  }
+  else if (grid->isType<openvdb::Int64Grid>()) {
+    return op.template operator()<openvdb::Int64Grid, openvdb::FloatGrid, float, 1>(grid);
+  }
+  else if (grid->isType<openvdb::Vec3IGrid>()) {
+    return op.template operator()<openvdb::Vec3IGrid, openvdb::Vec3fGrid, openvdb::Vec3f, 3>(grid);
+  }
+  else if (grid->isType<openvdb::Vec3dGrid>()) {
+    return op.template operator()<openvdb::Vec3dGrid, openvdb::Vec3fGrid, openvdb::Vec3f, 3>(grid);
+  }
+  else if (grid->isType<openvdb::MaskGrid>()) {
+    return op.template operator()<openvdb::MaskGrid, openvdb::FloatGrid, float, 1>(grid);
+  }
+  else {
+    return false;
+  }
+}
+
 };  // namespace openvdb
 
 #endif

intern/ghost/CMakeLists.txt

@@ -155,6 +155,9 @@ if(WITH_HEADLESS OR WITH_GHOST_SDL)
   endif()
 
 elseif(APPLE AND NOT WITH_GHOST_X11)
+  if(WITH_INPUT_IME)
+    add_definitions(-DWITH_INPUT_IME)
+  endif()
   list(APPEND SRC
     intern/GHOST_DisplayManagerCocoa.mm
     intern/GHOST_SystemCocoa.mm
@@ -285,16 +288,37 @@ elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND)
       ${dbus_INCLUDE_DIRS}
     )
 
+    include(CheckSymbolExists)
+    set(CMAKE_REQUIRED_DEFINITIONS "-D_GNU_SOURCE")
+    check_symbol_exists(memfd_create "sys/mman.h" HAVE_MEMFD_CREATE)
+    if (HAVE_MEMFD_CREATE)
+      add_definitions(-DHAVE_MEMFD_CREATE)
+    endif()
+
     list(APPEND SRC
       intern/GHOST_SystemWayland.cpp
       intern/GHOST_WindowWayland.cpp
 
       intern/GHOST_SystemWayland.h
+      intern/GHOST_WaylandCursorSettings.h
       intern/GHOST_WindowWayland.h
     )
 
     pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner)
-    pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir)
+
+    pkg_check_modules(wayland-protocols wayland-protocols>=1.15)
+    if (${wayland-protocols_FOUND})
+      pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir)
+    else()
+      find_path(WAYLAND_PROTOCOLS_DIR
+        NAMES unstable/xdg-decoration/xdg-decoration-unstable-v1.xml
+        PATH_SUFFIXES share/wayland-protocols
+      )
+    endif()
+
+    if (NOT EXISTS ${WAYLAND_PROTOCOLS_DIR})
+      message(FATAL_ERROR "path to wayland-protocols not found")
+    endif()
 
     # Generate protocols bindings.
     macro(generate_protocol_bindings NAME PROT_DEF)

intern/ghost/GHOST_C-api.h

@@ -96,7 +96,7 @@ extern GHOST_TSuccess GHOST_DisposeEventConsumer(GHOST_EventConsumerHandle consu
  * \param systemhandle: The handle to the system.
  * \return The number of milliseconds.
  */
-extern GHOST_TUns64 GHOST_GetMilliSeconds(GHOST_SystemHandle systemhandle);
+extern uint64_t GHOST_GetMilliSeconds(GHOST_SystemHandle systemhandle);
 
 /**
  * Installs a timer.
@@ -110,8 +110,8 @@ extern GHOST_TUns64 GHOST_GetMilliSeconds(GHOST_SystemHandle systemhandle);
  * \return A timer task (0 if timer task installation failed).
  */
 extern GHOST_TimerTaskHandle GHOST_InstallTimer(GHOST_SystemHandle systemhandle,
-                                                GHOST_TUns64 delay,
-                                                GHOST_TUns64 interval,
+                                                uint64_t delay,
+                                                uint64_t interval,
                                                 GHOST_TimerProcPtr timerProc,
                                                 GHOST_TUserDataPtr userData);
 
@@ -133,7 +133,7 @@ extern GHOST_TSuccess GHOST_RemoveTimer(GHOST_SystemHandle systemhandle,
  * \param systemhandle: The handle to the system.
  * \return The number of displays.
  */
-extern GHOST_TUns8 GHOST_GetNumDisplays(GHOST_SystemHandle systemhandle);
+extern uint8_t GHOST_GetNumDisplays(GHOST_SystemHandle systemhandle);
 
 /**
  * Returns the dimensions of the main display on this system.
@@ -142,8 +142,8 @@ extern GHOST_TUns8 GHOST_GetNumDisplays(GHOST_SystemHandle systemhandle);
  * \param height: A pointer the height gets put in.
  */
 extern void GHOST_GetMainDisplayDimensions(GHOST_SystemHandle systemhandle,
-                                           GHOST_TUns32 *width,
-                                           GHOST_TUns32 *height);
+                                           uint32_t *width,
+                                           uint32_t *height);
 
 /**
  * Returns the dimensions of all displays combine
@@ -154,8 +154,8 @@ extern void GHOST_GetMainDisplayDimensions(GHOST_SystemHandle systemhandle,
  * \param height: A pointer the height gets put in.
  */
 extern void GHOST_GetAllDisplayDimensions(GHOST_SystemHandle systemhandle,
-                                          GHOST_TUns32 *width,
-                                          GHOST_TUns32 *height);
+                                          uint32_t *width,
+                                          uint32_t *height);
 
 /**
  * Create a new window.
@@ -178,10 +178,10 @@ extern void GHOST_GetAllDisplayDimensions(GHOST_SystemHandle systemhandle,
 extern GHOST_WindowHandle GHOST_CreateWindow(GHOST_SystemHandle systemhandle,
                                              GHOST_WindowHandle parent_windowhandle,
                                              const char *title,
-                                             GHOST_TInt32 left,
-                                             GHOST_TInt32 top,
-                                             GHOST_TUns32 width,
-                                             GHOST_TUns32 height,
+                                             int32_t left,
+                                             int32_t top,
+                                             uint32_t width,
+                                             uint32_t height,
                                              GHOST_TWindowState state,
                                              bool is_dialog,
                                              GHOST_TDrawingContextType type,
@@ -360,13 +360,13 @@ extern GHOST_TSuccess GHOST_HasCursorShape(GHOST_WindowHandle windowhandle,
  * \return Indication of success.
  */
 extern GHOST_TSuccess GHOST_SetCustomCursorShape(GHOST_WindowHandle windowhandle,
-                                                 GHOST_TUns8 *bitmap,
-                                                 GHOST_TUns8 *mask,
+                                                 uint8_t *bitmap,
+                                                 uint8_t *mask,
                                                  int sizex,
                                                  int sizey,
                                                  int hotX,
                                                  int hotY,
-                                                 GHOST_TUns8 canInvertColor);
+                                                 bool canInvertColor);
 
 /**
  * Returns the visibility state of the cursor.
@@ -391,8 +391,8 @@ extern GHOST_TSuccess GHOST_SetCursorVisibility(GHOST_WindowHandle windowhandle,
  * \return Indication of success.
  */
 extern GHOST_TSuccess GHOST_GetCursorPosition(GHOST_SystemHandle systemhandle,
-                                              GHOST_TInt32 *x,
-                                              GHOST_TInt32 *y);
+                                              int32_t *x,
+                                              int32_t *y);
 
 /**
  * Updates the location of the cursor (location in screen coordinates).
@@ -403,8 +403,8 @@ extern GHOST_TSuccess GHOST_GetCursorPosition(GHOST_SystemHandle systemhandle,
  * \return Indication of success.
  */
 extern GHOST_TSuccess GHOST_SetCursorPosition(GHOST_SystemHandle systemhandle,
-                                              GHOST_TInt32 x,
-                                              GHOST_TInt32 y);
+                                              int32_t x,
+                                              int32_t y);
 
 /**
  * Grabs the cursor for a modal operation, to keep receiving
@@ -467,7 +467,7 @@ extern void GHOST_setNDOFDeadZone(float deadzone);
 /**
  * Tells if the ongoing drag'n'drop object can be accepted upon mouse drop
  */
-extern void GHOST_setAcceptDragOperation(GHOST_WindowHandle windowhandle, GHOST_TInt8 canAccept);
+extern void GHOST_setAcceptDragOperation(GHOST_WindowHandle windowhandle, bool canAccept);
 
 /**
  * Returns the event type.
@@ -481,7 +481,7 @@ extern GHOST_TEventType GHOST_GetEventType(GHOST_EventHandle eventhandle);
  * \param eventhandle: The handle to the event.
  * \return The event generation time.
  */
-extern GHOST_TUns64 GHOST_GetEventTime(GHOST_EventHandle eventhandle);
+extern uint64_t GHOST_GetEventTime(GHOST_EventHandle eventhandle);
 
 /**
  * Returns the window this event was generated on,
@@ -507,7 +507,7 @@ extern GHOST_TimerProcPtr GHOST_GetTimerProc(GHOST_TimerTaskHandle timertaskhand
 
 /**
  * Changes the timer callback.
- * \param timertaskhandle: The handle to the timertask.
+ * \param timertaskhandle: The handle to the timer-task.
  * \param timerProc: The timer callback.
  */
 extern void GHOST_SetTimerProc(GHOST_TimerTaskHandle timertaskhandle,
@@ -515,14 +515,14 @@ extern void GHOST_SetTimerProc(GHOST_TimerTaskHandle timertaskhandle,
 
 /**
  * Returns the timer user data.
- * \param timertaskhandle: The handle to the timertask.
+ * \param timertaskhandle: The handle to the timer-task.
  * \return The timer user data.
  */
 extern GHOST_TUserDataPtr GHOST_GetTimerTaskUserData(GHOST_TimerTaskHandle timertaskhandle);
 
 /**
  * Changes the time user data.
- * \param timertaskhandle: The handle to the timertask.
+ * \param timertaskhandle: The handle to the timer-task.
  * \param userdata: The timer user data.
  */
 extern void GHOST_SetTimerTaskUserData(GHOST_TimerTaskHandle timertaskhandle,
@@ -595,7 +595,7 @@ void GHOST_DisposeRectangle(GHOST_RectangleHandle rectanglehandle);
  * \param width: The new width of the client area of the window.
  * \return Indication of success.
  */
-extern GHOST_TSuccess GHOST_SetClientWidth(GHOST_WindowHandle windowhandle, GHOST_TUns32 width);
+extern GHOST_TSuccess GHOST_SetClientWidth(GHOST_WindowHandle windowhandle, uint32_t width);
 
 /**
  * Resizes client rectangle height.
@@ -603,7 +603,7 @@ extern GHOST_TSuccess GHOST_SetClientWidth(GHOST_WindowHandle windowhandle, GHOS
  * \param height: The new height of the client area of the window.
  * \return Indication of success.
  */
-extern GHOST_TSuccess GHOST_SetClientHeight(GHOST_WindowHandle windowhandle, GHOST_TUns32 height);
+extern GHOST_TSuccess GHOST_SetClientHeight(GHOST_WindowHandle windowhandle, uint32_t height);
 
 /**
  * Resizes client rectangle.
@@ -613,8 +613,8 @@ extern GHOST_TSuccess GHOST_SetClientHeight(GHOST_WindowHandle windowhandle, GHO
  * \return Indication of success.
  */
 extern GHOST_TSuccess GHOST_SetClientSize(GHOST_WindowHandle windowhandle,
-                                          GHOST_TUns32 width,
-                                          GHOST_TUns32 height);
+                                          uint32_t width,
+                                          uint32_t height);
 
 /**
  * Converts a point in screen coordinates to client rectangle coordinates
@@ -624,11 +624,8 @@ extern GHOST_TSuccess GHOST_SetClientSize(GHOST_WindowHandle windowhandle,
  * \param outX: The x-coordinate in the client rectangle.
  * \param outY: The y-coordinate in the client rectangle.
  */
-extern void GHOST_ScreenToClient(GHOST_WindowHandle windowhandle,
-                                 GHOST_TInt32 inX,
-                                 GHOST_TInt32 inY,
-                                 GHOST_TInt32 *outX,
-                                 GHOST_TInt32 *outY);
+extern void GHOST_ScreenToClient(
+    GHOST_WindowHandle windowhandle, int32_t inX, int32_t inY, int32_t *outX, int32_t *outY);
 
 /**
  * Converts a point in screen coordinates to client rectangle coordinates
@@ -638,11 +635,8 @@ extern void GHOST_ScreenToClient(GHOST_WindowHandle windowhandle,
  * \param outX: The x-coordinate on the screen.
  * \param outY: The y-coordinate on the screen.
  */
-extern void GHOST_ClientToScreen(GHOST_WindowHandle windowhandle,
-                                 GHOST_TInt32 inX,
-                                 GHOST_TInt32 inY,
-                                 GHOST_TInt32 *outX,
-                                 GHOST_TInt32 *outY);
+extern void GHOST_ClientToScreen(
+    GHOST_WindowHandle windowhandle, int32_t inX, int32_t inY, int32_t *outX, int32_t *outY);
 
 /**
  * Returns the state of the window (normal, minimized, maximized).
@@ -667,7 +661,7 @@ extern GHOST_TSuccess GHOST_SetWindowState(GHOST_WindowHandle windowhandle,
  * \return Indication of success.
  */
 extern GHOST_TSuccess GHOST_SetWindowModifiedState(GHOST_WindowHandle windowhandle,
-                                                   GHOST_TUns8 isUnsavedChanges);
+                                                   bool isUnsavedChanges);
 
 /**
  * Sets the order of the window (bottom, top).
@@ -758,14 +752,14 @@ extern void GHOST_SetTabletAPI(GHOST_SystemHandle systemhandle, GHOST_TTabletAPI
  * \param rectanglehandle: The handle to the rectangle.
  * \return width of the rectangle
  */
-extern GHOST_TInt32 GHOST_GetWidthRectangle(GHOST_RectangleHandle rectanglehandle);
+extern int32_t GHOST_GetWidthRectangle(GHOST_RectangleHandle rectanglehandle);
 
 /**
  * Access to rectangle height.
  * \param rectanglehandle: The handle to the rectangle.
  * \return height of the rectangle
  */
-extern GHOST_TInt32 GHOST_GetHeightRectangle(GHOST_RectangleHandle rectanglehandle);
+extern int32_t GHOST_GetHeightRectangle(GHOST_RectangleHandle rectanglehandle);
 
 /**
  * Gets all members of the rectangle.
@@ -775,11 +769,8 @@ extern GHOST_TInt32 GHOST_GetHeightRectangle(GHOST_RectangleHandle rectanglehand
  * \param r: Pointer to return right coordinate in.
  * \param b: Pointer to return bottom coordinate in.
  */
-extern void GHOST_GetRectangle(GHOST_RectangleHandle rectanglehandle,
-                               GHOST_TInt32 *l,
-                               GHOST_TInt32 *t,
-                               GHOST_TInt32 *r,
-                               GHOST_TInt32 *b);
+extern void GHOST_GetRectangle(
+    GHOST_RectangleHandle rectanglehandle, int32_t *l, int32_t *t, int32_t *r, int32_t *b);
 
 /**
  * Sets all members of the rectangle.
@@ -789,11 +780,8 @@ extern void GHOST_GetRectangle(GHOST_RectangleHandle rectanglehandle,
  * \param r: requested right coordinate of the rectangle.
  * \param b: requested bottom coordinate of the rectangle.
  */
-extern void GHOST_SetRectangle(GHOST_RectangleHandle rectanglehandle,
-                               GHOST_TInt32 l,
-                               GHOST_TInt32 t,
-                               GHOST_TInt32 r,
-                               GHOST_TInt32 b);
+extern void GHOST_SetRectangle(
+    GHOST_RectangleHandle rectanglehandle, int32_t l, int32_t t, int32_t r, int32_t b);
 
 /**
  * Returns whether this rectangle is empty.
@@ -818,7 +806,7 @@ extern GHOST_TSuccess GHOST_IsValidRectangle(GHOST_RectangleHandle rectanglehand
  * \param rectanglehandle: The handle to the rectangle.
  * \param i: The amount of offset given to each extreme (negative values shrink the rectangle).
  */
-extern void GHOST_InsetRectangle(GHOST_RectangleHandle rectanglehandle, GHOST_TInt32 i);
+extern void GHOST_InsetRectangle(GHOST_RectangleHandle rectanglehandle, int32_t i);
 
 /**
  * Does a union of the rectangle given and this rectangle.
@@ -835,9 +823,7 @@ extern void GHOST_UnionRectangle(GHOST_RectangleHandle rectanglehandle,
  * \param x: The x-coordinate of the point.
  * \param y: The y-coordinate of the point.
  */
-extern void GHOST_UnionPointRectangle(GHOST_RectangleHandle rectanglehandle,
-                                      GHOST_TInt32 x,
-                                      GHOST_TInt32 y);
+extern void GHOST_UnionPointRectangle(GHOST_RectangleHandle rectanglehandle, int32_t x, int32_t y);
 
 /**
  * Returns whether the point is inside this rectangle.
@@ -848,8 +834,8 @@ extern void GHOST_UnionPointRectangle(GHOST_RectangleHandle rectanglehandle,
  * \return Success value (true if point is inside).
  */
 extern GHOST_TSuccess GHOST_IsInsideRectangle(GHOST_RectangleHandle rectanglehandle,
-                                              GHOST_TInt32 x,
-                                              GHOST_TInt32 y);
+                                              int32_t x,
+                                              int32_t y);
 
 /**
  * Returns whether the rectangle is inside this rectangle.
@@ -868,8 +854,8 @@ extern GHOST_TVisibility GHOST_GetRectangleVisibility(
  * \param cy: Requested center y-coordinate of the rectangle.
  */
 extern void GHOST_SetCenterRectangle(GHOST_RectangleHandle rectanglehandle,
-                                     GHOST_TInt32 cx,
-                                     GHOST_TInt32 cy);
+                                     int32_t cx,
+                                     int32_t cy);
 
 /**
  * Sets rectangle members.
@@ -881,11 +867,8 @@ extern void GHOST_SetCenterRectangle(GHOST_RectangleHandle rectanglehandle,
  * \param w: requested width of the rectangle.
  * \param h: requested height of the rectangle.
  */
-extern void GHOST_SetRectangleCenter(GHOST_RectangleHandle rectanglehandle,
-                                     GHOST_TInt32 cx,
-                                     GHOST_TInt32 cy,
-                                     GHOST_TInt32 w,
-                                     GHOST_TInt32 h);
+extern void GHOST_SetRectangleCenter(
+    GHOST_RectangleHandle rectanglehandle, int32_t cx, int32_t cy, int32_t w, int32_t h);
 
 /**
  * Clips a rectangle.
@@ -903,14 +886,14 @@ extern GHOST_TSuccess GHOST_ClipRectangle(GHOST_RectangleHandle rectanglehandle,
  * \param selection: Boolean to return the selection instead, X11 only feature.
  * \return clipboard data
  */
-extern GHOST_TUns8 *GHOST_getClipboard(int selection);
+extern char *GHOST_getClipboard(bool selection);
 
 /**
  * Put data to the Clipboard
  * \param buffer: the string buffer to set.
  * \param selection: Set the selection instead, X11 only feature.
  */
-extern void GHOST_putClipboard(GHOST_TInt8 *buffer, int selection);
+extern void GHOST_putClipboard(const char *buffer, bool selection);
 
 /**
  * Toggles console
@@ -942,7 +925,7 @@ extern float GHOST_GetNativePixelSize(GHOST_WindowHandle windowhandle);
 /**
  * Returns the suggested DPI for this window.
  */
-extern GHOST_TUns16 GHOST_GetDPIHint(GHOST_WindowHandle windowhandle);
+extern uint16_t GHOST_GetDPIHint(GHOST_WindowHandle windowhandle);
 
 /**
  * Enable IME attached to the given window, i.e. allows user-input
@@ -956,12 +939,8 @@ extern GHOST_TUns16 GHOST_GetDPIHint(GHOST_WindowHandle windowhandle);
  * - true:  Start a new composition.
  * - false: Move the IME windows to the given position without finishing it.
  */
-extern void GHOST_BeginIME(GHOST_WindowHandle windowhandle,
-                           GHOST_TInt32 x,
-                           GHOST_TInt32 y,
-                           GHOST_TInt32 w,
-                           GHOST_TInt32 h,
-                           int complete);
+extern void GHOST_BeginIME(
+    GHOST_WindowHandle windowhandle, int32_t x, int32_t y, int32_t w, int32_t h, bool complete);
 /**
  * Disable the IME attached to the given window, i.e. prohibits any user-input
  * events from being dispatched to the IME.
@@ -1076,7 +1055,7 @@ void GHOST_XrDestroyActionSet(GHOST_XrContextHandle xr_context, const char *acti
  */
 int GHOST_XrCreateActions(GHOST_XrContextHandle xr_context,
                           const char *action_set_name,
-                          GHOST_TUns32 count,
+                          uint32_t count,
                           const GHOST_XrActionInfo *infos);
 
 /**
@@ -1084,7 +1063,7 @@ int GHOST_XrCreateActions(GHOST_XrContextHandle xr_context,
  */
 void GHOST_XrDestroyActions(GHOST_XrContextHandle xr_context,
                             const char *action_set_name,
-                            GHOST_TUns32 count,
+                            uint32_t count,
                             const char *const *action_names);
 
 /**
@@ -1092,7 +1071,7 @@ void GHOST_XrDestroyActions(GHOST_XrContextHandle xr_context,
  */
 int GHOST_XrCreateActionSpaces(GHOST_XrContextHandle xr_context,
                                const char *action_set_name,
-                               GHOST_TUns32 count,
+                               uint32_t count,
                                const GHOST_XrActionSpaceInfo *infos);
 
 /**
@@ -1100,7 +1079,7 @@ int GHOST_XrCreateActionSpaces(GHOST_XrContextHandle xr_context,
  */
 void GHOST_XrDestroyActionSpaces(GHOST_XrContextHandle xr_context,
                                  const char *action_set_name,
-                                 GHOST_TUns32 count,
+                                 uint32_t count,
                                  const GHOST_XrActionSpaceInfo *infos);
 
 /**
@@ -1108,7 +1087,7 @@ void GHOST_XrDestroyActionSpaces(GHOST_XrContextHandle xr_context,
  */
 int GHOST_XrCreateActionBindings(GHOST_XrContextHandle xr_context,
                                  const char *action_set_name,
-                                 GHOST_TUns32 count,
+                                 uint32_t count,
                                  const GHOST_XrActionProfileInfo *infos);
 
 /**
@@ -1116,7 +1095,7 @@ int GHOST_XrCreateActionBindings(GHOST_XrContextHandle xr_context,
  */
 void GHOST_XrDestroyActionBindings(GHOST_XrContextHandle xr_context,
                                    const char *action_set_name,
-                                   GHOST_TUns32 count,
+                                   uint32_t count,
                                    const GHOST_XrActionProfileInfo *infos);
 
 /**
@@ -1138,7 +1117,7 @@ int GHOST_XrSyncActions(GHOST_XrContextHandle xr_context, const char *action_set
 int GHOST_XrApplyHapticAction(GHOST_XrContextHandle xr_context,
                               const char *action_set_name,
                               const char *action_name,
-                              const GHOST_TInt64 *duration,
+                              const int64_t *duration,
                               const float *frequency,
                               const float *amplitude);
 

intern/ghost/GHOST_IEvent.h

@@ -58,7 +58,7 @@ class GHOST_IEvent {
    * Returns the time this event was generated.
    * \return The event generation time.
    */
-  virtual GHOST_TUns64 getTime() = 0;
+  virtual uint64_t getTime() = 0;
 
   /**
    * Returns the window this event was generated on,

intern/ghost/GHOST_ISystem.h

@@ -177,7 +177,7 @@ class GHOST_ISystem {
    * Based on ANSI clock() routine.
    * \return The number of milliseconds.
    */
-  virtual GHOST_TUns64 getMilliSeconds() const = 0;
+  virtual uint64_t getMilliSeconds() const = 0;
 
   /**
    * Installs a timer.
@@ -189,8 +189,8 @@ class GHOST_ISystem {
    * \param userData: Placeholder for user data.
    * \return A timer task (0 if timer task installation failed).
    */
-  virtual GHOST_ITimerTask *installTimer(GHOST_TUns64 delay,
-                                         GHOST_TUns64 interval,
+  virtual GHOST_ITimerTask *installTimer(uint64_t delay,
+                                         uint64_t interval,
                                          GHOST_TimerProcPtr timerProc,
                                          GHOST_TUserDataPtr userData = NULL) = 0;
 
@@ -209,19 +209,19 @@ class GHOST_ISystem {
    * Returns the number of displays on this system.
    * \return The number of displays.
    */
-  virtual GHOST_TUns8 getNumDisplays() const = 0;
+  virtual uint8_t getNumDisplays() const = 0;
 
   /**
    * Returns the dimensions of the main display on this system.
    * \return The dimension of the main display.
    */
-  virtual void getMainDisplayDimensions(GHOST_TUns32 &width, GHOST_TUns32 &height) const = 0;
+  virtual void getMainDisplayDimensions(uint32_t &width, uint32_t &height) const = 0;
 
   /**
    * Returns the combine dimensions of all monitors.
    * \return The dimension of the workspace.
    */
-  virtual void getAllDisplayDimensions(GHOST_TUns32 &width, GHOST_TUns32 &height) const = 0;
+  virtual void getAllDisplayDimensions(uint32_t &width, uint32_t &height) const = 0;
 
   /**
    * Create a new window.
@@ -242,10 +242,10 @@ class GHOST_ISystem {
    * \return The new window (or 0 if creation failed).
    */
   virtual GHOST_IWindow *createWindow(const char *title,
-                                      GHOST_TInt32 left,
-                                      GHOST_TInt32 top,
-                                      GHOST_TUns32 width,
-                                      GHOST_TUns32 height,
+                                      int32_t left,
+                                      int32_t top,
+                                      uint32_t width,
+                                      uint32_t height,
                                       GHOST_TWindowState state,
                                       GHOST_TDrawingContextType type,
                                       GHOST_GLSettings glSettings,
@@ -365,7 +365,7 @@ class GHOST_ISystem {
    * \param y: The y-coordinate of the cursor.
    * \return Indication of success.
    */
-  virtual GHOST_TSuccess getCursorPosition(GHOST_TInt32 &x, GHOST_TInt32 &y) const = 0;
+  virtual GHOST_TSuccess getCursorPosition(int32_t &x, int32_t &y) const = 0;
 
   /**
    * Updates the location of the cursor (location in screen coordinates).
@@ -374,7 +374,7 @@ class GHOST_ISystem {
    * \param y: The y-coordinate of the cursor.
    * \return Indication of success.
    */
-  virtual GHOST_TSuccess setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y) = 0;
+  virtual GHOST_TSuccess setCursorPosition(int32_t x, int32_t y) = 0;
 
   /***************************************************************************************
    * Access to mouse button and keyboard states.
@@ -431,12 +431,12 @@ class GHOST_ISystem {
    * \return "unsigned char" from X11 XA_CUT_BUFFER0 buffer
    *
    */
-  virtual GHOST_TUns8 *getClipboard(bool selection) const = 0;
+  virtual char *getClipboard(bool selection) const = 0;
 
   /**
    * Put data to the Clipboard
    */
-  virtual void putClipboard(GHOST_TInt8 *buffer, bool selection) const = 0;
+  virtual void putClipboard(const char *buffer, bool selection) const = 0;
 
   /***************************************************************************************
    * System Message Box.

intern/ghost/GHOST_ISystemPaths.h

@@ -68,26 +68,26 @@ class GHOST_ISystemPaths {
    * "unpack and run" path, then look for properly installed path, including versioning.
    * \return Unsigned char string pointing to system dir (eg /usr/share/blender/).
    */
-  virtual const GHOST_TUns8 *getSystemDir(int version, const char *versionstr) const = 0;
+  virtual const char *getSystemDir(int version, const char *versionstr) const = 0;
 
   /**
    * Determine the base dir in which user configuration is stored, including versioning.
    * If needed, it will create the base directory.
    * \return Unsigned char string pointing to user dir (eg ~/.blender/).
    */
-  virtual const GHOST_TUns8 *getUserDir(int version, const char *versionstr) const = 0;
+  virtual const char *getUserDir(int version, const char *versionstr) const = 0;
 
   /**
    * Determine a special ("well known") and easy to reach user directory.
    * \return Unsigned char string pointing to user dir (eg `~/Documents/`).
    */
-  virtual const GHOST_TUns8 *getUserSpecialDir(GHOST_TUserSpecialDirTypes type) const = 0;
+  virtual const char *getUserSpecialDir(GHOST_TUserSpecialDirTypes type) const = 0;
 
   /**
    * Determine the directory of the current binary
    * \return Unsigned char string pointing to the binary dir
    */
-  virtual const GHOST_TUns8 *getBinaryDir() const = 0;
+  virtual const char *getBinaryDir() const = 0;
 
   /**
    * Add the file to the operating system most recently used files

intern/ghost/GHOST_IWindow.h

@@ -108,20 +108,20 @@ class GHOST_IWindow {
    * Resizes client rectangle width.
    * \param width: The new width of the client area of the window.
    */
-  virtual GHOST_TSuccess setClientWidth(GHOST_TUns32 width) = 0;
+  virtual GHOST_TSuccess setClientWidth(uint32_t width) = 0;
 
   /**
    * Resizes client rectangle height.
    * \param height: The new height of the client area of the window.
    */
-  virtual GHOST_TSuccess setClientHeight(GHOST_TUns32 height) = 0;
+  virtual GHOST_TSuccess setClientHeight(uint32_t height) = 0;
 
   /**
    * Resizes client rectangle.
    * \param width: The new width of the client area of the window.
    * \param height: The new height of the client area of the window.
    */
-  virtual GHOST_TSuccess setClientSize(GHOST_TUns32 width, GHOST_TUns32 height) = 0;
+  virtual GHOST_TSuccess setClientSize(uint32_t width, uint32_t height) = 0;
 
   /**
    * Converts a point in screen coordinates to client rectangle coordinates
@@ -130,10 +130,7 @@ class GHOST_IWindow {
    * \param outX: The x-coordinate in the client rectangle.
    * \param outY: The y-coordinate in the client rectangle.
    */
-  virtual void screenToClient(GHOST_TInt32 inX,
-                              GHOST_TInt32 inY,
-                              GHOST_TInt32 &outX,
-                              GHOST_TInt32 &outY) const = 0;
+  virtual void screenToClient(int32_t inX, int32_t inY, int32_t &outX, int32_t &outY) const = 0;
 
   /**
    * Converts a point in screen coordinates to client rectangle coordinates
@@ -142,10 +139,7 @@ class GHOST_IWindow {
    * \param outX: The x-coordinate on the screen.
    * \param outY: The y-coordinate on the screen.
    */
-  virtual void clientToScreen(GHOST_TInt32 inX,
-                              GHOST_TInt32 inY,
-                              GHOST_TInt32 &outX,
-                              GHOST_TInt32 &outY) const = 0;
+  virtual void clientToScreen(int32_t inX, int32_t inY, int32_t &outX, int32_t &outY) const = 0;
 
   /**
    * Tells if the ongoing drag'n'drop object can be accepted upon mouse drop
@@ -290,8 +284,8 @@ class GHOST_IWindow {
    * \param hotY: The Y coordinate of the cursor hot-spot.
    * \return Indication of success.
    */
-  virtual GHOST_TSuccess setCustomCursorShape(GHOST_TUns8 *bitmap,
-                                              GHOST_TUns8 *mask,
+  virtual GHOST_TSuccess setCustomCursorShape(uint8_t *bitmap,
+                                              uint8_t *mask,
                                               int sizex,
                                               int sizey,
                                               int hotX,
@@ -319,7 +313,7 @@ class GHOST_IWindow {
   virtual GHOST_TSuccess setCursorGrab(GHOST_TGrabCursorMode /*mode*/,
                                        GHOST_TAxisFlag /*wrap_axis*/,
                                        GHOST_Rect * /*bounds*/,
-                                       GHOST_TInt32 /*mouse_ungrab_xy*/[2])
+                                       int32_t /*mouse_ungrab_xy*/[2])
   {
     return GHOST_kSuccess;
   }
@@ -334,7 +328,7 @@ class GHOST_IWindow {
    * Returns the recommended DPI for this window.
    * \return The recommended DPI for this window.
    */
-  virtual GHOST_TUns16 getDPIHint() = 0;
+  virtual uint16_t getDPIHint() = 0;
 
 #ifdef WITH_INPUT_IME
   /**
@@ -348,8 +342,7 @@ class GHOST_IWindow {
    * - true:  Start a new composition
    * - false: Move the IME windows to the given position without finishing it.
    */
-  virtual void beginIME(
-      GHOST_TInt32 x, GHOST_TInt32 y, GHOST_TInt32 w, GHOST_TInt32 h, int completed) = 0;
+  virtual void beginIME(int32_t x, int32_t y, int32_t w, int32_t h, bool completed) = 0;
 
   /**
    * Disable the IME attached to the given window, i.e. prohibits any user-input

intern/ghost/GHOST_Path-api.h

@@ -48,25 +48,25 @@ extern GHOST_TSuccess GHOST_DisposeSystemPaths(void);
  * "unpack and run" path, then look for properly installed path, including versioning.
  * \return Unsigned char string pointing to system dir (eg /usr/share/blender/).
  */
-extern const GHOST_TUns8 *GHOST_getSystemDir(int version, const char *versionstr);
+extern const char *GHOST_getSystemDir(int version, const char *versionstr);
 
 /**
  * Determine the base dir in which user configuration is stored, including versioning.
  * \return Unsigned char string pointing to user dir (eg ~).
  */
-extern const GHOST_TUns8 *GHOST_getUserDir(int version, const char *versionstr);
+extern const char *GHOST_getUserDir(int version, const char *versionstr);
 
 /**
  * Determine a special ("well known") and easy to reach user directory.
  * \return Unsigned char string pointing to user dir (eg `~/Documents/`).
  */
-extern const GHOST_TUns8 *GHOST_getUserSpecialDir(GHOST_TUserSpecialDirTypes type);
+extern const char *GHOST_getUserSpecialDir(GHOST_TUserSpecialDirTypes type);
 
 /**
  * Determine the dir in which the binary file is found.
  * \return Unsigned char string pointing to binary dir (eg ~/usr/local/bin/).
  */
-extern const GHOST_TUns8 *GHOST_getBinaryDir(void);
+extern const char *GHOST_getBinaryDir(void);
 
 /**
  * Add the file to the operating system most recently used files

intern/ghost/GHOST_Rect.h

@@ -42,7 +42,7 @@ class GHOST_Rect {
    * \param r: requested right coordinate of the rectangle.
    * \param b: requested bottom coordinate of the rectangle.
    */
-  GHOST_Rect(GHOST_TInt32 l = 0, GHOST_TInt32 t = 0, GHOST_TInt32 r = 0, GHOST_TInt32 b = 0)
+  GHOST_Rect(int32_t l = 0, int32_t t = 0, int32_t r = 0, int32_t b = 0)
       : m_l(l), m_t(t), m_r(r), m_b(b)
   {
   }
@@ -58,13 +58,13 @@ class GHOST_Rect {
    * Access to rectangle width.
    * \return width of the rectangle.
    */
-  virtual inline GHOST_TInt32 getWidth() const;
+  virtual inline int32_t getWidth() const;
 
   /**
    * Access to rectangle height.
    * \return height of the rectangle.
    */
-  virtual inline GHOST_TInt32 getHeight() const;
+  virtual inline int32_t getHeight() const;
 
   /**
    * Sets all members of the rectangle.
@@ -73,7 +73,7 @@ class GHOST_Rect {
    * \param r: requested right coordinate of the rectangle.
    * \param b: requested bottom coordinate of the rectangle.
    */
-  virtual inline void set(GHOST_TInt32 l, GHOST_TInt32 t, GHOST_TInt32 r, GHOST_TInt32 b);
+  virtual inline void set(int32_t l, int32_t t, int32_t r, int32_t b);
 
   /**
    * Returns whether this rectangle is empty.
@@ -95,7 +95,7 @@ class GHOST_Rect {
    * The method avoids negative insets making the rectangle invalid
    * \param i: The amount of offset given to each extreme (negative values shrink the rectangle).
    */
-  virtual void inset(GHOST_TInt32 i);
+  virtual void inset(int32_t i);
 
   /**
    * Does a union of the rectangle given and this rectangle.
@@ -109,17 +109,14 @@ class GHOST_Rect {
    * \param x: The x-coordinate of the point.
    * \param y: The y-coordinate of the point.
    */
-  virtual inline void unionPoint(GHOST_TInt32 x, GHOST_TInt32 y);
+  virtual inline void unionPoint(int32_t x, int32_t y);
 
   /**
    * Grows the rectangle to included a point.
    * \param x: The x-coordinate of the point.
    * \param y: The y-coordinate of the point.
    */
-  virtual inline void wrapPoint(GHOST_TInt32 &x,
-                                GHOST_TInt32 &y,
-                                GHOST_TInt32 ofs,
-                                GHOST_TAxisFlag axis);
+  virtual inline void wrapPoint(int32_t &x, int32_t &y, int32_t ofs, GHOST_TAxisFlag axis);
 
   /**
    * Returns whether the point is inside this rectangle.
@@ -128,7 +125,7 @@ class GHOST_Rect {
    * \param y: y-coordinate of point to test.
    * \return boolean value (true if point is inside).
    */
-  virtual inline bool isInside(GHOST_TInt32 x, GHOST_TInt32 y) const;
+  virtual inline bool isInside(int32_t x, int32_t y) const;
 
   /**
    * Returns whether the rectangle is inside this rectangle.
@@ -143,7 +140,7 @@ class GHOST_Rect {
    * \param cx: requested center x-coordinate of the rectangle.
    * \param cy: requested center y-coordinate of the rectangle.
    */
-  virtual void setCenter(GHOST_TInt32 cx, GHOST_TInt32 cy);
+  virtual void setCenter(int32_t cx, int32_t cy);
 
   /**
    * Sets rectangle members.
@@ -154,7 +151,7 @@ class GHOST_Rect {
    * \param w: requested width of the rectangle.
    * \param h: requested height of the rectangle.
    */
-  virtual void setCenter(GHOST_TInt32 cx, GHOST_TInt32 cy, GHOST_TInt32 w, GHOST_TInt32 h);
+  virtual void setCenter(int32_t cx, int32_t cy, int32_t w, int32_t h);
 
   /**
    * Clips a rectangle.
@@ -166,30 +163,30 @@ class GHOST_Rect {
   virtual bool clip(GHOST_Rect &r) const;
 
   /** Left coordinate of the rectangle */
-  GHOST_TInt32 m_l;
+  int32_t m_l;
   /** Top coordinate of the rectangle */
-  GHOST_TInt32 m_t;
+  int32_t m_t;
   /** Right coordinate of the rectangle */
-  GHOST_TInt32 m_r;
+  int32_t m_r;
   /** Bottom coordinate of the rectangle */
-  GHOST_TInt32 m_b;
+  int32_t m_b;
 
 #ifdef WITH_CXX_GUARDEDALLOC
   MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_Rect")
 #endif
 };
 
-inline GHOST_TInt32 GHOST_Rect::getWidth() const
+inline int32_t GHOST_Rect::getWidth() const
 {
   return m_r - m_l;
 }
 
-inline GHOST_TInt32 GHOST_Rect::getHeight() const
+inline int32_t GHOST_Rect::getHeight() const
 {
   return m_b - m_t;
 }
 
-inline void GHOST_Rect::set(GHOST_TInt32 l, GHOST_TInt32 t, GHOST_TInt32 r, GHOST_TInt32 b)
+inline void GHOST_Rect::set(int32_t l, int32_t t, int32_t r, int32_t b)
 {
   m_l = l;
   m_t = t;
@@ -219,7 +216,7 @@ inline void GHOST_Rect::unionRect(const GHOST_Rect &r)
     m_b = r.m_b;
 }
 
-inline void GHOST_Rect::unionPoint(GHOST_TInt32 x, GHOST_TInt32 y)
+inline void GHOST_Rect::unionPoint(int32_t x, int32_t y)
 {
   if (x < m_l)
     m_l = x;
@@ -231,13 +228,10 @@ inline void GHOST_Rect::unionPoint(GHOST_TInt32 x, GHOST_TInt32 y)
     m_b = y;
 }
 
-inline void GHOST_Rect::wrapPoint(GHOST_TInt32 &x,
-                                  GHOST_TInt32 &y,
-                                  GHOST_TInt32 ofs,
-                                  GHOST_TAxisFlag axis)
+inline void GHOST_Rect::wrapPoint(int32_t &x, int32_t &y, int32_t ofs, GHOST_TAxisFlag axis)
 {
-  GHOST_TInt32 w = getWidth();
-  GHOST_TInt32 h = getHeight();
+  int32_t w = getWidth();
+  int32_t h = getHeight();
 
   /* highly unlikely but avoid eternal loop */
   if (w - ofs * 2 <= 0 || h - ofs * 2 <= 0) {
@@ -258,7 +252,7 @@ inline void GHOST_Rect::wrapPoint(GHOST_TInt32 &x,
   }
 }
 
-inline bool GHOST_Rect::isInside(GHOST_TInt32 x, GHOST_TInt32 y) const
+inline bool GHOST_Rect::isInside(int32_t x, int32_t y) const
 {
   return (x >= m_l) && (x <= m_r) && (y >= m_t) && (y <= m_b);
 }

intern/ghost/GHOST_Types.h

@@ -23,6 +23,8 @@
 
 #pragma once
 
+#include <stdint.h>
+
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
 #endif
@@ -56,13 +58,6 @@ GHOST_DECLARE_HANDLE(GHOST_EventConsumerHandle);
 GHOST_DECLARE_HANDLE(GHOST_ContextHandle);
 GHOST_DECLARE_HANDLE(GHOST_XrContextHandle);
 
-typedef char GHOST_TInt8;
-typedef unsigned char GHOST_TUns8;
-typedef short GHOST_TInt16;
-typedef unsigned short GHOST_TUns16;
-typedef int GHOST_TInt32;
-typedef unsigned int GHOST_TUns32;
-
 typedef struct {
   int flags;
 } GHOST_GLSettings;
@@ -78,14 +73,6 @@ typedef enum GHOST_DialogOptions {
   GHOST_DialogError = (1 << 1),
 } GHOST_DialogOptions;
 
-#ifdef _MSC_VER
-typedef __int64 GHOST_TInt64;
-typedef unsigned __int64 GHOST_TUns64;
-#else
-typedef long long GHOST_TInt64;
-typedef unsigned long long GHOST_TUns64;
-#endif
-
 typedef void *GHOST_TUserDataPtr;
 
 typedef enum { GHOST_kFailure = 0, GHOST_kSuccess } GHOST_TSuccess;
@@ -436,9 +423,9 @@ typedef void *GHOST_TEventDataPtr;
 
 typedef struct {
   /** The x-coordinate of the cursor position. */
-  GHOST_TInt32 x;
+  int32_t x;
   /** The y-coordinate of the cursor position. */
-  GHOST_TInt32 y;
+  int32_t y;
   /** Associated tablet data. */
   GHOST_TabletData tablet;
 } GHOST_TEventCursorData;
@@ -452,7 +439,7 @@ typedef struct {
 
 typedef struct {
   /** Displacement of a mouse wheel. */
-  GHOST_TInt32 z;
+  int32_t z;
 } GHOST_TEventWheelData;
 
 typedef enum {
@@ -468,13 +455,13 @@ typedef struct {
   /** The event subtype */
   GHOST_TTrackpadEventSubTypes subtype;
   /** The x-location of the trackpad event */
-  GHOST_TInt32 x;
+  int32_t x;
   /** The y-location of the trackpad event */
-  GHOST_TInt32 y;
+  int32_t y;
   /** The x-delta or value of the trackpad event */
-  GHOST_TInt32 deltaX;
+  int32_t deltaX;
   /** The y-delta (currently only for scroll subtype) of the trackpad event */
-  GHOST_TInt32 deltaY;
+  int32_t deltaY;
   /** The delta is inverted from the device due to system preferences. */
   char isDirectionInverted;
 } GHOST_TEventTrackpadData;
@@ -488,9 +475,9 @@ typedef enum {
 
 typedef struct {
   /** The x-coordinate of the cursor position. */
-  GHOST_TInt32 x;
+  int32_t x;
   /** The y-coordinate of the cursor position. */
-  GHOST_TInt32 y;
+  int32_t y;
   /** The dropped item type */
   GHOST_TDragnDropTypes dataType;
   /** The "dropped content" */
@@ -515,7 +502,7 @@ typedef struct {
 
 typedef struct {
   int count;
-  GHOST_TUns8 **strings;
+  uint8_t **strings;
 } GHOST_TStringArray;
 
 typedef enum {
@@ -587,13 +574,13 @@ typedef enum {
 
 typedef struct {
   /** Number of pixels on a line. */
-  GHOST_TUns32 xPixels;
+  uint32_t xPixels;
   /** Number of lines. */
-  GHOST_TUns32 yPixels;
+  uint32_t yPixels;
   /** Number of bits per pixel. */
-  GHOST_TUns32 bpp;
+  uint32_t bpp;
   /** Refresh rate (in Hertz). */
-  GHOST_TUns32 frequency;
+  uint32_t frequency;
 } GHOST_DisplaySetting;
 
 #ifdef _WIN32
@@ -613,10 +600,10 @@ typedef int GHOST_TEmbedderWindowID;
  */
 #ifdef __cplusplus
 class GHOST_ITimerTask;
-typedef void (*GHOST_TimerProcPtr)(GHOST_ITimerTask *task, GHOST_TUns64 time);
+typedef void (*GHOST_TimerProcPtr)(GHOST_ITimerTask *task, uint64_t time);
 #else
 struct GHOST_TimerTaskHandle__;
-typedef void (*GHOST_TimerProcPtr)(struct GHOST_TimerTaskHandle__ *task, GHOST_TUns64 time);
+typedef void (*GHOST_TimerProcPtr)(struct GHOST_TimerTaskHandle__ *task, uint64_t time);
 #endif
 
 #ifdef WITH_XR_OPENXR
@@ -724,7 +711,7 @@ typedef enum GHOST_XrActionType {
 typedef struct GHOST_XrActionInfo {
   const char *name;
   GHOST_XrActionType type;
-  GHOST_TUns32 count_subaction_paths;
+  uint32_t count_subaction_paths;
   const char **subaction_paths;
   /** States for each subaction path. */
   void *states;
@@ -735,7 +722,7 @@ typedef struct GHOST_XrActionInfo {
 
 typedef struct GHOST_XrActionSpaceInfo {
   const char *action_name;
-  GHOST_TUns32 count_subaction_paths;
+  uint32_t count_subaction_paths;
   const char **subaction_paths;
   /** Poses for each subaction path. */
   const GHOST_XrPose *poses;
@@ -743,14 +730,14 @@ typedef struct GHOST_XrActionSpaceInfo {
 
 typedef struct GHOST_XrActionBindingInfo {
   const char *action_name;
-  GHOST_TUns32 count_interaction_paths;
+  uint32_t count_interaction_paths;
   /** Interaction path: User (sub-action) path + component path. */
   const char **interaction_paths;
 } GHOST_XrActionBindingInfo;
 
 typedef struct GHOST_XrActionProfileInfo {
   const char *profile_path;
-  GHOST_TUns32 count_bindings;
+  uint32_t count_bindings;
   const GHOST_XrActionBindingInfo *bindings;
 } GHOST_XrActionProfileInfo;
 

intern/ghost/intern/GHOST_Buttons.h

@@ -57,7 +57,7 @@ struct GHOST_Buttons {
    */
   void clear();
 
-  GHOST_TUns8 m_ButtonLeft : 1;
-  GHOST_TUns8 m_ButtonMiddle : 1;
-  GHOST_TUns8 m_ButtonRight : 1;
+  uint8_t m_ButtonLeft : 1;
+  uint8_t m_ButtonMiddle : 1;
+  uint8_t m_ButtonRight : 1;
 };

intern/ghost/intern/GHOST_C-api.cpp

@@ -84,7 +84,7 @@ GHOST_TSuccess GHOST_DisposeEventConsumer(GHOST_EventConsumerHandle consumerhand
   return GHOST_kSuccess;
 }
 
-GHOST_TUns64 GHOST_GetMilliSeconds(GHOST_SystemHandle systemhandle)
+uint64_t GHOST_GetMilliSeconds(GHOST_SystemHandle systemhandle)
 {
   GHOST_ISystem *system = (GHOST_ISystem *)systemhandle;
 
@@ -92,8 +92,8 @@ GHOST_TUns64 GHOST_GetMilliSeconds(GHOST_SystemHandle systemhandle)
 }
 
 GHOST_TimerTaskHandle GHOST_InstallTimer(GHOST_SystemHandle systemhandle,
-                                         GHOST_TUns64 delay,
-                                         GHOST_TUns64 interval,
+                                         uint64_t delay,
+                                         uint64_t interval,
                                          GHOST_TimerProcPtr timerproc,
                                          GHOST_TUserDataPtr userdata)
 {
@@ -111,7 +111,7 @@ GHOST_TSuccess GHOST_RemoveTimer(GHOST_SystemHandle systemhandle,
   return system->removeTimer(timertask);
 }
 
-GHOST_TUns8 GHOST_GetNumDisplays(GHOST_SystemHandle systemhandle)
+uint8_t GHOST_GetNumDisplays(GHOST_SystemHandle systemhandle)
 {
   GHOST_ISystem *system = (GHOST_ISystem *)systemhandle;
 
@@ -119,8 +119,8 @@ GHOST_TUns8 GHOST_GetNumDisplays(GHOST_SystemHandle systemhandle)
 }
 
 void GHOST_GetMainDisplayDimensions(GHOST_SystemHandle systemhandle,
-                                    GHOST_TUns32 *width,
-                                    GHOST_TUns32 *height)
+                                    uint32_t *width,
+                                    uint32_t *height)
 {
   GHOST_ISystem *system = (GHOST_ISystem *)systemhandle;
 
@@ -128,8 +128,8 @@ void GHOST_GetMainDisplayDimensions(GHOST_SystemHandle systemhandle,
 }
 
 void GHOST_GetAllDisplayDimensions(GHOST_SystemHandle systemhandle,
-                                   GHOST_TUns32 *width,
-                                   GHOST_TUns32 *height)
+                                   uint32_t *width,
+                                   uint32_t *height)
 {
   GHOST_ISystem *system = (GHOST_ISystem *)systemhandle;
 
@@ -156,10 +156,10 @@ GHOST_TSuccess GHOST_DisposeOpenGLContext(GHOST_SystemHandle systemhandle,
 GHOST_WindowHandle GHOST_CreateWindow(GHOST_SystemHandle systemhandle,
                                       GHOST_WindowHandle parent_windowhandle,
                                       const char *title,
-                                      GHOST_TInt32 left,
-                                      GHOST_TInt32 top,
-                                      GHOST_TUns32 width,
-                                      GHOST_TUns32 height,
+                                      int32_t left,
+                                      int32_t top,
+                                      uint32_t width,
+                                      uint32_t height,
                                       GHOST_TWindowState state,
                                       bool is_dialog,
                                       GHOST_TDrawingContextType type,
@@ -317,13 +317,13 @@ GHOST_TSuccess GHOST_HasCursorShape(GHOST_WindowHandle windowhandle,
 }
 
 GHOST_TSuccess GHOST_SetCustomCursorShape(GHOST_WindowHandle windowhandle,
-                                          GHOST_TUns8 *bitmap,
-                                          GHOST_TUns8 *mask,
+                                          uint8_t *bitmap,
+                                          uint8_t *mask,
                                           int sizex,
                                           int sizey,
                                           int hotX,
                                           int hotY,
-                                          GHOST_TUns8 canInvertColor)
+                                          bool canInvertColor)
 {
   GHOST_IWindow *window = (GHOST_IWindow *)windowhandle;
 
@@ -344,18 +344,14 @@ GHOST_TSuccess GHOST_SetCursorVisibility(GHOST_WindowHandle windowhandle, int vi
   return window->setCursorVisibility(visible ? true : false);
 }
 
-GHOST_TSuccess GHOST_GetCursorPosition(GHOST_SystemHandle systemhandle,
-                                       GHOST_TInt32 *x,
-                                       GHOST_TInt32 *y)
+GHOST_TSuccess GHOST_GetCursorPosition(GHOST_SystemHandle systemhandle, int32_t *x, int32_t *y)
 {
   GHOST_ISystem *system = (GHOST_ISystem *)systemhandle;
 
   return system->getCursorPosition(*x, *y);
 }
 
-GHOST_TSuccess GHOST_SetCursorPosition(GHOST_SystemHandle systemhandle,
-                                       GHOST_TInt32 x,
-                                       GHOST_TInt32 y)
+GHOST_TSuccess GHOST_SetCursorPosition(GHOST_SystemHandle systemhandle, int32_t x, int32_t y)
 {
   GHOST_ISystem *system = (GHOST_ISystem *)systemhandle;
 
@@ -370,7 +366,7 @@ GHOST_TSuccess GHOST_SetCursorGrab(GHOST_WindowHandle windowhandle,
 {
   GHOST_IWindow *window = (GHOST_IWindow *)windowhandle;
   GHOST_Rect bounds_rect;
-  GHOST_TInt32 mouse_xy[2];
+  int32_t mouse_xy[2];
 
   if (bounds) {
     bounds_rect = GHOST_Rect(bounds[0], bounds[1], bounds[2], bounds[3]);
@@ -420,7 +416,7 @@ void GHOST_setNDOFDeadZone(float deadzone)
 }
 #endif
 
-void GHOST_setAcceptDragOperation(GHOST_WindowHandle windowhandle, GHOST_TInt8 canAccept)
+void GHOST_setAcceptDragOperation(GHOST_WindowHandle windowhandle, bool canAccept)
 {
   GHOST_IWindow *window = (GHOST_IWindow *)windowhandle;
 
@@ -434,7 +430,7 @@ GHOST_TEventType GHOST_GetEventType(GHOST_EventHandle eventhandle)
   return event->getType();
 }
 
-GHOST_TUns64 GHOST_GetEventTime(GHOST_EventHandle eventhandle)
+uint64_t GHOST_GetEventTime(GHOST_EventHandle eventhandle)
 {
   GHOST_IEvent *event = (GHOST_IEvent *)eventhandle;
 
@@ -555,14 +551,14 @@ void GHOST_DisposeRectangle(GHOST_RectangleHandle rectanglehandle)
   delete (GHOST_Rect *)rectanglehandle;
 }
 
-GHOST_TSuccess GHOST_SetClientWidth(GHOST_WindowHandle windowhandle, GHOST_TUns32 width)
+GHOST_TSuccess GHOST_SetClientWidth(GHOST_WindowHandle windowhandle, uint32_t width)
 {
   GHOST_IWindow *window = (GHOST_IWindow *)windowhandle;
 
   return window->setClientWidth(width);
 }
 
-GHOST_TSuccess GHOST_SetClientHeight(GHOST_WindowHandle windowhandle, GHOST_TUns32 height)
+GHOST_TSuccess GHOST_SetClientHeight(GHOST_WindowHandle windowhandle, uint32_t height)
 {
   GHOST_IWindow *window = (GHOST_IWindow *)windowhandle;
 
@@ -570,30 +566,24 @@ GHOST_TSuccess GHOST_SetClientHeight(GHOST_WindowHandle windowhandle, GHOST_TUns
 }
 
 GHOST_TSuccess GHOST_SetClientSize(GHOST_WindowHandle windowhandle,
-                                   GHOST_TUns32 width,
-                                   GHOST_TUns32 height)
+                                   uint32_t width,
+                                   uint32_t height)
 {
   GHOST_IWindow *window = (GHOST_IWindow *)windowhandle;
 
   return window->setClientSize(width, height);
 }
 
-void GHOST_ScreenToClient(GHOST_WindowHandle windowhandle,
-                          GHOST_TInt32 inX,
-                          GHOST_TInt32 inY,
-                          GHOST_TInt32 *outX,
-                          GHOST_TInt32 *outY)
+void GHOST_ScreenToClient(
+    GHOST_WindowHandle windowhandle, int32_t inX, int32_t inY, int32_t *outX, int32_t *outY)
 {
   GHOST_IWindow *window = (GHOST_IWindow *)windowhandle;
 
   window->screenToClient(inX, inY, *outX, *outY);
 }
 
-void GHOST_ClientToScreen(GHOST_WindowHandle windowhandle,
-                          GHOST_TInt32 inX,
-                          GHOST_TInt32 inY,
-                          GHOST_TInt32 *outX,
-                          GHOST_TInt32 *outY)
+void GHOST_ClientToScreen(
+    GHOST_WindowHandle windowhandle, int32_t inX, int32_t inY, int32_t *outX, int32_t *outY)
 {
   GHOST_IWindow *window = (GHOST_IWindow *)windowhandle;
 
@@ -614,8 +604,7 @@ GHOST_TSuccess GHOST_SetWindowState(GHOST_WindowHandle windowhandle, GHOST_TWind
   return window->setState(state);
 }
 
-GHOST_TSuccess GHOST_SetWindowModifiedState(GHOST_WindowHandle windowhandle,
-                                            GHOST_TUns8 isUnsavedChanges)
+GHOST_TSuccess GHOST_SetWindowModifiedState(GHOST_WindowHandle windowhandle, bool isUnsavedChanges)
 {
   GHOST_IWindow *window = (GHOST_IWindow *)windowhandle;
 
@@ -703,21 +692,18 @@ void GHOST_SetTabletAPI(GHOST_SystemHandle systemhandle, GHOST_TTabletAPI api)
   system->setTabletAPI(api);
 }
 
-GHOST_TInt32 GHOST_GetWidthRectangle(GHOST_RectangleHandle rectanglehandle)
+int32_t GHOST_GetWidthRectangle(GHOST_RectangleHandle rectanglehandle)
 {
   return ((GHOST_Rect *)rectanglehandle)->getWidth();
 }
 
-GHOST_TInt32 GHOST_GetHeightRectangle(GHOST_RectangleHandle rectanglehandle)
+int32_t GHOST_GetHeightRectangle(GHOST_RectangleHandle rectanglehandle)
 {
   return ((GHOST_Rect *)rectanglehandle)->getHeight();
 }
 
-void GHOST_GetRectangle(GHOST_RectangleHandle rectanglehandle,
-                        GHOST_TInt32 *l,
-                        GHOST_TInt32 *t,
-                        GHOST_TInt32 *r,
-                        GHOST_TInt32 *b)
+void GHOST_GetRectangle(
+    GHOST_RectangleHandle rectanglehandle, int32_t *l, int32_t *t, int32_t *r, int32_t *b)
 {
   GHOST_Rect *rect = (GHOST_Rect *)rectanglehandle;
 
@@ -727,11 +713,8 @@ void GHOST_GetRectangle(GHOST_RectangleHandle rectanglehandle,
   *b = rect->m_b;
 }
 
-void GHOST_SetRectangle(GHOST_RectangleHandle rectanglehandle,
-                        GHOST_TInt32 l,
-                        GHOST_TInt32 t,
-                        GHOST_TInt32 r,
-                        GHOST_TInt32 b)
+void GHOST_SetRectangle(
+    GHOST_RectangleHandle rectanglehandle, int32_t l, int32_t t, int32_t r, int32_t b)
 {
   ((GHOST_Rect *)rectanglehandle)->set(l, t, r, b);
 }
@@ -756,7 +739,7 @@ GHOST_TSuccess GHOST_IsValidRectangle(GHOST_RectangleHandle rectanglehandle)
   return result;
 }
 
-void GHOST_InsetRectangle(GHOST_RectangleHandle rectanglehandle, GHOST_TInt32 i)
+void GHOST_InsetRectangle(GHOST_RectangleHandle rectanglehandle, int32_t i)
 {
   ((GHOST_Rect *)rectanglehandle)->inset(i);
 }
@@ -767,16 +750,12 @@ void GHOST_UnionRectangle(GHOST_RectangleHandle rectanglehandle,
   ((GHOST_Rect *)rectanglehandle)->unionRect(*(GHOST_Rect *)anotherrectanglehandle);
 }
 
-void GHOST_UnionPointRectangle(GHOST_RectangleHandle rectanglehandle,
-                               GHOST_TInt32 x,
-                               GHOST_TInt32 y)
+void GHOST_UnionPointRectangle(GHOST_RectangleHandle rectanglehandle, int32_t x, int32_t y)
 {
   ((GHOST_Rect *)rectanglehandle)->unionPoint(x, y);
 }
 
-GHOST_TSuccess GHOST_IsInsideRectangle(GHOST_RectangleHandle rectanglehandle,
-                                       GHOST_TInt32 x,
-                                       GHOST_TInt32 y)
+GHOST_TSuccess GHOST_IsInsideRectangle(GHOST_RectangleHandle rectanglehandle, int32_t x, int32_t y)
 {
   GHOST_TSuccess result = GHOST_kFailure;
 
@@ -796,18 +775,13 @@ GHOST_TVisibility GHOST_GetRectangleVisibility(GHOST_RectangleHandle rectangleha
   return visible;
 }
 
-void GHOST_SetCenterRectangle(GHOST_RectangleHandle rectanglehandle,
-                              GHOST_TInt32 cx,
-                              GHOST_TInt32 cy)
+void GHOST_SetCenterRectangle(GHOST_RectangleHandle rectanglehandle, int32_t cx, int32_t cy)
 {
   ((GHOST_Rect *)rectanglehandle)->setCenter(cx, cy);
 }
 
-void GHOST_SetRectangleCenter(GHOST_RectangleHandle rectanglehandle,
-                              GHOST_TInt32 cx,
-                              GHOST_TInt32 cy,
-                              GHOST_TInt32 w,
-                              GHOST_TInt32 h)
+void GHOST_SetRectangleCenter(
+    GHOST_RectangleHandle rectanglehandle, int32_t cx, int32_t cy, int32_t w, int32_t h)
 {
   ((GHOST_Rect *)rectanglehandle)->setCenter(cx, cy, w, h);
 }
@@ -823,13 +797,13 @@ GHOST_TSuccess GHOST_ClipRectangle(GHOST_RectangleHandle rectanglehandle,
   return result;
 }
 
-GHOST_TUns8 *GHOST_getClipboard(int selection)
+char *GHOST_getClipboard(bool selection)
 {
   GHOST_ISystem *system = GHOST_ISystem::getSystem();
   return system->getClipboard(selection);
 }
 
-void GHOST_putClipboard(GHOST_TInt8 *buffer, int selection)
+void GHOST_putClipboard(const char *buffer, bool selection)
 {
   GHOST_ISystem *system = GHOST_ISystem::getSystem();
   system->putClipboard(buffer, selection);
@@ -861,7 +835,7 @@ float GHOST_GetNativePixelSize(GHOST_WindowHandle windowhandle)
   return 1.0f;
 }
 
-GHOST_TUns16 GHOST_GetDPIHint(GHOST_WindowHandle windowhandle)
+uint16_t GHOST_GetDPIHint(GHOST_WindowHandle windowhandle)
 {
   GHOST_IWindow *window = (GHOST_IWindow *)windowhandle;
   return window->getDPIHint();
@@ -869,12 +843,8 @@ GHOST_TUns16 GHOST_GetDPIHint(GHOST_WindowHandle windowhandle)
 
 #ifdef WITH_INPUT_IME
 
-void GHOST_BeginIME(GHOST_WindowHandle windowhandle,
-                    GHOST_TInt32 x,
-                    GHOST_TInt32 y,
-                    GHOST_TInt32 w,
-                    GHOST_TInt32 h,
-                    int complete)
+void GHOST_BeginIME(
+    GHOST_WindowHandle windowhandle, int32_t x, int32_t y, int32_t w, int32_t h, bool complete)
 {
   GHOST_IWindow *window = (GHOST_IWindow *)windowhandle;
   window->beginIME(x, y, w, h, complete);
@@ -972,7 +942,7 @@ void GHOST_XrDestroyActionSet(GHOST_XrContextHandle xr_contexthandle, const char
 
 int GHOST_XrCreateActions(GHOST_XrContextHandle xr_contexthandle,
                           const char *action_set_name,
-                          GHOST_TUns32 count,
+                          uint32_t count,
                           const GHOST_XrActionInfo *infos)
 {
   GHOST_IXrContext *xr_context = (GHOST_IXrContext *)xr_contexthandle;
@@ -983,7 +953,7 @@ int GHOST_XrCreateActions(GHOST_XrContextHandle xr_contexthandle,
 
 void GHOST_XrDestroyActions(GHOST_XrContextHandle xr_contexthandle,
                             const char *action_set_name,
-                            GHOST_TUns32 count,
+                            uint32_t count,
                             const char *const *action_names)
 {
   GHOST_IXrContext *xr_context = (GHOST_IXrContext *)xr_contexthandle;
@@ -993,7 +963,7 @@ void GHOST_XrDestroyActions(GHOST_XrContextHandle xr_contexthandle,
 
 int GHOST_XrCreateActionSpaces(GHOST_XrContextHandle xr_contexthandle,
                                const char *action_set_name,
-                               GHOST_TUns32 count,
+                               uint32_t count,
                                const GHOST_XrActionSpaceInfo *infos)
 {
   GHOST_IXrContext *xr_context = (GHOST_IXrContext *)xr_contexthandle;
@@ -1005,7 +975,7 @@ int GHOST_XrCreateActionSpaces(GHOST_XrContextHandle xr_contexthandle,
 
 void GHOST_XrDestroyActionSpaces(GHOST_XrContextHandle xr_contexthandle,
                                  const char *action_set_name,
-                                 GHOST_TUns32 count,
+                                 uint32_t count,
                                  const GHOST_XrActionSpaceInfo *infos)
 {
   GHOST_IXrContext *xr_context = (GHOST_IXrContext *)xr_contexthandle;
@@ -1015,7 +985,7 @@ void GHOST_XrDestroyActionSpaces(GHOST_XrContextHandle xr_contexthandle,
 
 int GHOST_XrCreateActionBindings(GHOST_XrContextHandle xr_contexthandle,
                                  const char *action_set_name,
-                                 GHOST_TUns32 count,
+                                 uint32_t count,
                                  const GHOST_XrActionProfileInfo *infos)
 {
   GHOST_IXrContext *xr_context = (GHOST_IXrContext *)xr_contexthandle;
@@ -1027,7 +997,7 @@ int GHOST_XrCreateActionBindings(GHOST_XrContextHandle xr_contexthandle,
 
 void GHOST_XrDestroyActionBindings(GHOST_XrContextHandle xr_contexthandle,
                                    const char *action_set_name,
-                                   GHOST_TUns32 count,
+                                   uint32_t count,
                                    const GHOST_XrActionProfileInfo *infos)
 {
   GHOST_IXrContext *xr_context = (GHOST_IXrContext *)xr_contexthandle;
@@ -1054,7 +1024,7 @@ int GHOST_XrSyncActions(GHOST_XrContextHandle xr_contexthandle, const char *acti
 int GHOST_XrApplyHapticAction(GHOST_XrContextHandle xr_contexthandle,
                               const char *action_set_name,
                               const char *action_name,
-                              const GHOST_TInt64 *duration,
+                              const int64_t *duration,
                               const float *frequency,
                               const float *amplitude)
 {

intern/ghost/intern/GHOST_DisplayManager.cpp

@@ -49,20 +49,20 @@ GHOST_TSuccess GHOST_DisplayManager::initialize(void)
   return success;
 }
 
-GHOST_TSuccess GHOST_DisplayManager::getNumDisplays(GHOST_TUns8 & /*numDisplays*/) const
+GHOST_TSuccess GHOST_DisplayManager::getNumDisplays(uint8_t & /*numDisplays*/) const
 {
   // Don't know if we have a display...
   return GHOST_kFailure;
 }
 
-GHOST_TSuccess GHOST_DisplayManager::getNumDisplaySettings(GHOST_TUns8 display,
-                                                           GHOST_TInt32 &numSettings) const
+GHOST_TSuccess GHOST_DisplayManager::getNumDisplaySettings(uint8_t display,
+                                                           int32_t &numSettings) const
 {
   GHOST_TSuccess success;
 
   GHOST_ASSERT(m_settingsInitialized,
                "GHOST_DisplayManager::getNumDisplaySettings(): m_settingsInitialized=false");
-  GHOST_TUns8 numDisplays;
+  uint8_t numDisplays;
   success = getNumDisplays(numDisplays);
   if (success == GHOST_kSuccess) {
     if (display < numDisplays) {
@@ -75,18 +75,18 @@ GHOST_TSuccess GHOST_DisplayManager::getNumDisplaySettings(GHOST_TUns8 display,
   return success;
 }
 
-GHOST_TSuccess GHOST_DisplayManager::getDisplaySetting(GHOST_TUns8 display,
-                                                       GHOST_TInt32 index,
+GHOST_TSuccess GHOST_DisplayManager::getDisplaySetting(uint8_t display,
+                                                       int32_t index,
                                                        GHOST_DisplaySetting &setting) const
 {
   GHOST_TSuccess success;
 
   GHOST_ASSERT(m_settingsInitialized,
                "GHOST_DisplayManager::getNumDisplaySettings(): m_settingsInitialized=false");
-  GHOST_TUns8 numDisplays;
+  uint8_t numDisplays;
   success = getNumDisplays(numDisplays);
   if (success == GHOST_kSuccess) {
-    if (display < numDisplays && ((GHOST_TUns8)index < m_settings[display].size())) {
+    if (display < numDisplays && ((uint8_t)index < m_settings[display].size())) {
       setting = m_settings[display][index];
     }
     else {
@@ -97,18 +97,18 @@ GHOST_TSuccess GHOST_DisplayManager::getDisplaySetting(GHOST_TUns8 display,
 }
 
 GHOST_TSuccess GHOST_DisplayManager::getCurrentDisplaySetting(
-    GHOST_TUns8 /*display*/, GHOST_DisplaySetting & /*setting*/) const
+    uint8_t /*display*/, GHOST_DisplaySetting & /*setting*/) const
 {
   return GHOST_kFailure;
 }
 
 GHOST_TSuccess GHOST_DisplayManager::setCurrentDisplaySetting(
-    GHOST_TUns8 /*display*/, const GHOST_DisplaySetting & /*setting*/)
+    uint8_t /*display*/, const GHOST_DisplaySetting & /*setting*/)
 {
   return GHOST_kFailure;
 }
 
-GHOST_TSuccess GHOST_DisplayManager::findMatch(GHOST_TUns8 display,
+GHOST_TSuccess GHOST_DisplayManager::findMatch(uint8_t display,
                                                const GHOST_DisplaySetting &setting,
                                                GHOST_DisplaySetting &match) const
 {
@@ -157,17 +157,16 @@ GHOST_TSuccess GHOST_DisplayManager::findMatch(GHOST_TUns8 display,
 
 GHOST_TSuccess GHOST_DisplayManager::initializeSettings(void)
 {
-  GHOST_TUns8 numDisplays;
+  uint8_t numDisplays;
   GHOST_TSuccess success = getNumDisplays(numDisplays);
   if (success == GHOST_kSuccess) {
-    for (GHOST_TUns8 display = 0; (display < numDisplays) && (success == GHOST_kSuccess);
-         display++) {
+    for (uint8_t display = 0; (display < numDisplays) && (success == GHOST_kSuccess); display++) {
       GHOST_DisplaySettings displaySettings;
       m_settings.push_back(displaySettings);
-      GHOST_TInt32 numSettings;
+      int32_t numSettings;
       success = getNumDisplaySettings(display, numSettings);
       if (success == GHOST_kSuccess) {
-        GHOST_TInt32 index;
+        int32_t index;
         GHOST_DisplaySetting setting;
         for (index = 0; (index < numSettings) && (success == GHOST_kSuccess); index++) {
           success = getDisplaySetting(display, index, setting);

intern/ghost/intern/GHOST_DisplayManager.h

@@ -55,7 +55,7 @@ class GHOST_DisplayManager {
    * \param numDisplays: The number of displays on this system.
    * \return Indication of success.
    */
-  virtual GHOST_TSuccess getNumDisplays(GHOST_TUns8 &numDisplays) const;
+  virtual GHOST_TSuccess getNumDisplays(uint8_t &numDisplays) const;
 
   /**
    * Returns the number of display settings for this display device.
@@ -63,8 +63,7 @@ class GHOST_DisplayManager {
    * \param numSettings: The number of settings of the display device with this index.
    * \return Indication of success.
    */
-  virtual GHOST_TSuccess getNumDisplaySettings(GHOST_TUns8 display,
-                                               GHOST_TInt32 &numSettings) const;
+  virtual GHOST_TSuccess getNumDisplaySettings(uint8_t display, int32_t &numSettings) const;
 
   /**
    * Returns the current setting for this display device.
@@ -73,8 +72,8 @@ class GHOST_DisplayManager {
    * \param setting: The setting of the display device with this index.
    * \return Indication of success.
    */
-  virtual GHOST_TSuccess getDisplaySetting(GHOST_TUns8 display,
-                                           GHOST_TInt32 index,
+  virtual GHOST_TSuccess getDisplaySetting(uint8_t display,
+                                           int32_t index,
                                            GHOST_DisplaySetting &setting) const;
 
   /**
@@ -83,7 +82,7 @@ class GHOST_DisplayManager {
    * \param setting: The current setting of the display device with this index.
    * \return Indication of success.
    */
-  virtual GHOST_TSuccess getCurrentDisplaySetting(GHOST_TUns8 display,
+  virtual GHOST_TSuccess getCurrentDisplaySetting(uint8_t display,
                                                   GHOST_DisplaySetting &setting) const;
 
   /**
@@ -94,7 +93,7 @@ class GHOST_DisplayManager {
    * \param setting: The setting of the display device to be matched and activated.
    * \return Indication of success.
    */
-  virtual GHOST_TSuccess setCurrentDisplaySetting(GHOST_TUns8 display,
+  virtual GHOST_TSuccess setCurrentDisplaySetting(uint8_t display,
                                                   const GHOST_DisplaySetting &setting);
 
  protected:
@@ -107,7 +106,7 @@ class GHOST_DisplayManager {
    * \param match: The optimal display setting.
    * \return Indication of success.
    */
-  GHOST_TSuccess findMatch(GHOST_TUns8 display,
+  GHOST_TSuccess findMatch(uint8_t display,
                            const GHOST_DisplaySetting &setting,
                            GHOST_DisplaySetting &match) const;
 

intern/ghost/intern/GHOST_DisplayManagerCocoa.h

@@ -46,7 +46,7 @@ class GHOST_DisplayManagerCocoa : public GHOST_DisplayManager {
    * \param numDisplays: The number of displays on this system.
    * \return Indication of success.
    */
-  GHOST_TSuccess getNumDisplays(GHOST_TUns8 &numDisplays) const;
+  GHOST_TSuccess getNumDisplays(uint8_t &numDisplays) const;
 
   /**
    * Returns the number of display settings for this display device.
@@ -54,7 +54,7 @@ class GHOST_DisplayManagerCocoa : public GHOST_DisplayManager {
    * \param numSetting: The number of settings of the display device with this index.
    * \return Indication of success.
    */
-  GHOST_TSuccess getNumDisplaySettings(GHOST_TUns8 display, GHOST_TInt32 &numSettings) const;
+  GHOST_TSuccess getNumDisplaySettings(uint8_t display, int32_t &numSettings) const;
 
   /**
    * Returns the current setting for this display device.
@@ -63,8 +63,8 @@ class GHOST_DisplayManagerCocoa : public GHOST_DisplayManager {
    * \param setting: The setting of the display device with this index.
    * \return Indication of success.
    */
-  GHOST_TSuccess getDisplaySetting(GHOST_TUns8 display,
-                                   GHOST_TInt32 index,
+  GHOST_TSuccess getDisplaySetting(uint8_t display,
+                                   int32_t index,
                                    GHOST_DisplaySetting &setting) const;
 
   /**
@@ -73,8 +73,7 @@ class GHOST_DisplayManagerCocoa : public GHOST_DisplayManager {
    * \param setting: The current setting of the display device with this index.
    * \return Indication of success.
    */
-  GHOST_TSuccess getCurrentDisplaySetting(GHOST_TUns8 display,
-                                          GHOST_DisplaySetting &setting) const;
+  GHOST_TSuccess getCurrentDisplaySetting(uint8_t display, GHOST_DisplaySetting &setting) const;
 
   /**
    * Changes the current setting for this display device.
@@ -82,8 +81,7 @@ class GHOST_DisplayManagerCocoa : public GHOST_DisplayManager {
    * \param setting: The current setting of the display device with this index.
    * \return Indication of success.
    */
-  GHOST_TSuccess setCurrentDisplaySetting(GHOST_TUns8 display,
-                                          const GHOST_DisplaySetting &setting);
+  GHOST_TSuccess setCurrentDisplaySetting(uint8_t display, const GHOST_DisplaySetting &setting);
 
  protected:
   // Do not cache values as OS X supports screen hot plug

intern/ghost/intern/GHOST_DisplayManagerCocoa.mm

@@ -29,26 +29,26 @@ GHOST_DisplayManagerCocoa::GHOST_DisplayManagerCocoa(void)
 {
 }
 
-GHOST_TSuccess GHOST_DisplayManagerCocoa::getNumDisplays(GHOST_TUns8 &numDisplays) const
+GHOST_TSuccess GHOST_DisplayManagerCocoa::getNumDisplays(uint8_t &numDisplays) const
 {
   NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
-  numDisplays = (GHOST_TUns8)[[NSScreen screens] count];
+  numDisplays = (uint8_t)[[NSScreen screens] count];
 
   [pool drain];
   return GHOST_kSuccess;
 }
 
-GHOST_TSuccess GHOST_DisplayManagerCocoa::getNumDisplaySettings(GHOST_TUns8 display,
-                                                                GHOST_TInt32 &numSettings) const
+GHOST_TSuccess GHOST_DisplayManagerCocoa::getNumDisplaySettings(uint8_t display,
+                                                                int32_t &numSettings) const
 {
-  numSettings = (GHOST_TInt32)3;  // Width, Height, BitsPerPixel
+  numSettings = (int32_t)3;  // Width, Height, BitsPerPixel
 
   return GHOST_kSuccess;
 }
 
-GHOST_TSuccess GHOST_DisplayManagerCocoa::getDisplaySetting(GHOST_TUns8 display,
-                                                            GHOST_TInt32 index,
+GHOST_TSuccess GHOST_DisplayManagerCocoa::getDisplaySetting(uint8_t display,
+                                                            int32_t index,
                                                             GHOST_DisplaySetting &setting) const
 {
   NSScreen *askedDisplay;
@@ -86,7 +86,7 @@ GHOST_TSuccess GHOST_DisplayManagerCocoa::getDisplaySetting(GHOST_TUns8 display,
 }
 
 GHOST_TSuccess GHOST_DisplayManagerCocoa::getCurrentDisplaySetting(
-    GHOST_TUns8 display, GHOST_DisplaySetting &setting) const
+    uint8_t display, GHOST_DisplaySetting &setting) const
 {
   NSScreen *askedDisplay;
 
@@ -127,7 +127,7 @@ GHOST_TSuccess GHOST_DisplayManagerCocoa::getCurrentDisplaySetting(
 }
 
 GHOST_TSuccess GHOST_DisplayManagerCocoa::setCurrentDisplaySetting(
-    GHOST_TUns8 display, const GHOST_DisplaySetting &setting)
+    uint8_t display, const GHOST_DisplaySetting &setting)
 {
   GHOST_ASSERT(
       (display == kMainDisplay),

intern/ghost/intern/GHOST_DisplayManagerNULL.h

@@ -31,25 +31,25 @@ class GHOST_DisplayManagerNULL : public GHOST_DisplayManager {
   GHOST_DisplayManagerNULL(GHOST_SystemNULL *system) : GHOST_DisplayManager(), m_system(system)
   { /* nop */
   }
-  GHOST_TSuccess getNumDisplays(GHOST_TUns8 &numDisplays) const
+  GHOST_TSuccess getNumDisplays(uint8_t &numDisplays) const
   {
     return GHOST_kFailure;
   }
-  GHOST_TSuccess getNumDisplaySettings(GHOST_TUns8 display, GHOST_TInt32 &numSettings) const
+  GHOST_TSuccess getNumDisplaySettings(uint8_t display, int32_t &numSettings) const
   {
     return GHOST_kFailure;
   }
-  GHOST_TSuccess getDisplaySetting(GHOST_TUns8 display,
-                                   GHOST_TInt32 index,
+  GHOST_TSuccess getDisplaySetting(uint8_t display,
+                                   int32_t index,
                                    GHOST_DisplaySetting &setting) const
   {
     return GHOST_kFailure;
   }
-  GHOST_TSuccess getCurrentDisplaySetting(GHOST_TUns8 display, GHOST_DisplaySetting &setting) const
+  GHOST_TSuccess getCurrentDisplaySetting(uint8_t display, GHOST_DisplaySetting &setting) const
   {
-    return getDisplaySetting(display, GHOST_TInt32(0), setting);
+    return getDisplaySetting(display, int32_t(0), setting);
   }
-  GHOST_TSuccess setCurrentDisplaySetting(GHOST_TUns8 display, const GHOST_DisplaySetting &setting)
+  GHOST_TSuccess setCurrentDisplaySetting(uint8_t display, const GHOST_DisplaySetting &setting)
   {
     return GHOST_kSuccess;
   }

intern/ghost/intern/GHOST_DisplayManagerSDL.cpp

@@ -33,14 +33,14 @@ GHOST_DisplayManagerSDL::GHOST_DisplayManagerSDL(GHOST_SystemSDL *system)
   memset(&m_mode, 0, sizeof(m_mode));
 }
 
-GHOST_TSuccess GHOST_DisplayManagerSDL::getNumDisplays(GHOST_TUns8 &numDisplays) const
+GHOST_TSuccess GHOST_DisplayManagerSDL::getNumDisplays(uint8_t &numDisplays) const
 {
   numDisplays = SDL_GetNumVideoDisplays();
   return GHOST_kSuccess;
 }
 
-GHOST_TSuccess GHOST_DisplayManagerSDL::getNumDisplaySettings(GHOST_TUns8 display,
-                                                              GHOST_TInt32 &numSettings) const
+GHOST_TSuccess GHOST_DisplayManagerSDL::getNumDisplaySettings(uint8_t display,
+                                                              int32_t &numSettings) const
 {
   GHOST_ASSERT(display < 1, "Only single display systems are currently supported.\n");
 
@@ -66,8 +66,8 @@ static void ghost_mode_to_sdl(const GHOST_DisplaySetting &setting, SDL_DisplayMo
   mode->refresh_rate = setting.frequency;
 }
 
-GHOST_TSuccess GHOST_DisplayManagerSDL::getDisplaySetting(GHOST_TUns8 display,
-                                                          GHOST_TInt32 index,
+GHOST_TSuccess GHOST_DisplayManagerSDL::getDisplaySetting(uint8_t display,
+                                                          int32_t index,
                                                           GHOST_DisplaySetting &setting) const
 {
   GHOST_ASSERT(display < 1, "Only single display systems are currently supported.\n");
@@ -81,7 +81,7 @@ GHOST_TSuccess GHOST_DisplayManagerSDL::getDisplaySetting(GHOST_TUns8 display,
 }
 
 GHOST_TSuccess GHOST_DisplayManagerSDL::getCurrentDisplaySetting(
-    GHOST_TUns8 display, GHOST_DisplaySetting &setting) const
+    uint8_t display, GHOST_DisplaySetting &setting) const
 {
   SDL_DisplayMode mode;
   SDL_GetCurrentDisplayMode(display, &mode);
@@ -98,7 +98,7 @@ GHOST_TSuccess GHOST_DisplayManagerSDL::getCurrentDisplayModeSDL(SDL_DisplayMode
 }
 
 GHOST_TSuccess GHOST_DisplayManagerSDL::setCurrentDisplaySetting(
-    GHOST_TUns8 display, const GHOST_DisplaySetting &setting)
+    uint8_t display, const GHOST_DisplaySetting &setting)
 {
   /*
    * Mode switching code ported from Quake 2 version 3.21 and bzflag version

intern/ghost/intern/GHOST_DisplayManagerSDL.h

@@ -37,21 +37,19 @@ class GHOST_DisplayManagerSDL : public GHOST_DisplayManager {
  public:
   GHOST_DisplayManagerSDL(GHOST_SystemSDL *system);
 
-  GHOST_TSuccess getNumDisplays(GHOST_TUns8 &numDisplays) const;
+  GHOST_TSuccess getNumDisplays(uint8_t &numDisplays) const;
 
-  GHOST_TSuccess getNumDisplaySettings(GHOST_TUns8 display, GHOST_TInt32 &numSettings) const;
+  GHOST_TSuccess getNumDisplaySettings(uint8_t display, int32_t &numSettings) const;
 
-  GHOST_TSuccess getDisplaySetting(GHOST_TUns8 display,
-                                   GHOST_TInt32 index,
+  GHOST_TSuccess getDisplaySetting(uint8_t display,
+                                   int32_t index,
                                    GHOST_DisplaySetting &setting) const;
 
-  GHOST_TSuccess getCurrentDisplaySetting(GHOST_TUns8 display,
-                                          GHOST_DisplaySetting &setting) const;
+  GHOST_TSuccess getCurrentDisplaySetting(uint8_t display, GHOST_DisplaySetting &setting) const;
 
   GHOST_TSuccess getCurrentDisplayModeSDL(SDL_DisplayMode &mode) const;
 
-  GHOST_TSuccess setCurrentDisplaySetting(GHOST_TUns8 display,
-                                          const GHOST_DisplaySetting &setting);
+  GHOST_TSuccess setCurrentDisplaySetting(uint8_t display, const GHOST_DisplaySetting &setting);
 
  private:
   GHOST_SystemSDL *m_system;

intern/ghost/intern/GHOST_DisplayManagerWin32.cpp

@@ -35,7 +35,7 @@ GHOST_DisplayManagerWin32::GHOST_DisplayManagerWin32(void)
 {
 }
 
-GHOST_TSuccess GHOST_DisplayManagerWin32::getNumDisplays(GHOST_TUns8 &numDisplays) const
+GHOST_TSuccess GHOST_DisplayManagerWin32::getNumDisplays(uint8_t &numDisplays) const
 {
   numDisplays = ::GetSystemMetrics(SM_CMONITORS);
   return numDisplays > 0 ? GHOST_kSuccess : GHOST_kFailure;
@@ -54,8 +54,8 @@ static BOOL get_dd(DWORD d, DISPLAY_DEVICE *dd)
  * the information that was cached the last time the function was called with iModeNum
  * set to zero.
  */
-GHOST_TSuccess GHOST_DisplayManagerWin32::getNumDisplaySettings(GHOST_TUns8 display,
-                                                                GHOST_TInt32 &numSettings) const
+GHOST_TSuccess GHOST_DisplayManagerWin32::getNumDisplaySettings(uint8_t display,
+                                                                int32_t &numSettings) const
 {
   DISPLAY_DEVICE display_device;
   if (!get_dd(display, &display_device))
@@ -69,8 +69,8 @@ GHOST_TSuccess GHOST_DisplayManagerWin32::getNumDisplaySettings(GHOST_TUns8 disp
   return GHOST_kSuccess;
 }
 
-GHOST_TSuccess GHOST_DisplayManagerWin32::getDisplaySetting(GHOST_TUns8 display,
-                                                            GHOST_TInt32 index,
+GHOST_TSuccess GHOST_DisplayManagerWin32::getDisplaySetting(uint8_t display,
+                                                            int32_t index,
                                                             GHOST_DisplaySetting &setting) const
 {
   DISPLAY_DEVICE display_device;
@@ -111,13 +111,13 @@ GHOST_TSuccess GHOST_DisplayManagerWin32::getDisplaySetting(GHOST_TUns8 display,
 }
 
 GHOST_TSuccess GHOST_DisplayManagerWin32::getCurrentDisplaySetting(
-    GHOST_TUns8 display, GHOST_DisplaySetting &setting) const
+    uint8_t display, GHOST_DisplaySetting &setting) const
 {
   return getDisplaySetting(display, ENUM_CURRENT_SETTINGS, setting);
 }
 
 GHOST_TSuccess GHOST_DisplayManagerWin32::setCurrentDisplaySetting(
-    GHOST_TUns8 display, const GHOST_DisplaySetting &setting)
+    uint8_t display, const GHOST_DisplaySetting &setting)
 {
   DISPLAY_DEVICE display_device;
   if (!get_dd(display, &display_device))

intern/ghost/intern/GHOST_DisplayManagerWin32.h

@@ -45,7 +45,7 @@ class GHOST_DisplayManagerWin32 : public GHOST_DisplayManager {
    * \param numDisplays: The number of displays on this system.
    * \return Indication of success.
    */
-  GHOST_TSuccess getNumDisplays(GHOST_TUns8 &numDisplays) const;
+  GHOST_TSuccess getNumDisplays(uint8_t &numDisplays) const;
 
   /**
    * Returns the number of display settings for this display device.
@@ -53,7 +53,7 @@ class GHOST_DisplayManagerWin32 : public GHOST_DisplayManager {
    * \param numSetting: The number of settings of the display device with this index.
    * \return Indication of success.
    */
-  GHOST_TSuccess getNumDisplaySettings(GHOST_TUns8 display, GHOST_TInt32 &numSettings) const;
+  GHOST_TSuccess getNumDisplaySettings(uint8_t display, int32_t &numSettings) const;
 
   /**
    * Returns the current setting for this display device.
@@ -62,8 +62,8 @@ class GHOST_DisplayManagerWin32 : public GHOST_DisplayManager {
    * \param setting: The setting of the display device with this index.
    * \return Indication of success.
    */
-  GHOST_TSuccess getDisplaySetting(GHOST_TUns8 display,
-                                   GHOST_TInt32 index,
+  GHOST_TSuccess getDisplaySetting(uint8_t display,
+                                   int32_t index,
                                    GHOST_DisplaySetting &setting) const;
 
   /**
@@ -72,8 +72,7 @@ class GHOST_DisplayManagerWin32 : public GHOST_DisplayManager {
    * \param setting: The current setting of the display device with this index.
    * \return Indication of success.
    */
-  GHOST_TSuccess getCurrentDisplaySetting(GHOST_TUns8 display,
-                                          GHOST_DisplaySetting &setting) const;
+  GHOST_TSuccess getCurrentDisplaySetting(uint8_t display, GHOST_DisplaySetting &setting) const;
 
   /**
    * Changes the current setting for this display device.
@@ -81,8 +80,7 @@ class GHOST_DisplayManagerWin32 : public GHOST_DisplayManager {
    * \param setting: The current setting of the display device with this index.
    * \return Indication of success.
    */
-  GHOST_TSuccess setCurrentDisplaySetting(GHOST_TUns8 display,
-                                          const GHOST_DisplaySetting &setting);
+  GHOST_TSuccess setCurrentDisplaySetting(uint8_t display, const GHOST_DisplaySetting &setting);
 
  protected:
 };

intern/ghost/intern/GHOST_DisplayManagerX11.cpp

@@ -40,14 +40,14 @@ GHOST_DisplayManagerX11::GHOST_DisplayManagerX11(GHOST_SystemX11 *system)
   /* nothing to do. */
 }
 
-GHOST_TSuccess GHOST_DisplayManagerX11::getNumDisplays(GHOST_TUns8 &numDisplays) const
+GHOST_TSuccess GHOST_DisplayManagerX11::getNumDisplays(uint8_t &numDisplays) const
 {
   numDisplays = m_system->getNumDisplays();
   return GHOST_kSuccess;
 }
 
-GHOST_TSuccess GHOST_DisplayManagerX11::getNumDisplaySettings(GHOST_TUns8 display,
-                                                              GHOST_TInt32 &numSettings) const
+GHOST_TSuccess GHOST_DisplayManagerX11::getNumDisplaySettings(uint8_t display,
+                                                              int32_t &numSettings) const
 {
 #ifdef WITH_X11_XF86VMODE
   int majorVersion, minorVersion;
@@ -88,8 +88,8 @@ static int calculate_rate(XF86VidModeModeInfo *info)
 }
 #endif
 
-GHOST_TSuccess GHOST_DisplayManagerX11::getDisplaySetting(GHOST_TUns8 display,
-                                                          GHOST_TInt32 index,
+GHOST_TSuccess GHOST_DisplayManagerX11::getDisplaySetting(uint8_t display,
+                                                          int32_t index,
                                                           GHOST_DisplaySetting &setting) const
 {
   Display *dpy = m_system->getXDisplay();
@@ -140,7 +140,7 @@ GHOST_TSuccess GHOST_DisplayManagerX11::getDisplaySetting(GHOST_TUns8 display,
 }
 
 GHOST_TSuccess GHOST_DisplayManagerX11::getCurrentDisplaySetting(
-    GHOST_TUns8 display, GHOST_DisplaySetting &setting) const
+    uint8_t display, GHOST_DisplaySetting &setting) const
 {
   /* According to the xf86vidmodegetallmodelines man page,
    * "The first element of the array corresponds to the current video mode."
@@ -149,7 +149,7 @@ GHOST_TSuccess GHOST_DisplayManagerX11::getCurrentDisplaySetting(
 }
 
 GHOST_TSuccess GHOST_DisplayManagerX11::setCurrentDisplaySetting(
-    GHOST_TUns8 /*display*/, const GHOST_DisplaySetting &setting)
+    uint8_t /*display*/, const GHOST_DisplaySetting &setting)
 {
 #ifdef WITH_X11_XF86VMODE
   /* Mode switching code ported from SDL:

intern/ghost/intern/GHOST_DisplayManagerX11.h

@@ -43,7 +43,7 @@ class GHOST_DisplayManagerX11 : public GHOST_DisplayManager {
    * \param numDisplays: The number of displays on this system.
    * \return Indication of success.
    */
-  GHOST_TSuccess getNumDisplays(GHOST_TUns8 &numDisplays) const;
+  GHOST_TSuccess getNumDisplays(uint8_t &numDisplays) const;
 
   /**
    * Returns the number of display settings for this display device.
@@ -51,7 +51,7 @@ class GHOST_DisplayManagerX11 : public GHOST_DisplayManager {
    * \param numSetting: The number of settings of the display device with this index.
    * \return Indication of success.
    */
-  GHOST_TSuccess getNumDisplaySettings(GHOST_TUns8 display, GHOST_TInt32 &numSettings) const;
+  GHOST_TSuccess getNumDisplaySettings(uint8_t display, int32_t &numSettings) const;
 
   /**
    * Returns the current setting for this display device.
@@ -60,8 +60,8 @@ class GHOST_DisplayManagerX11 : public GHOST_DisplayManager {
    * \param setting: The setting of the display device with this index.
    * \return Indication of success.
    */
-  GHOST_TSuccess getDisplaySetting(GHOST_TUns8 display,
-                                   GHOST_TInt32 index,
+  GHOST_TSuccess getDisplaySetting(uint8_t display,
+                                   int32_t index,
                                    GHOST_DisplaySetting &setting) const;
 
   /**
@@ -70,8 +70,7 @@ class GHOST_DisplayManagerX11 : public GHOST_DisplayManager {
    * \param setting: The current setting of the display device with this index.
    * \return Indication of success.
    */
-  GHOST_TSuccess getCurrentDisplaySetting(GHOST_TUns8 display,
-                                          GHOST_DisplaySetting &setting) const;
+  GHOST_TSuccess getCurrentDisplaySetting(uint8_t display, GHOST_DisplaySetting &setting) const;
 
   /**
    * Changes the current setting for this display device.
@@ -79,8 +78,7 @@ class GHOST_DisplayManagerX11 : public GHOST_DisplayManager {
    * \param setting: The current setting of the display device with this index.
    * \return Indication of success.
    */
-  GHOST_TSuccess setCurrentDisplaySetting(GHOST_TUns8 display,
-                                          const GHOST_DisplaySetting &setting);
+  GHOST_TSuccess setCurrentDisplaySetting(uint8_t display, const GHOST_DisplaySetting &setting);
 
  private:
   GHOST_SystemX11 *m_system;

intern/ghost/intern/GHOST_DropTargetWin32.cpp

@@ -242,7 +242,7 @@ void *GHOST_DropTargetWin32::getDropDataAsFilenames(IDataObject *pDataObject)
 
       strArray = (GHOST_TStringArray *)::malloc(sizeof(GHOST_TStringArray));
       strArray->count = 0;
-      strArray->strings = (GHOST_TUns8 **)::malloc(totfiles * sizeof(GHOST_TUns8 *));
+      strArray->strings = (uint8_t **)::malloc(totfiles * sizeof(uint8_t *));
 
       for (UINT nfile = 0; nfile < totfiles; nfile++) {
         if (::DragQueryFileW(hdrop, nfile, fpath, MAX_PATH) > 0) {
@@ -251,7 +251,7 @@ void *GHOST_DropTargetWin32::getDropDataAsFilenames(IDataObject *pDataObject)
           }
           // Just ignore paths that could not be converted verbatim.
 
-          strArray->strings[nvalid] = (GHOST_TUns8 *)temp_path;
+          strArray->strings[nvalid] = (uint8_t *)temp_path;
           strArray->count = nvalid + 1;
           nvalid++;
         }

intern/ghost/intern/GHOST_DropTargetX11.cpp

@@ -216,7 +216,7 @@ void *GHOST_DropTargetX11::getURIListGhostData(unsigned char *dropBuffer, int dr
 
   strArray = (GHOST_TStringArray *)malloc(sizeof(GHOST_TStringArray));
   strArray->count = 0;
-  strArray->strings = (GHOST_TUns8 **)malloc(totPaths * sizeof(GHOST_TUns8 *));
+  strArray->strings = (uint8_t **)malloc(totPaths * sizeof(uint8_t *));
 
   curLength = 0;
   for (int i = 0; i <= dropBufferSize; i++) {
@@ -230,7 +230,7 @@ void *GHOST_DropTargetX11::getURIListGhostData(unsigned char *dropBuffer, int dr
 
         decodedPath = FileUrlDecode(curPath);
         if (decodedPath) {
-          strArray->strings[strArray->count] = (GHOST_TUns8 *)decodedPath;
+          strArray->strings[strArray->count] = (uint8_t *)decodedPath;
           strArray->count++;
         }
 

intern/ghost/intern/GHOST_Event.h

@@ -37,7 +37,7 @@ class GHOST_Event : public GHOST_IEvent {
    * \param type: The type of this event.
    * \param window: The generating window (or NULL if system event).
    */
-  GHOST_Event(GHOST_TUns64 msec, GHOST_TEventType type, GHOST_IWindow *window)
+  GHOST_Event(uint64_t msec, GHOST_TEventType type, GHOST_IWindow *window)
       : m_type(type), m_time(msec), m_window(window), m_data(NULL)
   {
   }
@@ -55,7 +55,7 @@ class GHOST_Event : public GHOST_IEvent {
    * Returns the time this event was generated.
    * \return The event generation time.
    */
-  GHOST_TUns64 getTime()
+  uint64_t getTime()
   {
     return m_time;
   }
@@ -83,7 +83,7 @@ class GHOST_Event : public GHOST_IEvent {
   /** Type of this event. */
   GHOST_TEventType m_type;
   /** The time this event was generated. */
-  GHOST_TUns64 m_time;
+  uint64_t m_time;
   /** Pointer to the generating window. */
   GHOST_IWindow *m_window;
   /** Pointer to the event data. */

intern/ghost/intern/GHOST_EventButton.h

@@ -40,7 +40,7 @@ class GHOST_EventButton : public GHOST_Event {
    * \param button: The state of the buttons were at the time of the event.
    * \param tablet: The tablet data associated with this event.
    */
-  GHOST_EventButton(GHOST_TUns64 time,
+  GHOST_EventButton(uint64_t time,
                     GHOST_TEventType type,
                     GHOST_IWindow *window,
                     GHOST_TButtonMask button,

intern/ghost/intern/GHOST_EventCursor.h

@@ -39,11 +39,11 @@ class GHOST_EventCursor : public GHOST_Event {
    * \param y: The y-coordinate of the location the cursor was at the time of the event.
    * \param tablet: The tablet data associated with this event.
    */
-  GHOST_EventCursor(GHOST_TUns64 msec,
+  GHOST_EventCursor(uint64_t msec,
                     GHOST_TEventType type,
                     GHOST_IWindow *window,
-                    GHOST_TInt32 x,
-                    GHOST_TInt32 y,
+                    int32_t x,
+                    int32_t y,
                     const GHOST_TabletData &tablet)
       : GHOST_Event(msec, type, window), m_cursorEventData({x, y, tablet})
   {

intern/ghost/intern/GHOST_EventDragnDrop.h

@@ -72,7 +72,7 @@ class GHOST_EventDragnDrop : public GHOST_Event {
    * \param y: The y-coordinate of the location the cursor was at the time of the event.
    * \param data: The "content" dropped in the window.
    */
-  GHOST_EventDragnDrop(GHOST_TUns64 time,
+  GHOST_EventDragnDrop(uint64_t time,
                        GHOST_TEventType type,
                        GHOST_TDragnDropTypes dataType,
                        GHOST_IWindow *window,

intern/ghost/intern/GHOST_EventKey.h

@@ -39,11 +39,8 @@ class GHOST_EventKey : public GHOST_Event {
    * \param type: The type of key event.
    * \param key: The key code of the key.
    */
-  GHOST_EventKey(GHOST_TUns64 msec,
-                 GHOST_TEventType type,
-                 GHOST_IWindow *window,
-                 GHOST_TKey key,
-                 bool is_repeat)
+  GHOST_EventKey(
+      uint64_t msec, GHOST_TEventType type, GHOST_IWindow *window, GHOST_TKey key, bool is_repeat)
       : GHOST_Event(msec, type, window)
   {
     m_keyEventData.key = key;
@@ -60,7 +57,7 @@ class GHOST_EventKey : public GHOST_Event {
    * \param key: The key code of the key.
    * \param ascii: The ascii code for the key event.
    */
-  GHOST_EventKey(GHOST_TUns64 msec,
+  GHOST_EventKey(uint64_t msec,
                  GHOST_TEventType type,
                  GHOST_IWindow *window,
                  GHOST_TKey key,

intern/ghost/intern/GHOST_EventManager.cpp

@@ -28,7 +28,6 @@
 #include "GHOST_EventManager.h"
 #include "GHOST_Debug.h"
 #include <algorithm>
-#include <stdio.h>  // [mce] temp debug
 
 GHOST_EventManager::GHOST_EventManager()
 {
@@ -46,14 +45,14 @@ GHOST_EventManager::~GHOST_EventManager()
   }
 }
 
-GHOST_TUns32 GHOST_EventManager::getNumEvents()
+uint32_t GHOST_EventManager::getNumEvents()
 {
-  return (GHOST_TUns32)m_events.size();
+  return (uint32_t)m_events.size();
 }
 
-GHOST_TUns32 GHOST_EventManager::getNumEvents(GHOST_TEventType type)
+uint32_t GHOST_EventManager::getNumEvents(GHOST_TEventType type)
 {
-  GHOST_TUns32 numEvents = 0;
+  uint32_t numEvents = 0;
   TEventStack::iterator p;
   for (p = m_events.begin(); p != m_events.end(); ++p) {
     if ((*p)->getType() == type) {

intern/ghost/intern/GHOST_EventManager.h

@@ -53,14 +53,14 @@ class GHOST_EventManager {
    * Returns the number of events currently on the stack.
    * \return The number of events on the stack.
    */
-  GHOST_TUns32 getNumEvents();
+  uint32_t getNumEvents();
 
   /**
    * Returns the number of events of a certain type currently on the stack.
    * \param type: The type of events to be counted.
    * \return The number of events on the stack of this type.
    */
-  GHOST_TUns32 getNumEvents(GHOST_TEventType type);
+  uint32_t getNumEvents(GHOST_TEventType type);
 
   /**
    * Pushes an event on the stack.

intern/ghost/intern/GHOST_EventNDOF.h

@@ -31,7 +31,7 @@ class GHOST_EventNDOFMotion : public GHOST_Event {
   GHOST_TEventNDOFMotionData m_axisData;
 
  public:
-  GHOST_EventNDOFMotion(GHOST_TUns64 time, GHOST_IWindow *window)
+  GHOST_EventNDOFMotion(uint64_t time, GHOST_IWindow *window)
       : GHOST_Event(time, GHOST_kEventNDOFMotion, window)
   {
     m_data = &m_axisData;
@@ -43,7 +43,7 @@ class GHOST_EventNDOFButton : public GHOST_Event {
   GHOST_TEventNDOFButtonData m_buttonData;
 
  public:
-  GHOST_EventNDOFButton(GHOST_TUns64 time, GHOST_IWindow *window)
+  GHOST_EventNDOFButton(uint64_t time, GHOST_IWindow *window)
       : GHOST_Event(time, GHOST_kEventNDOFButton, window)
   {
     m_data = &m_buttonData;

intern/ghost/intern/GHOST_EventPrinter.cpp

@@ -39,7 +39,7 @@ bool GHOST_EventPrinter::processEvent(GHOST_IEvent *event)
   if (event->getType() == GHOST_kEventWindowUpdate)
     return false;
 
-  std::cout << "GHOST_EventPrinter::processEvent, time: " << (GHOST_TInt32)event->getTime()
+  std::cout << "GHOST_EventPrinter::processEvent, time: " << (int32_t)event->getTime()
             << ", type: ";
   switch (event->getType()) {
     case GHOST_kEventUnknown:

intern/ghost/intern/GHOST_EventString.h

@@ -38,7 +38,7 @@ class GHOST_EventString : public GHOST_Event {
    * \param window: The generating window (or NULL if system event).
    * \param data_ptr: Pointer to the (un-formatted) data associated with the event.
    */
-  GHOST_EventString(GHOST_TUns64 msec,
+  GHOST_EventString(uint64_t msec,
                     GHOST_TEventType type,
                     GHOST_IWindow *window,
                     GHOST_TEventDataPtr data_ptr)

intern/ghost/intern/GHOST_EventTrackpad.h

@@ -39,13 +39,13 @@ class GHOST_EventTrackpad : public GHOST_Event {
    * \param x: The x-delta of the pan event.
    * \param y: The y-delta of the pan event.
    */
-  GHOST_EventTrackpad(GHOST_TUns64 msec,
+  GHOST_EventTrackpad(uint64_t msec,
                       GHOST_IWindow *window,
                       GHOST_TTrackpadEventSubTypes subtype,
-                      GHOST_TInt32 x,
-                      GHOST_TInt32 y,
-                      GHOST_TInt32 deltaX,
-                      GHOST_TInt32 deltaY,
+                      int32_t x,
+                      int32_t y,
+                      int32_t deltaX,
+                      int32_t deltaY,
                       bool isDirectionInverted)
       : GHOST_Event(msec, GHOST_kEventTrackpad, window)
   {

intern/ghost/intern/GHOST_EventWheel.h

@@ -39,7 +39,7 @@ class GHOST_EventWheel : public GHOST_Event {
    * \param window: The window of this event.
    * \param z: The displacement of the mouse wheel.
    */
-  GHOST_EventWheel(GHOST_TUns64 msec, GHOST_IWindow *window, GHOST_TInt32 z)
+  GHOST_EventWheel(uint64_t msec, GHOST_IWindow *window, int32_t z)
       : GHOST_Event(msec, GHOST_kEventWheel, window)
   {
     m_wheelEventData.z = z;

intern/ghost/intern/GHOST_ImeWin32.h

@@ -44,7 +44,7 @@ class GHOST_EventIME : public GHOST_Event {
    * \param type: The type of key event.
    * \param key: The key code of the key.
    */
-  GHOST_EventIME(GHOST_TUns64 msec, GHOST_TEventType type, GHOST_IWindow *window, void *customdata)
+  GHOST_EventIME(uint64_t msec, GHOST_TEventType type, GHOST_IWindow *window, void *customdata)
       : GHOST_Event(msec, type, window)
   {
     this->m_data = customdata;

intern/ghost/intern/GHOST_ModifierKeys.h

@@ -72,17 +72,17 @@ struct GHOST_ModifierKeys {
   bool equals(const GHOST_ModifierKeys &keys) const;
 
   /** Bitfield that stores the appropriate key state. */
-  GHOST_TUns8 m_LeftShift : 1;
+  uint8_t m_LeftShift : 1;
   /** Bitfield that stores the appropriate key state. */
-  GHOST_TUns8 m_RightShift : 1;
+  uint8_t m_RightShift : 1;
   /** Bitfield that stores the appropriate key state. */
-  GHOST_TUns8 m_LeftAlt : 1;
+  uint8_t m_LeftAlt : 1;
   /** Bitfield that stores the appropriate key state. */
-  GHOST_TUns8 m_RightAlt : 1;
+  uint8_t m_RightAlt : 1;
   /** Bitfield that stores the appropriate key state. */
-  GHOST_TUns8 m_LeftControl : 1;
+  uint8_t m_LeftControl : 1;
   /** Bitfield that stores the appropriate key state. */
-  GHOST_TUns8 m_RightControl : 1;
+  uint8_t m_RightControl : 1;
   /** Bitfield that stores the appropriate key state. */
-  GHOST_TUns8 m_OS : 1;
+  uint8_t m_OS : 1;
 };

intern/ghost/intern/GHOST_NDOFManager.cpp

@@ -279,14 +279,14 @@ bool GHOST_NDOFManager::setDevice(unsigned short vendor_id, unsigned short produ
   return m_deviceType != NDOF_UnknownDevice;
 }
 
-void GHOST_NDOFManager::updateTranslation(const int t[3], GHOST_TUns64 time)
+void GHOST_NDOFManager::updateTranslation(const int t[3], uint64_t time)
 {
   memcpy(m_translation, t, sizeof(m_translation));
   m_motionTime = time;
   m_motionEventPending = true;
 }
 
-void GHOST_NDOFManager::updateRotation(const int r[3], GHOST_TUns64 time)
+void GHOST_NDOFManager::updateRotation(const int r[3], uint64_t time)
 {
   memcpy(m_rotation, r, sizeof(m_rotation));
   m_motionTime = time;
@@ -295,7 +295,7 @@ void GHOST_NDOFManager::updateRotation(const int r[3], GHOST_TUns64 time)
 
 void GHOST_NDOFManager::sendButtonEvent(NDOF_ButtonT button,
                                         bool press,
-                                        GHOST_TUns64 time,
+                                        uint64_t time,
                                         GHOST_IWindow *window)
 {
   GHOST_ASSERT(button > NDOF_BUTTON_NONE && button < NDOF_BUTTON_LAST,
@@ -316,7 +316,7 @@ void GHOST_NDOFManager::sendButtonEvent(NDOF_ButtonT button,
 
 void GHOST_NDOFManager::sendKeyEvent(GHOST_TKey key,
                                      bool press,
-                                     GHOST_TUns64 time,
+                                     uint64_t time,
                                      GHOST_IWindow *window)
 {
   GHOST_TEventType type = press ? GHOST_kEventKeyDown : GHOST_kEventKeyUp;
@@ -329,7 +329,7 @@ void GHOST_NDOFManager::sendKeyEvent(GHOST_TKey key,
   m_system.pushEvent(event);
 }
 
-void GHOST_NDOFManager::updateButton(int button_number, bool press, GHOST_TUns64 time)
+void GHOST_NDOFManager::updateButton(int button_number, bool press, uint64_t time)
 {
   GHOST_IWindow *window = m_system.getWindowManager()->getActiveWindow();
 
@@ -371,7 +371,7 @@ void GHOST_NDOFManager::updateButton(int button_number, bool press, GHOST_TUns64
   }
 }
 
-void GHOST_NDOFManager::updateButtons(int button_bits, GHOST_TUns64 time)
+void GHOST_NDOFManager::updateButtons(int button_bits, uint64_t time)
 {
   button_bits &= m_buttonMask;  // discard any "garbage" bits
 

intern/ghost/intern/GHOST_NDOFManager.h

@@ -130,13 +130,13 @@ class GHOST_NDOFManager {
   //       rotations are + when CCW, - when CW
   // each platform is responsible for getting axis data into this form
   // these values should not be scaled (just shuffled or flipped)
-  void updateTranslation(const int t[3], GHOST_TUns64 time);
-  void updateRotation(const int r[3], GHOST_TUns64 time);
+  void updateTranslation(const int t[3], uint64_t time);
+  void updateRotation(const int r[3], uint64_t time);
 
   // the latest raw button data from the device
   // use HID button encoding (not NDOF_ButtonT)
-  void updateButton(int button_number, bool press, GHOST_TUns64 time);
-  void updateButtons(int button_bits, GHOST_TUns64 time);
+  void updateButton(int button_number, bool press, uint64_t time);
+  void updateButtons(int button_bits, uint64_t time);
   // NDOFButton events are sent immediately
 
   // processes and sends most recent raw data as an NDOFMotion event
@@ -147,8 +147,8 @@ class GHOST_NDOFManager {
   GHOST_System &m_system;
 
  private:
-  void sendButtonEvent(NDOF_ButtonT, bool press, GHOST_TUns64 time, GHOST_IWindow *);
-  void sendKeyEvent(GHOST_TKey, bool press, GHOST_TUns64 time, GHOST_IWindow *);
+  void sendButtonEvent(NDOF_ButtonT, bool press, uint64_t time, GHOST_IWindow *);
+  void sendKeyEvent(GHOST_TKey, bool press, uint64_t time, GHOST_IWindow *);
 
   NDOF_DeviceT m_deviceType;
   int m_buttonCount;
@@ -159,8 +159,8 @@ class GHOST_NDOFManager {
   int m_rotation[3];
   int m_buttons;  // bit field
 
-  GHOST_TUns64 m_motionTime;      // in milliseconds
-  GHOST_TUns64 m_prevMotionTime;  // time of most recent Motion event sent
+  uint64_t m_motionTime;      // in milliseconds
+  uint64_t m_prevMotionTime;  // time of most recent Motion event sent
 
   GHOST_TProgress m_motionState;
   bool m_motionEventPending;

intern/ghost/intern/GHOST_NDOFManagerCocoa.mm

@@ -195,7 +195,7 @@ static void DeviceEvent(uint32_t unused, uint32_t msg_type, void *msg_arg)
     // device state is broadcast to all clients; only react if sent to us
     if (s->client == clientID) {
       // TODO: is s->time compatible with GHOST timestamps? if so use that instead.
-      GHOST_TUns64 now = ghost_system->getMilliSeconds();
+      uint64_t now = ghost_system->getMilliSeconds();
 
       switch (s->command) {
         case kConnexionCmdHandleAxis: {

intern/ghost/intern/GHOST_NDOFManagerUnix.cpp

@@ -97,7 +97,7 @@ bool GHOST_NDOFManagerUnix::processEvents()
       switch (e.type) {
         case SPNAV_EVENT_MOTION: {
           /* convert to blender view coords */
-          GHOST_TUns64 now = m_system.getMilliSeconds();
+          uint64_t now = m_system.getMilliSeconds();
           const int t[3] = {(int)e.motion.x, (int)e.motion.y, (int)-e.motion.z};
           const int r[3] = {(int)-e.motion.rx, (int)-e.motion.ry, (int)e.motion.rz};
 
@@ -109,7 +109,7 @@ bool GHOST_NDOFManagerUnix::processEvents()
           break;
         }
         case SPNAV_EVENT_BUTTON:
-          GHOST_TUns64 now = m_system.getMilliSeconds();
+          uint64_t now = m_system.getMilliSeconds();
           updateButton(e.button.bnum, e.button.press, now);
           break;
       }
@@ -118,7 +118,7 @@ bool GHOST_NDOFManagerUnix::processEvents()
 
 #ifdef USE_FINISH_GLITCH_WORKAROUND
     if (motion_test_prev == true && motion_test == false) {
-      GHOST_TUns64 now = m_system.getMilliSeconds();
+      uint64_t now = m_system.getMilliSeconds();
       const int v[3] = {0, 0, 0};
 
       updateTranslation(v, now);

intern/ghost/intern/GHOST_Path-api.cpp

@@ -38,25 +38,25 @@ GHOST_TSuccess GHOST_DisposeSystemPaths(void)
   return GHOST_ISystemPaths::dispose();
 }
 
-const GHOST_TUns8 *GHOST_getSystemDir(int version, const char *versionstr)
+const char *GHOST_getSystemDir(int version, const char *versionstr)
 {
   GHOST_ISystemPaths *systemPaths = GHOST_ISystemPaths::get();
   return systemPaths ? systemPaths->getSystemDir(version, versionstr) : NULL;
 }
 
-const GHOST_TUns8 *GHOST_getUserDir(int version, const char *versionstr)
+const char *GHOST_getUserDir(int version, const char *versionstr)
 {
   GHOST_ISystemPaths *systemPaths = GHOST_ISystemPaths::get();
   return systemPaths ? systemPaths->getUserDir(version, versionstr) : NULL; /* shouldn't be NULL */
 }
 
-const GHOST_TUns8 *GHOST_getUserSpecialDir(GHOST_TUserSpecialDirTypes type)
+const char *GHOST_getUserSpecialDir(GHOST_TUserSpecialDirTypes type)
 {
   GHOST_ISystemPaths *systemPaths = GHOST_ISystemPaths::get();
   return systemPaths ? systemPaths->getUserSpecialDir(type) : NULL; /* shouldn't be NULL */
 }
 
-const GHOST_TUns8 *GHOST_getBinaryDir()
+const char *GHOST_getBinaryDir()
 {
   GHOST_ISystemPaths *systemPaths = GHOST_ISystemPaths::get();
   return systemPaths ? systemPaths->getBinaryDir() : NULL; /* shouldn't be NULL */

intern/ghost/intern/GHOST_Rect.cpp

@@ -23,7 +23,7 @@
 
 #include "GHOST_Rect.h"
 
-void GHOST_Rect::inset(GHOST_TInt32 i)
+void GHOST_Rect::inset(int32_t i)
 {
   if (i > 0) {
     // Grow the rectangle
@@ -34,7 +34,7 @@ void GHOST_Rect::inset(GHOST_TInt32 i)
   }
   else if (i < 0) {
     // Shrink the rectangle, check for insets larger than half the size
-    GHOST_TInt32 i2 = i * 2;
+    int32_t i2 = i * 2;
     if (getWidth() > i2) {
       m_l += i;
       m_r -= i;
@@ -82,9 +82,9 @@ GHOST_TVisibility GHOST_Rect::getVisibility(GHOST_Rect &r) const
   return v;
 }
 
-void GHOST_Rect::setCenter(GHOST_TInt32 cx, GHOST_TInt32 cy)
+void GHOST_Rect::setCenter(int32_t cx, int32_t cy)
 {
-  GHOST_TInt32 offset = cx - (m_l + (m_r - m_l) / 2);
+  int32_t offset = cx - (m_l + (m_r - m_l) / 2);
   m_l += offset;
   m_r += offset;
   offset = cy - (m_t + (m_b - m_t) / 2);
@@ -92,7 +92,7 @@ void GHOST_Rect::setCenter(GHOST_TInt32 cx, GHOST_TInt32 cy)
   m_b += offset;
 }
 
-void GHOST_Rect::setCenter(GHOST_TInt32 cx, GHOST_TInt32 cy, GHOST_TInt32 w, GHOST_TInt32 h)
+void GHOST_Rect::setCenter(int32_t cx, int32_t cy, int32_t w, int32_t h)
 {
   long w_2, h_2;
 

intern/ghost/intern/GHOST_System.cpp

@@ -56,19 +56,19 @@ GHOST_System::~GHOST_System()
   exit();
 }
 
-GHOST_TUns64 GHOST_System::getMilliSeconds() const
+uint64_t GHOST_System::getMilliSeconds() const
 {
   return std::chrono::duration_cast<std::chrono::milliseconds>(
              std::chrono::steady_clock::now().time_since_epoch())
       .count();
 }
 
-GHOST_ITimerTask *GHOST_System::installTimer(GHOST_TUns64 delay,
-                                             GHOST_TUns64 interval,
+GHOST_ITimerTask *GHOST_System::installTimer(uint64_t delay,
+                                             uint64_t interval,
                                              GHOST_TimerProcPtr timerProc,
                                              GHOST_TUserDataPtr userData)
 {
-  GHOST_TUns64 millis = getMilliSeconds();
+  uint64_t millis = getMilliSeconds();
   GHOST_TimerTask *timer = new GHOST_TimerTask(millis + delay, interval, timerProc, userData);
   if (timer) {
     if (m_timerManager->addTimer(timer) == GHOST_kSuccess) {

intern/ghost/intern/GHOST_System.h

@@ -75,7 +75,7 @@ class GHOST_System : public GHOST_ISystem {
    * Based on ANSI clock() routine.
    * \return The number of milliseconds.
    */
-  virtual GHOST_TUns64 getMilliSeconds() const;
+  virtual uint64_t getMilliSeconds() const;
 
   /**
    * Installs a timer.
@@ -89,8 +89,8 @@ class GHOST_System : public GHOST_ISystem {
    * \param userData: Placeholder for user data.
    * \return A timer task (0 if timer task installation failed).
    */
-  GHOST_ITimerTask *installTimer(GHOST_TUns64 delay,
-                                 GHOST_TUns64 interval,
+  GHOST_ITimerTask *installTimer(uint64_t delay,
+                                 uint64_t interval,
                                  GHOST_TimerProcPtr timerProc,
                                  GHOST_TUserDataPtr userData = NULL);
 
@@ -210,8 +210,8 @@ class GHOST_System : public GHOST_ISystem {
   /**
    * Inherited from GHOST_ISystem but left pure virtual
    * <pre>
-   * GHOST_TSuccess getCursorPosition(GHOST_TInt32& x, GHOST_TInt32& y) const = 0;
-   * GHOST_TSuccess setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y)
+   * GHOST_TSuccess getCursorPosition(int32_t& x, int32_t& y) const = 0;
+   * GHOST_TSuccess setCursorPosition(int32_t x, int32_t y)
    * </pre>
    */
 
@@ -308,14 +308,14 @@ class GHOST_System : public GHOST_ISystem {
    * \return Returns the clipboard data
    *
    */
-  virtual GHOST_TUns8 *getClipboard(bool selection) const = 0;
+  virtual char *getClipboard(bool selection) const = 0;
 
   /**
    * Put data to the Clipboard
    * \param buffer: The buffer to copy to the clipboard.
    * \param selection: The clipboard to copy too only used on X11.
    */
-  virtual void putClipboard(GHOST_TInt8 *buffer, bool selection) const = 0;
+  virtual void putClipboard(const char *buffer, bool selection) const = 0;
 
   /**
    * Show a system message box

intern/ghost/intern/GHOST_SystemCocoa.h

@@ -59,7 +59,7 @@ class GHOST_SystemCocoa : public GHOST_System {
    * Based on ANSI clock() routine.
    * \return The number of milliseconds.
    */
-  GHOST_TUns64 getMilliSeconds() const;
+  uint64_t getMilliSeconds() const;
 
   /***************************************************************************************
    * Display/window management functionality
@@ -69,18 +69,18 @@ class GHOST_SystemCocoa : public GHOST_System {
    * Returns the number of displays on this system.
    * \return The number of displays.
    */
-  GHOST_TUns8 getNumDisplays() const;
+  uint8_t getNumDisplays() const;
 
   /**
    * Returns the dimensions of the main display on this system.
    * \return The dimension of the main display.
    */
-  void getMainDisplayDimensions(GHOST_TUns32 &width, GHOST_TUns32 &height) const;
+  void getMainDisplayDimensions(uint32_t &width, uint32_t &height) const;
 
   /** Returns the combine dimensions of all monitors.
    * \return The dimension of the workspace.
    */
-  void getAllDisplayDimensions(GHOST_TUns32 &width, GHOST_TUns32 &height) const;
+  void getAllDisplayDimensions(uint32_t &width, uint32_t &height) const;
 
   /**
    * Create a new window.
@@ -100,10 +100,10 @@ class GHOST_SystemCocoa : public GHOST_System {
    * \return The new window (or 0 if creation failed).
    */
   GHOST_IWindow *createWindow(const char *title,
-                              GHOST_TInt32 left,
-                              GHOST_TInt32 top,
-                              GHOST_TUns32 width,
-                              GHOST_TUns32 height,
+                              int32_t left,
+                              int32_t top,
+                              uint32_t width,
+                              uint32_t height,
                               GHOST_TWindowState state,
                               GHOST_TDrawingContextType type,
                               GHOST_GLSettings glSettings,
@@ -137,7 +137,7 @@ class GHOST_SystemCocoa : public GHOST_System {
   bool processEvents(bool waitForEvent);
 
   /**
-   * Handle User request to quit, from Menu bar Quit, and Cmd+Q
+   * Handle User request to quit, from Menu bar Quit, and Command+Q
    * Display alert panel if changes performed since last save
    */
   void handleQuitRequest();
@@ -175,7 +175,7 @@ class GHOST_SystemCocoa : public GHOST_System {
    * \param y: The y-coordinate of the cursor.
    * \return Indication of success.
    */
-  GHOST_TSuccess getCursorPosition(GHOST_TInt32 &x, GHOST_TInt32 &y) const;
+  GHOST_TSuccess getCursorPosition(int32_t &x, int32_t &y) const;
 
   /**
    * Updates the location of the cursor (location in screen coordinates).
@@ -183,7 +183,7 @@ class GHOST_SystemCocoa : public GHOST_System {
    * \param y: The y-coordinate of the cursor.
    * \return Indication of success.
    */
-  GHOST_TSuccess setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y);
+  GHOST_TSuccess setCursorPosition(int32_t x, int32_t y);
 
   /***************************************************************************************
    * Access to mouse button and keyboard states.
@@ -208,14 +208,14 @@ class GHOST_SystemCocoa : public GHOST_System {
    * \param selection: Indicate which buffer to return.
    * \return Returns the selected buffer
    */
-  GHOST_TUns8 *getClipboard(bool selection) const;
+  char *getClipboard(bool selection) const;
 
   /**
    * Puts buffer to system clipboard
    * \param buffer: The buffer to be copied.
    * \param selection: Indicates which buffer to copy too, only used on X11.
    */
-  void putClipboard(GHOST_TInt8 *buffer, bool selection) const;
+  void putClipboard(const char *buffer, bool selection) const;
 
   /**
    * Handles a window event. Called by GHOST_WindowCocoa window delegate
@@ -288,10 +288,10 @@ class GHOST_SystemCocoa : public GHOST_System {
    * \param y: The y-coordinate of the cursor.
    * \return Indication of success.
    */
-  GHOST_TSuccess setMouseCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y);
+  GHOST_TSuccess setMouseCursorPosition(int32_t x, int32_t y);
 
   /** Start time at initialization. */
-  GHOST_TUns64 m_start_time;
+  uint64_t m_start_time;
 
   /** Event has been processed directly by Cocoa (or NDOF manager)
    * and has sent a ghost event to be dispatched */
@@ -302,14 +302,14 @@ class GHOST_SystemCocoa : public GHOST_System {
   bool m_needDelayedApplicationBecomeActiveEventProcessing;
 
   /** State of the modifiers. */
-  GHOST_TUns32 m_modifierMask;
+  uint32_t m_modifierMask;
 
   /** Ignores window size messages (when window is dragged). */
   bool m_ignoreWindowSizedMessages;
 
   /** Temporarily ignore momentum scroll events */
   bool m_ignoreMomentumScroll;
-  /** Is the scroll wheel event generated by a multitouch trackpad or mouse? */
+  /** Is the scroll wheel event generated by a multi-touch track-pad or mouse? */
   bool m_multiTouchScroll;
   /** To prevent multiple warp, we store the time of the last warp event
    * and ignore mouse moved events generated before that. */

intern/ghost/intern/GHOST_SystemCocoa.mm

@@ -520,7 +520,7 @@ GHOST_SystemCocoa::GHOST_SystemCocoa()
   sysctl(mib, 2, &boottime, &len, NULL, 0);
   m_start_time = ((boottime.tv_sec * 1000) + (boottime.tv_usec / 1000));
 
-  // Detect multitouch trackpad
+  /* Detect multi-touch track-pad. */
   mib[0] = CTL_HW;
   mib[1] = HW_MODEL;
   sysctl(mib, 2, NULL, &len, NULL, 0);
@@ -655,7 +655,7 @@ GHOST_TSuccess GHOST_SystemCocoa::init()
 
 #pragma mark window management
 
-GHOST_TUns64 GHOST_SystemCocoa::getMilliSeconds() const
+uint64_t GHOST_SystemCocoa::getMilliSeconds() const
 {
   // Cocoa equivalent exists in 10.6 ([[NSProcessInfo processInfo] systemUptime])
   struct timeval currentTime;
@@ -667,7 +667,7 @@ GHOST_TUns64 GHOST_SystemCocoa::getMilliSeconds() const
   return ((currentTime.tv_sec * 1000) + (currentTime.tv_usec / 1000) - m_start_time);
 }
 
-GHOST_TUns8 GHOST_SystemCocoa::getNumDisplays() const
+uint8_t GHOST_SystemCocoa::getNumDisplays() const
 {
   // Note that OS X supports monitor hot plug
   // We do not support multiple monitors at the moment
@@ -676,7 +676,7 @@ GHOST_TUns8 GHOST_SystemCocoa::getNumDisplays() const
   }
 }
 
-void GHOST_SystemCocoa::getMainDisplayDimensions(GHOST_TUns32 &width, GHOST_TUns32 &height) const
+void GHOST_SystemCocoa::getMainDisplayDimensions(uint32_t &width, uint32_t &height) const
 {
   @autoreleasepool {
     // Get visible frame, that is frame excluding dock and top menu bar
@@ -693,17 +693,17 @@ void GHOST_SystemCocoa::getMainDisplayDimensions(GHOST_TUns32 &width, GHOST_TUns
   }
 }
 
-void GHOST_SystemCocoa::getAllDisplayDimensions(GHOST_TUns32 &width, GHOST_TUns32 &height) const
+void GHOST_SystemCocoa::getAllDisplayDimensions(uint32_t &width, uint32_t &height) const
 {
   /* TODO! */
   getMainDisplayDimensions(width, height);
 }
 
 GHOST_IWindow *GHOST_SystemCocoa::createWindow(const char *title,
-                                               GHOST_TInt32 left,
-                                               GHOST_TInt32 top,
-                                               GHOST_TUns32 width,
-                                               GHOST_TUns32 height,
+                                               int32_t left,
+                                               int32_t top,
+                                               uint32_t width,
+                                               uint32_t height,
                                                GHOST_TWindowState state,
                                                GHOST_TDrawingContextType type,
                                                GHOST_GLSettings glSettings,
@@ -721,7 +721,7 @@ GHOST_IWindow *GHOST_SystemCocoa::createWindow(const char *title,
                       styleMask:(NSWindowStyleMaskTitled | NSWindowStyleMaskClosable |
                                  NSWindowStyleMaskMiniaturizable)];
 
-    GHOST_TInt32 bottom = (contentRect.size.height - 1) - height - top;
+    int32_t bottom = (contentRect.size.height - 1) - height - top;
 
     // Ensures window top left is inside this available rect
     left = left > contentRect.origin.x ? left : contentRect.origin.x;
@@ -791,20 +791,20 @@ GHOST_TSuccess GHOST_SystemCocoa::disposeContext(GHOST_IContext *context)
 /**
  * \note : returns coordinates in Cocoa screen coordinates
  */
-GHOST_TSuccess GHOST_SystemCocoa::getCursorPosition(GHOST_TInt32 &x, GHOST_TInt32 &y) const
+GHOST_TSuccess GHOST_SystemCocoa::getCursorPosition(int32_t &x, int32_t &y) const
 {
   NSPoint mouseLoc = [NSEvent mouseLocation];
 
   // Returns the mouse location in screen coordinates
-  x = (GHOST_TInt32)mouseLoc.x;
-  y = (GHOST_TInt32)mouseLoc.y;
+  x = (int32_t)mouseLoc.x;
+  y = (int32_t)mouseLoc.y;
   return GHOST_kSuccess;
 }
 
 /**
  * \note : expect Cocoa screen coordinates
  */
-GHOST_TSuccess GHOST_SystemCocoa::setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y)
+GHOST_TSuccess GHOST_SystemCocoa::setCursorPosition(int32_t x, int32_t y)
 {
   GHOST_WindowCocoa *window = (GHOST_WindowCocoa *)m_windowManager->getActiveWindow();
   if (!window)
@@ -824,7 +824,7 @@ GHOST_TSuccess GHOST_SystemCocoa::setCursorPosition(GHOST_TInt32 x, GHOST_TInt32
   return GHOST_kSuccess;
 }
 
-GHOST_TSuccess GHOST_SystemCocoa::setMouseCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y)
+GHOST_TSuccess GHOST_SystemCocoa::setMouseCursorPosition(int32_t x, int32_t y)
 {
   float xf = (float)x, yf = (float)y;
   GHOST_WindowCocoa *window = (GHOST_WindowCocoa *)m_windowManager->getActiveWindow();
@@ -897,7 +897,7 @@ bool GHOST_SystemCocoa::processEvents(bool waitForEvent)
     GHOST_TimerManager* timerMgr = getTimerManager();
 
     if (waitForEvent) {
-      GHOST_TUns64 next = timerMgr->nextFireTime();
+      uint64_t next = timerMgr->nextFireTime();
       double timeOut;
 
       if (next == GHOST_kFireTimeNever) {
@@ -1132,7 +1132,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleDraggingEvent(GHOST_TEventType eventType
       break;
 
     case GHOST_kEventDraggingDropDone: {
-      GHOST_TUns8 *temp_buff;
+      uint8_t *temp_buff;
       GHOST_TStringArray *strArray;
       NSArray *droppedArray;
       size_t pastedTextSize;
@@ -1157,13 +1157,13 @@ GHOST_TSuccess GHOST_SystemCocoa::handleDraggingEvent(GHOST_TEventType eventType
             return GHOST_kFailure;
           }
 
-          strArray->strings = (GHOST_TUns8 **)malloc(strArray->count * sizeof(GHOST_TUns8 *));
+          strArray->strings = (uint8_t **)malloc(strArray->count * sizeof(uint8_t *));
 
           for (i = 0; i < strArray->count; i++) {
             droppedStr = [droppedArray objectAtIndex:i];
 
             pastedTextSize = [droppedStr lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
-            temp_buff = (GHOST_TUns8 *)malloc(pastedTextSize + 1);
+            temp_buff = (uint8_t *)malloc(pastedTextSize + 1);
 
             if (!temp_buff) {
               strArray->count = i;
@@ -1185,7 +1185,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleDraggingEvent(GHOST_TEventType eventType
           droppedStr = (NSString *)data;
           pastedTextSize = [droppedStr lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
 
-          temp_buff = (GHOST_TUns8 *)malloc(pastedTextSize + 1);
+          temp_buff = (uint8_t *)malloc(pastedTextSize + 1);
 
           if (temp_buff == NULL) {
             return GHOST_kFailure;
@@ -1204,9 +1204,9 @@ GHOST_TSuccess GHOST_SystemCocoa::handleDraggingEvent(GHOST_TEventType eventType
           NSImage *droppedImg = (NSImage *)data;
           NSSize imgSize = [droppedImg size];
           ImBuf *ibuf = NULL;
-          GHOST_TUns8 *rasterRGB = NULL;
-          GHOST_TUns8 *rasterRGBA = NULL;
-          GHOST_TUns8 *toIBuf = NULL;
+          uint8_t *rasterRGB = NULL;
+          uint8_t *rasterRGBA = NULL;
+          uint8_t *toIBuf = NULL;
           int x, y, to_i, from_i;
           NSBitmapImageRep *blBitmapFormatImageRGB, *blBitmapFormatImageRGBA, *bitmapImage = nil;
           NSEnumerator *enumerator;
@@ -1232,8 +1232,8 @@ GHOST_TSuccess GHOST_SystemCocoa::handleDraggingEvent(GHOST_TEventType eventType
           if (([bitmapImage bitsPerPixel] == 32) && (([bitmapImage bitmapFormat] & 0x5) == 0) &&
               ![bitmapImage isPlanar]) {
             /* Try a fast copy if the image is a meshed RGBA 32bit bitmap. */
-            toIBuf = (GHOST_TUns8 *)ibuf->rect;
-            rasterRGB = (GHOST_TUns8 *)[bitmapImage bitmapData];
+            toIBuf = (uint8_t *)ibuf->rect;
+            rasterRGB = (uint8_t *)[bitmapImage bitmapData];
             for (y = 0; y < imgSize.height; y++) {
               to_i = (imgSize.height - y - 1) * imgSize.width;
               from_i = y * imgSize.width;
@@ -1270,7 +1270,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleDraggingEvent(GHOST_TEventType eventType
             [bitmapImage draw];
             [NSGraphicsContext restoreGraphicsState];
 
-            rasterRGB = (GHOST_TUns8 *)[blBitmapFormatImageRGB bitmapData];
+            rasterRGB = (uint8_t *)[blBitmapFormatImageRGB bitmapData];
             if (rasterRGB == NULL) {
               [bitmapImage release];
               [blBitmapFormatImageRGB release];
@@ -1299,7 +1299,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleDraggingEvent(GHOST_TEventType eventType
             [bitmapImage draw];
             [NSGraphicsContext restoreGraphicsState];
 
-            rasterRGBA = (GHOST_TUns8 *)[blBitmapFormatImageRGBA bitmapData];
+            rasterRGBA = (uint8_t *)[blBitmapFormatImageRGBA bitmapData];
             if (rasterRGBA == NULL) {
               [bitmapImage release];
               [blBitmapFormatImageRGB release];
@@ -1309,7 +1309,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleDraggingEvent(GHOST_TEventType eventType
             }
 
             /* Copy the image to ibuf, flipping it vertically. */
-            toIBuf = (GHOST_TUns8 *)ibuf->rect;
+            toIBuf = (uint8_t *)ibuf->rect;
             for (y = 0; y < imgSize.height; y++) {
               for (x = 0; x < imgSize.width; x++) {
                 to_i = (imgSize.height - y - 1) * imgSize.width + x;
@@ -1563,7 +1563,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr)
       switch (grab_mode) {
         case GHOST_kGrabHide:  // Cursor hidden grab operation : no cursor move
         {
-          GHOST_TInt32 x_warp, y_warp, x_accum, y_accum, x, y;
+          int32_t x_warp, y_warp, x_accum, y_accum, x, y;
 
           window->getCursorGrabInitPos(x_warp, y_warp);
           window->screenToClientIntern(x_warp, y_warp, x_warp, y_warp);
@@ -1593,8 +1593,8 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr)
           }
 
           NSPoint mousePos = [event locationInWindow];
-          GHOST_TInt32 x_mouse = mousePos.x;
-          GHOST_TInt32 y_mouse = mousePos.y;
+          int32_t x_mouse = mousePos.x;
+          int32_t y_mouse = mousePos.y;
           GHOST_Rect bounds, windowBounds, correctedBounds;
 
           /* fallback to window bounds */
@@ -1610,19 +1610,19 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr)
           correctedBounds.m_t = (windowBounds.m_b - windowBounds.m_t) - correctedBounds.m_t;
 
           // Get accumulation from previous mouse warps
-          GHOST_TInt32 x_accum, y_accum;
+          int32_t x_accum, y_accum;
           window->getCursorGrabAccum(x_accum, y_accum);
 
           // Warp mouse cursor if needed
-          GHOST_TInt32 warped_x_mouse = x_mouse;
-          GHOST_TInt32 warped_y_mouse = y_mouse;
+          int32_t warped_x_mouse = x_mouse;
+          int32_t warped_y_mouse = y_mouse;
 
           correctedBounds.wrapPoint(
               warped_x_mouse, warped_y_mouse, 4, window->getCursorGrabAxis());
 
           // Set new cursor position
           if (x_mouse != warped_x_mouse || y_mouse != warped_y_mouse) {
-            GHOST_TInt32 warped_x, warped_y;
+            int32_t warped_x, warped_y;
             window->clientToScreenIntern(warped_x_mouse, warped_y_mouse, warped_x, warped_y);
             setMouseCursorPosition(warped_x, warped_y); /* wrap */
             window->setCursorGrabAccum(x_accum + (x_mouse - warped_x_mouse),
@@ -1633,7 +1633,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr)
           }
 
           // Generate event
-          GHOST_TInt32 x, y;
+          int32_t x, y;
           window->clientToScreenIntern(x_mouse + x_accum, y_mouse + y_accum, x, y);
           pushEvent(new GHOST_EventCursor([event timestamp] * 1000,
                                           GHOST_kEventCursorMove,
@@ -1646,7 +1646,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr)
         default: {
           // Normal cursor operation: send mouse position in window
           NSPoint mousePos = [event locationInWindow];
-          GHOST_TInt32 x, y;
+          int32_t x, y;
 
           window->clientToScreenIntern(mousePos.x, mousePos.y, x, y);
           pushEvent(new GHOST_EventCursor([event timestamp] * 1000,
@@ -1690,7 +1690,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr)
       /* Standard scroll-wheel case, if no swiping happened,
        * and no momentum (kinetic scroll) works. */
       if (!m_multiTouchScroll && momentumPhase == NSEventPhaseNone) {
-        GHOST_TInt32 delta;
+        int32_t delta;
 
         double deltaF = [event deltaY];
 
@@ -1704,7 +1704,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr)
       }
       else {
         NSPoint mousePos = [event locationInWindow];
-        GHOST_TInt32 x, y;
+        int32_t x, y;
         double dx;
         double dy;
 
@@ -1734,7 +1734,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr)
 
     case NSEventTypeMagnify: {
       NSPoint mousePos = [event locationInWindow];
-      GHOST_TInt32 x, y;
+      int32_t x, y;
       window->clientToScreenIntern(mousePos.x, mousePos.y, x, y);
       pushEvent(new GHOST_EventTrackpad([event timestamp] * 1000,
                                         window,
@@ -1748,7 +1748,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr)
 
     case NSEventTypeSmartMagnify: {
       NSPoint mousePos = [event locationInWindow];
-      GHOST_TInt32 x, y;
+      int32_t x, y;
       window->clientToScreenIntern(mousePos.x, mousePos.y, x, y);
       pushEvent(new GHOST_EventTrackpad(
           [event timestamp] * 1000, window, GHOST_kTrackpadEventSmartMagnify, x, y, 0, 0, false));
@@ -1756,7 +1756,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr)
 
     case NSEventTypeRotate: {
       NSPoint mousePos = [event locationInWindow];
-      GHOST_TInt32 x, y;
+      int32_t x, y;
       window->clientToScreenIntern(mousePos.x, mousePos.y, x, y);
       pushEvent(new GHOST_EventTrackpad([event timestamp] * 1000,
                                         window,
@@ -1933,9 +1933,9 @@ GHOST_TSuccess GHOST_SystemCocoa::handleKeyEvent(void *eventPtr)
 
 #pragma mark Clipboard get/set
 
-GHOST_TUns8 *GHOST_SystemCocoa::getClipboard(bool selection) const
+char *GHOST_SystemCocoa::getClipboard(bool selection) const
 {
-  GHOST_TUns8 *temp_buff;
+  char *temp_buff;
   size_t pastedTextSize;
 
   @autoreleasepool {
@@ -1950,14 +1950,13 @@ GHOST_TUns8 *GHOST_SystemCocoa::getClipboard(bool selection) const
 
     pastedTextSize = [textPasted lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
 
-    temp_buff = (GHOST_TUns8 *)malloc(pastedTextSize + 1);
+    temp_buff = (char *)malloc(pastedTextSize + 1);
 
     if (temp_buff == NULL) {
       return NULL;
     }
 
-    strncpy(
-        (char *)temp_buff, [textPasted cStringUsingEncoding:NSUTF8StringEncoding], pastedTextSize);
+    strncpy(temp_buff, [textPasted cStringUsingEncoding:NSUTF8StringEncoding], pastedTextSize);
 
     temp_buff[pastedTextSize] = '\0';
 
@@ -1970,7 +1969,7 @@ GHOST_TUns8 *GHOST_SystemCocoa::getClipboard(bool selection) const
   }
 }
 
-void GHOST_SystemCocoa::putClipboard(GHOST_TInt8 *buffer, bool selection) const
+void GHOST_SystemCocoa::putClipboard(const char *buffer, bool selection) const
 {
   if (selection)
     return;  // for copying the selection, used on X11

intern/ghost/intern/GHOST_SystemNULL.h

@@ -52,33 +52,33 @@ class GHOST_SystemNULL : public GHOST_System {
   {
     return GHOST_kSuccess;
   }
-  GHOST_TUns8 *getClipboard(bool selection) const
+  char *getClipboard(bool selection) const
   {
     return NULL;
   }
-  void putClipboard(GHOST_TInt8 *buffer, bool selection) const
+  void putClipboard(const char *buffer, bool selection) const
   { /* nop */
   }
-  GHOST_TUns64 getMilliSeconds() const
+  uint64_t getMilliSeconds() const
   {
     return 0;
   }
-  GHOST_TUns8 getNumDisplays() const
+  uint8_t getNumDisplays() const
   {
-    return GHOST_TUns8(1);
+    return uint8_t(1);
   }
-  GHOST_TSuccess getCursorPosition(GHOST_TInt32 &x, GHOST_TInt32 &y) const
+  GHOST_TSuccess getCursorPosition(int32_t &x, int32_t &y) const
   {
     return GHOST_kFailure;
   }
-  GHOST_TSuccess setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y)
+  GHOST_TSuccess setCursorPosition(int32_t x, int32_t y)
   {
     return GHOST_kFailure;
   }
-  void getMainDisplayDimensions(GHOST_TUns32 &width, GHOST_TUns32 &height) const
+  void getMainDisplayDimensions(uint32_t &width, uint32_t &height) const
   { /* nop */
   }
-  void getAllDisplayDimensions(GHOST_TUns32 &width, GHOST_TUns32 &height) const
+  void getAllDisplayDimensions(uint32_t &width, uint32_t &height) const
   { /* nop */
   }
   GHOST_IContext *createOffscreenContext(GHOST_GLSettings glSettings)
@@ -106,10 +106,10 @@ class GHOST_SystemNULL : public GHOST_System {
   }
 
   GHOST_IWindow *createWindow(const char *title,
-                              GHOST_TInt32 left,
-                              GHOST_TInt32 top,
-                              GHOST_TUns32 width,
-                              GHOST_TUns32 height,
+                              int32_t left,
+                              int32_t top,
+                              uint32_t width,
+                              uint32_t height,
                               GHOST_TWindowState state,
                               GHOST_TDrawingContextType type,
                               GHOST_GLSettings glSettings,

intern/ghost/intern/GHOST_SystemPaths.h

@@ -49,20 +49,20 @@ class GHOST_SystemPaths : public GHOST_ISystemPaths {
    * "unpack and run" path, then look for properly installed path, including versioning.
    * \return Unsigned char string pointing to system dir (eg /usr/share/blender/).
    */
-  virtual const GHOST_TUns8 *getSystemDir(int version, const char *versionstr) const = 0;
+  virtual const char *getSystemDir(int version, const char *versionstr) const = 0;
 
   /**
    * Determine the base dir in which user configuration is stored, including versioning.
    * If needed, it will create the base directory.
    * \return Unsigned char string pointing to user dir (eg ~/.blender/).
    */
-  virtual const GHOST_TUns8 *getUserDir(int version, const char *versionstr) const = 0;
+  virtual const char *getUserDir(int version, const char *versionstr) const = 0;
 
   /**
    * Determine the directory of the current binary
    * \return Unsigned char string pointing to the binary dir
    */
-  virtual const GHOST_TUns8 *getBinaryDir() const = 0;
+  virtual const char *getBinaryDir() const = 0;
 
   /**
    * Add the file to the operating system most recently used files

intern/ghost/intern/GHOST_SystemPathsCocoa.h

@@ -46,26 +46,26 @@ class GHOST_SystemPathsCocoa : public GHOST_SystemPaths {
    * "unpack and run" path, then look for properly installed path, including versioning.
    * \return Unsigned char string pointing to system dir (eg /usr/share/blender/).
    */
-  const GHOST_TUns8 *getSystemDir(int version, const char *versionstr) const;
+  const char *getSystemDir(int version, const char *versionstr) const;
 
   /**
    * Determine the base dir in which user configuration is stored, including versioning.
    * If needed, it will create the base directory.
    * \return Unsigned char string pointing to user dir (eg ~/.blender/).
    */
-  const GHOST_TUns8 *getUserDir(int version, const char *versionstr) const;
+  const char *getUserDir(int version, const char *versionstr) const;
 
   /**
    * Determine a special ("well known") and easy to reach user directory.
    * \return Unsigned char string pointing to user dir (eg `~/Documents/`).
    */
-  const GHOST_TUns8 *getUserSpecialDir(GHOST_TUserSpecialDirTypes type) const;
+  const char *getUserSpecialDir(GHOST_TUserSpecialDirTypes type) const;
 
   /**
    * Determine the directory of the current binary
    * \return Unsigned char string pointing to the binary dir
    */
-  const GHOST_TUns8 *getBinaryDir() const;
+  const char *getBinaryDir() const;
 
   /**
    * Add the file to the operating system most recently used files

intern/ghost/intern/GHOST_SystemPathsCocoa.mm

@@ -36,7 +36,7 @@ GHOST_SystemPathsCocoa::~GHOST_SystemPathsCocoa()
 
 #pragma mark Base directories retrieval
 
-const GHOST_TUns8 *GHOST_SystemPathsCocoa::getSystemDir(int, const char *versionstr) const
+const char *GHOST_SystemPathsCocoa::getSystemDir(int, const char *versionstr) const
 {
   static char tempPath[512] = "";
   NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
@@ -60,10 +60,10 @@ const GHOST_TUns8 *GHOST_SystemPathsCocoa::getSystemDir(int, const char *version
            versionstr);
 
   [pool drain];
-  return (GHOST_TUns8 *)tempPath;
+  return tempPath;
 }
 
-const GHOST_TUns8 *GHOST_SystemPathsCocoa::getUserDir(int, const char *versionstr) const
+const char *GHOST_SystemPathsCocoa::getUserDir(int, const char *versionstr) const
 {
   static char tempPath[512] = "";
   NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
@@ -87,10 +87,10 @@ const GHOST_TUns8 *GHOST_SystemPathsCocoa::getUserDir(int, const char *versionst
            versionstr);
 
   [pool drain];
-  return (GHOST_TUns8 *)tempPath;
+  return tempPath;
 }
 
-const GHOST_TUns8 *GHOST_SystemPathsCocoa::getUserSpecialDir(GHOST_TUserSpecialDirTypes type) const
+const char *GHOST_SystemPathsCocoa::getUserSpecialDir(GHOST_TUserSpecialDirTypes type) const
 {
   static char tempPath[512] = "";
   NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
@@ -138,12 +138,12 @@ const GHOST_TUns8 *GHOST_SystemPathsCocoa::getUserSpecialDir(GHOST_TUserSpecialD
       (char *)tempPath, [basePath cStringUsingEncoding:NSASCIIStringEncoding], sizeof(tempPath));
 
   [pool drain];
-  return (GHOST_TUns8 *)tempPath;
+  return tempPath;
 }
 
-const GHOST_TUns8 *GHOST_SystemPathsCocoa::getBinaryDir() const
+const char *GHOST_SystemPathsCocoa::getBinaryDir() const
 {
-  static GHOST_TUns8 tempPath[512] = "";
+  static char tempPath[512] = "";
   NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
   NSString *basePath;
 

intern/ghost/intern/GHOST_SystemPathsUnix.cpp

@@ -55,18 +55,18 @@ GHOST_SystemPathsUnix::~GHOST_SystemPathsUnix()
 {
 }
 
-const GHOST_TUns8 *GHOST_SystemPathsUnix::getSystemDir(int, const char *versionstr) const
+const char *GHOST_SystemPathsUnix::getSystemDir(int, const char *versionstr) const
 {
   /* no prefix assumes a portable build which only uses bundled scripts */
   if (static_path) {
     static string system_path = string(static_path) + "/blender/" + versionstr;
-    return (GHOST_TUns8 *)system_path.c_str();
+    return system_path.c_str();
   }
 
   return NULL;
 }
 
-const GHOST_TUns8 *GHOST_SystemPathsUnix::getUserDir(int version, const char *versionstr) const
+const char *GHOST_SystemPathsUnix::getUserDir(int version, const char *versionstr) const
 {
   static string user_path = "";
   static int last_version = 0;
@@ -86,7 +86,7 @@ const GHOST_TUns8 *GHOST_SystemPathsUnix::getUserDir(int version, const char *ve
         return NULL;
       }
     }
-    return (GHOST_TUns8 *)user_path.c_str();
+    return user_path.c_str();
   }
   else {
     if (user_path.empty() || last_version != version) {
@@ -107,11 +107,11 @@ const GHOST_TUns8 *GHOST_SystemPathsUnix::getUserDir(int version, const char *ve
       }
     }
 
-    return (const GHOST_TUns8 *)user_path.c_str();
+    return user_path.c_str();
   }
 }
 
-const GHOST_TUns8 *GHOST_SystemPathsUnix::getUserSpecialDir(GHOST_TUserSpecialDirTypes type) const
+const char *GHOST_SystemPathsUnix::getUserSpecialDir(GHOST_TUserSpecialDirTypes type) const
 {
   const char *type_str;
 
@@ -164,10 +164,10 @@ const GHOST_TUns8 *GHOST_SystemPathsUnix::getUserSpecialDir(GHOST_TUserSpecialDi
   }
 
   path = path_stream.str();
-  return path[0] ? (const GHOST_TUns8 *)path.c_str() : NULL;
+  return path[0] ? path.c_str() : NULL;
 }
 
-const GHOST_TUns8 *GHOST_SystemPathsUnix::getBinaryDir() const
+const char *GHOST_SystemPathsUnix::getBinaryDir() const
 {
   return NULL;
 }

intern/ghost/intern/GHOST_SystemPathsUnix.h

@@ -44,26 +44,26 @@ class GHOST_SystemPathsUnix : public GHOST_SystemPaths {
    * "unpack and run" path, then look for properly installed path, including versioning.
    * \return Unsigned char string pointing to system dir (eg `/usr/share/blender/`).
    */
-  const GHOST_TUns8 *getSystemDir(int version, const char *versionstr) const;
+  const char *getSystemDir(int version, const char *versionstr) const;
 
   /**
    * Determine the base dir in which user configuration is stored, including versioning.
    * If needed, it will create the base directory.
    * \return Unsigned char string pointing to user dir (eg `~/.config/.blender/`).
    */
-  const GHOST_TUns8 *getUserDir(int version, const char *versionstr) const;
+  const char *getUserDir(int version, const char *versionstr) const;
 
   /**
    * Determine a special ("well known") and easy to reach user directory.
    * \return Unsigned char string pointing to user dir (eg `~/Documents/`).
    */
-  const GHOST_TUns8 *getUserSpecialDir(GHOST_TUserSpecialDirTypes type) const;
+  const char *getUserSpecialDir(GHOST_TUserSpecialDirTypes type) const;
 
   /**
    * Determine the directory of the current binary
    * \return Unsigned char string pointing to the binary dir
    */
-  const GHOST_TUns8 *getBinaryDir() const;
+  const char *getBinaryDir() const;
 
   /**
    * Add the file to the operating system most recently used files