Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-08-19 01:45:35 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-08-19 01:49:12 +0300
commit7c352ed43af176948f59ebbdd75c35f641d31ba1 (patch)
tree5395505349ed70ced0b9caa7383e422adf9767b0 /source
parent6a5303ab43cee91f6990125a8d5b2dbcdeb8eeac (diff)
Cleanup: style + doxy
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenfont/intern/blf_font_i18n.c2
-rw-r--r--source/blender/blentranslation/BLT_lang.h2
-rw-r--r--source/blender/blentranslation/BLT_translation.h2
-rw-r--r--source/blender/blentranslation/intern/blt_lang.c2
-rw-r--r--source/blender/blentranslation/intern/blt_translation.c2
-rw-r--r--source/blender/bmesh/tools/bmesh_bevel.c2
-rw-r--r--source/blender/imbuf/intern/thumbs.c12
7 files changed, 14 insertions, 10 deletions
diff --git a/source/blender/blenfont/intern/blf_font_i18n.c b/source/blender/blenfont/intern/blf_font_i18n.c
index da7d2adcdf6..96cc42844d8 100644
--- a/source/blender/blenfont/intern/blf_font_i18n.c
+++ b/source/blender/blenfont/intern/blf_font_i18n.c
@@ -24,7 +24,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/blenfont/intern/blf_font_access.c
+/** \file blender/blenfont/intern/blf_font_i18n.c
* \ingroup blf
*
* API for accessing font files.
diff --git a/source/blender/blentranslation/BLT_lang.h b/source/blender/blentranslation/BLT_lang.h
index 0f9bac936c3..fddb18d382f 100644
--- a/source/blender/blentranslation/BLT_lang.h
+++ b/source/blender/blentranslation/BLT_lang.h
@@ -25,7 +25,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/blenfont/BLT_lang.h
+/** \file blender/blentranslation/BLT_lang.h
* \ingroup blt
*/
diff --git a/source/blender/blentranslation/BLT_translation.h b/source/blender/blentranslation/BLT_translation.h
index 66993d79709..6f24f00acfc 100644
--- a/source/blender/blentranslation/BLT_translation.h
+++ b/source/blender/blentranslation/BLT_translation.h
@@ -25,7 +25,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/blenfont/BLT_translation.h
+/** \file blender/blentranslation/BLT_translation.h
* \ingroup blt
*/
diff --git a/source/blender/blentranslation/intern/blt_lang.c b/source/blender/blentranslation/intern/blt_lang.c
index a0e1fe67268..49cc95c9d27 100644
--- a/source/blender/blentranslation/intern/blt_lang.c
+++ b/source/blender/blentranslation/intern/blt_lang.c
@@ -23,7 +23,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/blenfont/intern/blt_lang.c
+/** \file blender/blentranslation/intern/blt_lang.c
* \ingroup blt
*
* Main internationalization functions to set the locale and query available languages.
diff --git a/source/blender/blentranslation/intern/blt_translation.c b/source/blender/blentranslation/intern/blt_translation.c
index 2651fbbe1f0..c552bac25b0 100644
--- a/source/blender/blentranslation/intern/blt_translation.c
+++ b/source/blender/blentranslation/intern/blt_translation.c
@@ -24,7 +24,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/blenfont/intern/blt_translation.c
+/** \file blender/blentranslation/intern/blt_translation.c
* \ingroup blt
*
* Manages translation files and provides translation functions.
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c
index f47226840f7..3eeb68df492 100644
--- a/source/blender/bmesh/tools/bmesh_bevel.c
+++ b/source/blender/bmesh/tools/bmesh_bevel.c
@@ -1767,7 +1767,7 @@ static void build_boundary(BevelParams *bp, BevVert *bv, bool construct)
if (bv->selcount == 1) {
/* special case: only one beveled edge in */
- build_boundary_terminal_edge(bp, bv, efirst, construct);
+ build_boundary_terminal_edge(bp, bv, efirst, construct);
return;
}
diff --git a/source/blender/imbuf/intern/thumbs.c b/source/blender/imbuf/intern/thumbs.c
index 3355f4d9ac5..e7bec7e643c 100644
--- a/source/blender/imbuf/intern/thumbs.c
+++ b/source/blender/imbuf/intern/thumbs.c
@@ -653,7 +653,8 @@ static struct IMBThumbLocks {
ThreadCondition cond;
} thumb_locks = {0};
-void IMB_thumb_locks_acquire(void) {
+void IMB_thumb_locks_acquire(void)
+{
BLI_lock_thread(LOCK_IMAGE);
if (thumb_locks.lock_counter == 0) {
@@ -668,7 +669,8 @@ void IMB_thumb_locks_acquire(void) {
BLI_unlock_thread(LOCK_IMAGE);
}
-void IMB_thumb_locks_release(void) {
+void IMB_thumb_locks_release(void)
+{
BLI_lock_thread(LOCK_IMAGE);
BLI_assert((thumb_locks.locked_paths != NULL) && (thumb_locks.lock_counter > 0));
@@ -682,7 +684,8 @@ void IMB_thumb_locks_release(void) {
BLI_unlock_thread(LOCK_IMAGE);
}
-void IMB_thumb_path_lock(const char *path) {
+void IMB_thumb_path_lock(const char *path)
+{
void *key = BLI_strdup(path);
BLI_lock_thread(LOCK_IMAGE);
@@ -697,7 +700,8 @@ void IMB_thumb_path_lock(const char *path) {
BLI_unlock_thread(LOCK_IMAGE);
}
-void IMB_thumb_path_unlock(const char *path) {
+void IMB_thumb_path_unlock(const char *path)
+{
const void *key = path;
BLI_lock_thread(LOCK_IMAGE);