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
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/blenfont')
-rw-r--r--source/blender/blenfont/BLF_api.h5
-rw-r--r--source/blender/blenfont/intern/blf.c4
-rw-r--r--source/blender/blenfont/intern/blf_internal.h5
-rw-r--r--source/blender/blenfont/intern/blf_internal_types.h5
4 files changed, 5 insertions, 14 deletions
diff --git a/source/blender/blenfont/BLF_api.h b/source/blender/blenfont/BLF_api.h
index 1d0cb2f524c..9013836fd1e 100644
--- a/source/blender/blenfont/BLF_api.h
+++ b/source/blender/blenfont/BLF_api.h
@@ -21,8 +21,7 @@
* \ingroup blf
*/
-#ifndef __BLF_API_H__
-#define __BLF_API_H__
+#pragma once
#include "BLI_compiler_attrs.h"
#include "BLI_sys_types.h"
@@ -305,5 +304,3 @@ struct ResultBLF {
#ifdef __cplusplus
}
#endif
-
-#endif /* __BLF_API_H__ */
diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c
index 2f7d5a60a6f..95b074fa2df 100644
--- a/source/blender/blenfont/intern/blf.c
+++ b/source/blender/blenfont/intern/blf.c
@@ -509,7 +509,7 @@ void BLF_color4fv(int fontid, const float rgba[4])
void BLF_color4f(int fontid, float r, float g, float b, float a)
{
- float rgba[4] = {r, g, b, a};
+ const float rgba[4] = {r, g, b, a};
BLF_color4fv(fontid, rgba);
}
@@ -523,7 +523,7 @@ void BLF_color3fv_alpha(int fontid, const float rgb[3], float alpha)
void BLF_color3f(int fontid, float r, float g, float b)
{
- float rgba[4] = {r, g, b, 1.0f};
+ const float rgba[4] = {r, g, b, 1.0f};
BLF_color4fv(fontid, rgba);
}
diff --git a/source/blender/blenfont/intern/blf_internal.h b/source/blender/blenfont/intern/blf_internal.h
index 4ae592d323f..ba0873f4fd4 100644
--- a/source/blender/blenfont/intern/blf_internal.h
+++ b/source/blender/blenfont/intern/blf_internal.h
@@ -21,8 +21,7 @@
* \ingroup blf
*/
-#ifndef __BLF_INTERNAL_H__
-#define __BLF_INTERNAL_H__
+#pragma once
struct FontBLF;
struct GlyphBLF;
@@ -151,5 +150,3 @@ extern FT_Error FT_New_Face__win32_compat(FT_Library library,
FT_Face *aface);
# endif
#endif
-
-#endif /* __BLF_INTERNAL_H__ */
diff --git a/source/blender/blenfont/intern/blf_internal_types.h b/source/blender/blenfont/intern/blf_internal_types.h
index 34b674670fd..36bb8769306 100644
--- a/source/blender/blenfont/intern/blf_internal_types.h
+++ b/source/blender/blenfont/intern/blf_internal_types.h
@@ -21,8 +21,7 @@
* \ingroup blf
*/
-#ifndef __BLF_INTERNAL_TYPES_H__
-#define __BLF_INTERNAL_TYPES_H__
+#pragma once
#include "GPU_texture.h"
#include "GPU_vertex_buffer.h"
@@ -258,5 +257,3 @@ typedef struct DirBLF {
/* full path where search fonts. */
char *path;
} DirBLF;
-
-#endif /* __BLF_INTERNAL_TYPES_H__ */