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:
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/CCGSubSurf.h5
-rw-r--r--source/blender/blenlib/BLI_alloca.h1
-rw-r--r--source/blender/blenlib/BLI_convexhull2d.h6
-rw-r--r--source/blender/blenlib/BLI_math_interp.h6
-rw-r--r--source/blender/bmesh/tools/bmesh_triangulate.h6
-rw-r--r--source/blender/compositor/COM_compositor.h5
-rw-r--r--source/blender/compositor/COM_defines.h6
-rw-r--r--source/blender/editors/include/ED_lattice.h5
-rw-r--r--source/blender/editors/space_info/textview.h4
-rw-r--r--source/blender/modifiers/intern/MOD_meshcache_util.h3
-rw-r--r--source/blender/nodes/NOD_common.h6
-rw-r--r--source/blender/python/bmesh/bmesh_py_types.h6
-rw-r--r--source/blender/python/generic/blf_py_api.h6
-rw-r--r--source/blender/python/intern/bpy.h1
-rw-r--r--source/blender/python/intern/bpy_intern_string.h5
-rw-r--r--source/blender/python/intern/bpy_rna_anim.h5
-rw-r--r--source/blender/python/intern/bpy_rna_callback.h6
-rw-r--r--source/blender/python/intern/gpu.h9
18 files changed, 67 insertions, 24 deletions
diff --git a/source/blender/blenkernel/intern/CCGSubSurf.h b/source/blender/blenkernel/intern/CCGSubSurf.h
index d350d1f4280..fdf6d2df99f 100644
--- a/source/blender/blenkernel/intern/CCGSubSurf.h
+++ b/source/blender/blenkernel/intern/CCGSubSurf.h
@@ -18,6 +18,9 @@
* ***** END GPL LICENSE BLOCK *****
*/
+#ifndef __CCGSUBSURF_H__
+#define __CCGSUBSURF_H__
+
/** \file blender/blenkernel/intern/CCGSubSurf.h
* \ingroup bke
*/
@@ -182,3 +185,5 @@ CCGFace* ccgFaceIterator_getCurrent (CCGFaceIterator *fi);
int ccgFaceIterator_isStopped (CCGFaceIterator *fi);
void ccgFaceIterator_next (CCGFaceIterator *fi);
void ccgFaceIterator_free (CCGFaceIterator *fi);
+
+#endif /* __CCGSUBSURF_H__ */
diff --git a/source/blender/blenlib/BLI_alloca.h b/source/blender/blenlib/BLI_alloca.h
index b93f5b7123e..06c3e8d8996 100644
--- a/source/blender/blenlib/BLI_alloca.h
+++ b/source/blender/blenlib/BLI_alloca.h
@@ -19,6 +19,7 @@
*/
#ifndef __BLI_ALLOCA_H__
+#define __BLI_ALLOCA_H__
/** \file BLI_alloca.h
* \ingroup bli
diff --git a/source/blender/blenlib/BLI_convexhull2d.h b/source/blender/blenlib/BLI_convexhull2d.h
index 3f0787b37b1..4b82071ede8 100644
--- a/source/blender/blenlib/BLI_convexhull2d.h
+++ b/source/blender/blenlib/BLI_convexhull2d.h
@@ -18,8 +18,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#ifndef __BLI_CONVEXHULL2D__
-#define __BLI_CONVEXHULL2D__
+#ifndef __BLI_CONVEXHULL2D_H__
+#define __BLI_CONVEXHULL2D_H__
/** \file BLI_convexhull2d.h
* \ingroup bli
@@ -31,4 +31,4 @@ int BLI_convexhull_2d(const float (*points)[2], const int n, int r_points[]);
float BLI_convexhull_aabb_fit_hull_2d(const float (*points_hull)[2], unsigned int n);
float BLI_convexhull_aabb_fit_points_2d(const float (*points)[2], unsigned int n);
-#endif /* __BLI_CONVEXHULL2D__ */
+#endif /* __BLI_CONVEXHULL2D_H__ */
diff --git a/source/blender/blenlib/BLI_math_interp.h b/source/blender/blenlib/BLI_math_interp.h
index c38c61a288f..43ef64214ad 100644
--- a/source/blender/blenlib/BLI_math_interp.h
+++ b/source/blender/blenlib/BLI_math_interp.h
@@ -26,8 +26,8 @@
*
*/
-#ifndef __BLI_MATH_INTERP__
-#define __BLI_MATH_INTERP__
+#ifndef __BLI_MATH_INTERP_H__
+#define __BLI_MATH_INTERP_H__
/** \file BLI_math_interp.h
* \ingroup bli
@@ -45,4 +45,4 @@ void BLI_bilinear_interpolation_fl(const float *buffer, float *output, int width
void BLI_bilinear_interpolation_char(const unsigned char *buffer, unsigned char *output, int width, int height,
int components, float u, float v);
-#endif /* __BLI_MATH_INTERP__ */
+#endif /* __BLI_MATH_INTERP_H__ */
diff --git a/source/blender/bmesh/tools/bmesh_triangulate.h b/source/blender/bmesh/tools/bmesh_triangulate.h
index 936a90d3a16..141aa2f82b4 100644
--- a/source/blender/bmesh/tools/bmesh_triangulate.h
+++ b/source/blender/bmesh/tools/bmesh_triangulate.h
@@ -27,10 +27,10 @@
*
*/
-#ifndef __BMESH_TRIAMGULATE_H__
-#define __BMESH_TRIAMGULATE_H__
+#ifndef __BMESH_TRIANGULATE_H__
+#define __BMESH_TRIANGULATE_H__
void BM_mesh_triangulate(BMesh *bm, const bool use_beauty, const bool tag_only,
BMOperator *op, BMOpSlot *slot_facemap_out);
-#endif /* __BMESH_TRIAMGULATE_H__ */
+#endif /* __BMESH_TRIANGULATE_H__ */
diff --git a/source/blender/compositor/COM_compositor.h b/source/blender/compositor/COM_compositor.h
index 204c3237e65..1936909b004 100644
--- a/source/blender/compositor/COM_compositor.h
+++ b/source/blender/compositor/COM_compositor.h
@@ -20,6 +20,9 @@
* Monique Dewanchand
*/
+#ifndef __COM_COMPOSITOR_H__
+#define __COM_COMPOSITOR_H__
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -343,3 +346,5 @@ int COM_isHighlightedbNode(bNode *bnode);
#ifdef __cplusplus
}
#endif
+
+#endif /* __COM_COMPOSITOR_H__ */
diff --git a/source/blender/compositor/COM_defines.h b/source/blender/compositor/COM_defines.h
index 3cc161a5877..3b0e9f239bb 100644
--- a/source/blender/compositor/COM_defines.h
+++ b/source/blender/compositor/COM_defines.h
@@ -20,8 +20,8 @@
* Monique Dewanchand
*/
-#ifndef _COM_defines_h_
-#define _COM_defines_h_
+#ifndef __COM_DEFINES_H__
+#define __COM_DEFINES_H__
/**
* @brief possible data types for SocketConnection
@@ -109,4 +109,4 @@ typedef enum OrderOfChunks {
#define COM_BLUR_BOKEH_PIXELS 512
-#endif
+#endif /* __COM_DEFINES_H__ */
diff --git a/source/blender/editors/include/ED_lattice.h b/source/blender/editors/include/ED_lattice.h
index 15e5c3dba8f..6fe1524cb6d 100644
--- a/source/blender/editors/include/ED_lattice.h
+++ b/source/blender/editors/include/ED_lattice.h
@@ -28,8 +28,13 @@
* \ingroup editors
*/
+#ifndef __ED_LATTICE_H__
+#define __ED_LATTICE_H__
+
struct Object;
void free_editLatt(struct Object *ob);
void make_editLatt(struct Object *obedit);
void load_editLatt(struct Object *obedit);
+
+#endif /* __ED_LATTICE_H__ */
diff --git a/source/blender/editors/space_info/textview.h b/source/blender/editors/space_info/textview.h
index 653c9b83a50..2f9e518ed47 100644
--- a/source/blender/editors/space_info/textview.h
+++ b/source/blender/editors/space_info/textview.h
@@ -24,6 +24,8 @@
* \ingroup spinfo
*/
+#ifndef __TEXTVIEW_H__
+#define __TEXTVIEW_H__
typedef struct TextViewContext {
int lheight;
@@ -59,3 +61,5 @@ int textview_draw(struct TextViewContext *tvc, const int draw, int mval[2], void
#define TVC_LINE_FG (1<<0)
#define TVC_LINE_BG (1<<1)
+
+#endif /* __TEXTVIEW_H__ */
diff --git a/source/blender/modifiers/intern/MOD_meshcache_util.h b/source/blender/modifiers/intern/MOD_meshcache_util.h
index d7e71518f77..f3b5f43009d 100644
--- a/source/blender/modifiers/intern/MOD_meshcache_util.h
+++ b/source/blender/modifiers/intern/MOD_meshcache_util.h
@@ -25,6 +25,7 @@
*/
#ifndef __MOD_MESHCACHE_UTIL_H__
+#define __MOD_MESHCACHE_UTIL_H__
struct MPoly;
struct MLoop;
@@ -64,4 +65,4 @@ void MOD_meshcache_calc_range(const float frame, const char interp,
#define FRAME_SNAP_EPS 0.0001f
-#endif /* __MOD_MESHCACHE_UTIL_H__ */
+#endif /* __MOD_MESHCACHE_UTIL_H__ */
diff --git a/source/blender/nodes/NOD_common.h b/source/blender/nodes/NOD_common.h
index ac0ceab36d4..a8279b4c66a 100644
--- a/source/blender/nodes/NOD_common.h
+++ b/source/blender/nodes/NOD_common.h
@@ -29,8 +29,8 @@
* \ingroup nodes
*/
-#ifndef NOD_COMMON_H
-#define NOD_COMMON_H
+#ifndef __NOD_COMMON_H__
+#define __NOD_COMMON_H__
#include "BKE_node.h"
@@ -51,4 +51,4 @@ struct bNodeSocket *node_group_output_find_socket(struct bNode *node, const char
void node_group_input_verify(struct bNodeTree *ntree, struct bNode *node, struct ID *id);
void node_group_output_verify(struct bNodeTree *ntree, struct bNode *node, struct ID *id);
-#endif
+#endif /* __NOD_COMMON_H__ */
diff --git a/source/blender/python/bmesh/bmesh_py_types.h b/source/blender/python/bmesh/bmesh_py_types.h
index f02b94be526..0909ce0d26a 100644
--- a/source/blender/python/bmesh/bmesh_py_types.h
+++ b/source/blender/python/bmesh/bmesh_py_types.h
@@ -27,8 +27,8 @@
* \ingroup pybmesh
*/
-#ifndef __BMESH_TYPES_H__
-#define __BMESH_TYPES_H__
+#ifndef __BMESH_PY_TYPES_H__
+#define __BMESH_PY_TYPES_H__
extern PyTypeObject BPy_BMesh_Type;
extern PyTypeObject BPy_BMVert_Type;
@@ -205,4 +205,4 @@ extern struct PyC_FlagSet bpy_bm_htype_all_flags[];
extern struct PyC_FlagSet bpy_bm_hflag_all_flags[];
#endif
-#endif /* __BMESH_TYPES_H__ */
+#endif /* __BMESH_PY_TYPES_H__ */
diff --git a/source/blender/python/generic/blf_py_api.h b/source/blender/python/generic/blf_py_api.h
index 12bd9bcf019..d856e68faee 100644
--- a/source/blender/python/generic/blf_py_api.h
+++ b/source/blender/python/generic/blf_py_api.h
@@ -20,9 +20,13 @@
* ***** END GPL LICENSE BLOCK *****
*/
+#ifndef __BLF_PY_API_H__
+#define __BLF_PY_API_H__
+
/** \file blender/python/generic/blf_py_api.h
* \ingroup pygen
*/
-
PyObject *BPyInit_blf(void);
+
+#endif /* __BLF_PY_API_H__ */
diff --git a/source/blender/python/intern/bpy.h b/source/blender/python/intern/bpy.h
index fe877d161ff..b647d0d450c 100644
--- a/source/blender/python/intern/bpy.h
+++ b/source/blender/python/intern/bpy.h
@@ -24,6 +24,7 @@
*/
#ifndef __BPY_H__
+#define __BPY_H__
void BPy_init_modules(void);
extern PyObject *bpy_package_py;
diff --git a/source/blender/python/intern/bpy_intern_string.h b/source/blender/python/intern/bpy_intern_string.h
index 2e0d18d8b7f..41b7303bf8d 100644
--- a/source/blender/python/intern/bpy_intern_string.h
+++ b/source/blender/python/intern/bpy_intern_string.h
@@ -20,6 +20,9 @@
* ***** END GPL LICENSE BLOCK *****
*/
+#ifndef __BPY_INTERN_STRING_H__
+#define __BPY_INTERN_STRING_H__
+
/** \file blender/python/intern/bpy_intern_string.h
* \ingroup pythonintern
*/
@@ -36,3 +39,5 @@ extern PyObject *bpy_intern_str_attr;
extern PyObject *bpy_intern_str___slots__;
extern PyObject *bpy_intern_str___name__;
extern PyObject *bpy_intern_str___doc__;
+
+#endif /* __BPY_INTERN_STRING_H__ */
diff --git a/source/blender/python/intern/bpy_rna_anim.h b/source/blender/python/intern/bpy_rna_anim.h
index 005e8f3e1a4..8ef976b8cb4 100644
--- a/source/blender/python/intern/bpy_rna_anim.h
+++ b/source/blender/python/intern/bpy_rna_anim.h
@@ -20,6 +20,9 @@
* ***** END GPL LICENSE BLOCK *****
*/
+#ifndef __BPY_RNA_ANIM_H__
+#define __BPY_RNA_ANIM_H__
+
/** \file blender/python/intern/bpy_rna_anim.h
* \ingroup pythonintern
*/
@@ -33,3 +36,5 @@ PyObject *pyrna_struct_keyframe_insert(BPy_StructRNA *self, PyObject *args, PyOb
PyObject *pyrna_struct_keyframe_delete(BPy_StructRNA *self, PyObject *args, PyObject *kw);
PyObject *pyrna_struct_driver_add(BPy_StructRNA *self, PyObject *args);
PyObject *pyrna_struct_driver_remove(BPy_StructRNA *self, PyObject *args);
+
+#endif /* __BPY_RNA_ANIM_H__ */
diff --git a/source/blender/python/intern/bpy_rna_callback.h b/source/blender/python/intern/bpy_rna_callback.h
index 4b801f35654..6ef98790b4e 100644
--- a/source/blender/python/intern/bpy_rna_callback.h
+++ b/source/blender/python/intern/bpy_rna_callback.h
@@ -20,11 +20,13 @@
* ***** END GPL LICENSE BLOCK *****
*/
+#ifndef __BPY_RNA_CALLBACK_H__
+#define __BPY_RNA_CALLBACK_H__
+
/** \file blender/python/intern/bpy_rna_callback.h
* \ingroup pythonintern
*/
-
struct BPy_StructRNA;
struct PyObject;
@@ -35,3 +37,5 @@ PyObject *pyrna_callback_remove(BPy_StructRNA *self, PyObject *args);
PyObject *pyrna_callback_classmethod_add(PyObject *cls, PyObject *args);
PyObject *pyrna_callback_classmethod_remove(PyObject *cls, PyObject *args);
+
+#endif /* __BPY_RNA_CALLBACK_H__ */
diff --git a/source/blender/python/intern/gpu.h b/source/blender/python/intern/gpu.h
index f8c751f7f94..82338869b9d 100644
--- a/source/blender/python/intern/gpu.h
+++ b/source/blender/python/intern/gpu.h
@@ -27,10 +27,13 @@
/** \file blender/python/intern/gpu.h
* \ingroup pythonintern
- */
-
-/**
+ *
* Initializes the gpu Python module.
*/
+
+#ifndef __GPU_H__
+#define __GPU_H__
+
PyObject *GPU_initPython(void);
+#endif /* __GPU_H__ */