[Bf-blender-cvs] [3e35beae614] master: Cleanup: correct doc-string & remove unused define
Campbell Barton
noreply at git.blender.org
Mon Oct 17 03:43:22 CEST 2022
Commit: 3e35beae6143d865636edb7c66a8f86873618f19
Author: Campbell Barton
Date: Mon Oct 17 12:41:56 2022 +1100
Branches: master
https://developer.blender.org/rB3e35beae6143d865636edb7c66a8f86873618f19
Cleanup: correct doc-string & remove unused define
Minor edits to recent commits.
===================================================================
M intern/ghost/intern/GHOST_SystemWayland.cpp
M source/blender/blenlib/BLI_path_util.h
===================================================================
diff --git a/intern/ghost/intern/GHOST_SystemWayland.cpp b/intern/ghost/intern/GHOST_SystemWayland.cpp
index 0778938a8e4..04c7e103bde 100644
--- a/intern/ghost/intern/GHOST_SystemWayland.cpp
+++ b/intern/ghost/intern/GHOST_SystemWayland.cpp
@@ -534,7 +534,7 @@ struct GWL_Display {
static GHOST_WindowManager *window_manager = nullptr;
-/** Check this lock before accessing `GHOST_SystemWayland::selection` from a thread. */
+/** Check this lock before accessing #GHOST_SystemWayland::clipboard_ from a thread. */
static std::mutex system_clipboard_mutex;
/**
diff --git a/source/blender/blenlib/BLI_path_util.h b/source/blender/blenlib/BLI_path_util.h
index 4610b71dcd5..d4d2ddead71 100644
--- a/source/blender/blenlib/BLI_path_util.h
+++ b/source/blender/blenlib/BLI_path_util.h
@@ -107,7 +107,6 @@ size_t BLI_path_join_array(char *__restrict dst,
#define _BLI_PATH_JOIN_ARGS_8 _BLI_PATH_JOIN_ARGS_7, const char *h
#define _BLI_PATH_JOIN_ARGS_9 _BLI_PATH_JOIN_ARGS_8, const char *i
#define _BLI_PATH_JOIN_ARGS_10 _BLI_PATH_JOIN_ARGS_9, const char *j
-#define _BLI_PATH_JOIN_ARGS_11 _BLI_PATH_JOIN_ARGS_10, const char *k
BLI_INLINE size_t _BLI_path_join_3(_BLI_PATH_JOIN_ARGS_1) ATTR_NONNULL();
BLI_INLINE size_t _BLI_path_join_4(_BLI_PATH_JOIN_ARGS_2) ATTR_NONNULL();
@@ -181,7 +180,6 @@ BLI_INLINE size_t _BLI_path_join_12(_BLI_PATH_JOIN_ARGS_10)
#undef _BLI_PATH_JOIN_ARGS_8
#undef _BLI_PATH_JOIN_ARGS_9
#undef _BLI_PATH_JOIN_ARGS_10
-#undef _BLI_PATH_JOIN_ARGS_11
/**
* Like Python's `os.path.basename()`
More information about the Bf-blender-cvs
mailing list