[Bf-blender-cvs] [4f3045999d6] master: Cleanup: warnings, spelling
Campbell Barton
noreply at git.blender.org
Mon Jul 6 09:38:24 CEST 2020
Commit: 4f3045999d62665409552bd9b5eb2413081103fc
Author: Campbell Barton
Date: Mon Jul 6 17:35:41 2020 +1000
Branches: master
https://developer.blender.org/rB4f3045999d62665409552bd9b5eb2413081103fc
Cleanup: warnings, spelling
===================================================================
M source/blender/blenkernel/BKE_idtype.h
M source/blender/blenlib/intern/threads.cc
===================================================================
diff --git a/source/blender/blenkernel/BKE_idtype.h b/source/blender/blenkernel/BKE_idtype.h
index a823693e126..705ed18df90 100644
--- a/source/blender/blenkernel/BKE_idtype.h
+++ b/source/blender/blenkernel/BKE_idtype.h
@@ -47,9 +47,9 @@ enum {
};
typedef struct IDCacheKey {
- /* The session uuid of the ID owning the cached data. */
+ /* The session UUID of the ID owning the cached data. */
unsigned int id_session_uuid;
- /* Value uniquely indentifying the cache whithin its ID.
+ /* Value uniquely identifying the cache within its ID.
* Typically the offset of its member in the data-block struct, but can be anything. */
size_t offset_in_ID;
/* Actual address of the cached data to save and restore. */
@@ -59,7 +59,7 @@ typedef struct IDCacheKey {
uint BKE_idtype_cache_key_hash(const void *key_v);
bool BKE_idtype_cache_key_cmp(const void *key_a_v, const void *key_b_v);
-/* ********** Prototypes for IDTypeInfo callbacks. ********** */
+/* ********** Prototypes for #IDTypeInfo callbacks. ********** */
typedef void (*IDTypeInitDataFunction)(struct ID *id);
diff --git a/source/blender/blenlib/intern/threads.cc b/source/blender/blenlib/intern/threads.cc
index 7acd9b071e1..f2bf472b5c8 100644
--- a/source/blender/blenlib/intern/threads.cc
+++ b/source/blender/blenlib/intern/threads.cc
@@ -433,7 +433,7 @@ void BLI_mutex_free(ThreadMutex *mutex)
/* Spin Locks */
-#if WITH_TBB
+#ifdef WITH_TBB
static tbb::spin_mutex *tbb_spin_mutex_cast(SpinLock *spin)
{
static_assert(sizeof(SpinLock) >= sizeof(tbb::spin_mutex),
More information about the Bf-blender-cvs
mailing list