diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-04-06 13:21:19 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-06 13:21:19 +0400 |
commit | 58064bdfc44c4cd0f23d4f65491c86300ce69020 (patch) | |
tree | d7b0c1d24b89292d692cd39f7b60e65f4e909b66 /source | |
parent | 743a9c2e1dcdcca593c18157f5afd451fa5e7ed5 (diff) |
code cleanup: add doxygen headers to bmesh operator files, also add own include so definitions dont get out of sync.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/bmesh/operators/bmo_bevel.c | 6 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_connect.c | 6 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_create.c | 5 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_dissolve.c | 4 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_dupe.c | 7 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_edgesplit.c | 4 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_extrude.c | 4 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_inset.c | 4 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_join_triangles.c | 12 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_mirror.c | 4 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_primitive.c | 12 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_removedoubles.c | 4 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_subdivide.c | 4 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_subdivide.h | 6 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_triangulate.c | 4 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_utils.c | 15 |
16 files changed, 77 insertions, 24 deletions
diff --git a/source/blender/bmesh/operators/bmo_bevel.c b/source/blender/bmesh/operators/bmo_bevel.c index ab57c80ff1a..0165195475a 100644 --- a/source/blender/bmesh/operators/bmo_bevel.c +++ b/source/blender/bmesh/operators/bmo_bevel.c @@ -20,6 +20,10 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/bmesh/operators/bmo_bevel.c + * \ingroup bmesh + */ + #include "MEM_guardedalloc.h" #include "BLI_array.h" @@ -30,6 +34,8 @@ #include "bmesh.h" +#include "intern/bmesh_operators_private.h" /* own include */ + #define BEVEL_FLAG 1 #define BEVEL_DEL 2 #define FACE_NEW 4 diff --git a/source/blender/bmesh/operators/bmo_connect.c b/source/blender/bmesh/operators/bmo_connect.c index 5c60704d0ee..07be4cdd5c1 100644 --- a/source/blender/bmesh/operators/bmo_connect.c +++ b/source/blender/bmesh/operators/bmo_connect.c @@ -20,6 +20,10 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/bmesh/operators/bmo_connect.c + * \ingroup bmesh + */ + #include "MEM_guardedalloc.h" #include "BLI_math.h" @@ -28,6 +32,8 @@ #include "bmesh.h" +#include "intern/bmesh_operators_private.h" /* own include */ + #define VERT_INPUT 1 #define EDGE_OUT 1 #define FACE_NEW 2 diff --git a/source/blender/bmesh/operators/bmo_create.c b/source/blender/bmesh/operators/bmo_create.c index 876d440a0fa..f5e37f96558 100644 --- a/source/blender/bmesh/operators/bmo_create.c +++ b/source/blender/bmesh/operators/bmo_create.c @@ -20,6 +20,10 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/bmesh/operators/bmo_create.c + * \ingroup bmesh + */ + #include "MEM_guardedalloc.h" #include "BLI_heap.h" @@ -31,6 +35,7 @@ #include "bmesh.h" +#include "intern/bmesh_operators_private.h" /* own include */ #define EDGE_MARK 1 #define EDGE_VIS 2 diff --git a/source/blender/bmesh/operators/bmo_dissolve.c b/source/blender/bmesh/operators/bmo_dissolve.c index d42439d31fd..6ccbd06f284 100644 --- a/source/blender/bmesh/operators/bmo_dissolve.c +++ b/source/blender/bmesh/operators/bmo_dissolve.c @@ -20,6 +20,10 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/bmesh/operators/bmo_dissolve.c + * \ingroup bmesh + */ + #include "MEM_guardedalloc.h" #include "BLI_array.h" diff --git a/source/blender/bmesh/operators/bmo_dupe.c b/source/blender/bmesh/operators/bmo_dupe.c index 18ad784dc94..24e25ef720f 100644 --- a/source/blender/bmesh/operators/bmo_dupe.c +++ b/source/blender/bmesh/operators/bmo_dupe.c @@ -20,14 +20,19 @@ * ***** END GPL LICENSE BLOCK ***** */ -#include "MEM_guardedalloc.h" +/** \file blender/bmesh/operators/bmo_dupe.c + * \ingroup bmesh + */ +#include "MEM_guardedalloc.h" #include "BLI_array.h" #include "BLI_math.h" #include "bmesh.h" +#include "intern/bmesh_operators_private.h" /* own include */ + /* local flag define */ #define DUPE_INPUT 1 /* input from operator */ #define DUPE_NEW 2 diff --git a/source/blender/bmesh/operators/bmo_edgesplit.c b/source/blender/bmesh/operators/bmo_edgesplit.c index 6601fb1cd48..557860e1056 100644 --- a/source/blender/bmesh/operators/bmo_edgesplit.c +++ b/source/blender/bmesh/operators/bmo_edgesplit.c @@ -20,6 +20,10 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/bmesh/operators/bmo_edgesplit.c + * \ingroup bmesh + */ + #include "MEM_guardedalloc.h" #include "BLI_utildefines.h" diff --git a/source/blender/bmesh/operators/bmo_extrude.c b/source/blender/bmesh/operators/bmo_extrude.c index 981232b4d66..1ac6f6f19f0 100644 --- a/source/blender/bmesh/operators/bmo_extrude.c +++ b/source/blender/bmesh/operators/bmo_extrude.c @@ -20,6 +20,10 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/bmesh/operators/bmo_extrude.c + * \ingroup bmesh + */ + #include "MEM_guardedalloc.h" #include "BLI_math.h" diff --git a/source/blender/bmesh/operators/bmo_inset.c b/source/blender/bmesh/operators/bmo_inset.c index 7aeeca99d58..13a2f082b95 100644 --- a/source/blender/bmesh/operators/bmo_inset.c +++ b/source/blender/bmesh/operators/bmo_inset.c @@ -20,6 +20,10 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/bmesh/operators/bmo_inset.c + * \ingroup bmesh + */ + #include "MEM_guardedalloc.h" #include "BLI_math.h" diff --git a/source/blender/bmesh/operators/bmo_join_triangles.c b/source/blender/bmesh/operators/bmo_join_triangles.c index e7de0044ab4..01028116da3 100644 --- a/source/blender/bmesh/operators/bmo_join_triangles.c +++ b/source/blender/bmesh/operators/bmo_join_triangles.c @@ -20,6 +20,10 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/bmesh/operators/bmo_join_triangles.c + * \ingroup bmesh + */ + #include "MEM_guardedalloc.h" #include "DNA_meshdata_types.h" @@ -33,14 +37,6 @@ #include "intern/bmesh_operators_private.h" /* own include */ -/* - * JOIN_TRIANGLES.C - * - * utility bmesh operators, e.g. transform, - * translate, rotate, scale, etc. - * - */ - /* Bitflags for edges */ #define T2QDELETE 1 #define T2QCOMPLEX 2 diff --git a/source/blender/bmesh/operators/bmo_mirror.c b/source/blender/bmesh/operators/bmo_mirror.c index c516b8a7605..28c9c53fa8a 100644 --- a/source/blender/bmesh/operators/bmo_mirror.c +++ b/source/blender/bmesh/operators/bmo_mirror.c @@ -20,6 +20,10 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/bmesh/operators/bmo_mirror.c + * \ingroup bmesh + */ + #include "MEM_guardedalloc.h" #include "DNA_meshdata_types.h" diff --git a/source/blender/bmesh/operators/bmo_primitive.c b/source/blender/bmesh/operators/bmo_primitive.c index 2b0cb2367ba..4e89b7b7efe 100644 --- a/source/blender/bmesh/operators/bmo_primitive.c +++ b/source/blender/bmesh/operators/bmo_primitive.c @@ -20,6 +20,10 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/bmesh/operators/bmo_primitive.c + * \ingroup bmesh + */ + #include "MEM_guardedalloc.h" #include "BLI_math.h" @@ -29,7 +33,7 @@ #include "bmesh.h" #include "intern/bmesh_private.h" - +#include "intern/bmesh_operators_private.h" /* own include */ /* ************************ primitives ******************* */ @@ -71,9 +75,9 @@ static short icoface[20][3] = { {10,9,11} }; -// HACK: these can also be found in cmoview.tga.c, but are here so that they can be found by linker -// this hack is only used so that scons & mingw + split-sources hack works -// ------------------------------- start copied code +/* HACK: these can also be found in cmoview.tga.c, but are here so that they can be found by linker + * this hack is only used so that scons & mingw + split-sources hack works + * ------------------------------- start copied code */ /* these are not the monkeys you are looking for */ static int monkeyo = 4; static int monkeynv = 271; diff --git a/source/blender/bmesh/operators/bmo_removedoubles.c b/source/blender/bmesh/operators/bmo_removedoubles.c index 79b2e0773d4..aad0089b1d7 100644 --- a/source/blender/bmesh/operators/bmo_removedoubles.c +++ b/source/blender/bmesh/operators/bmo_removedoubles.c @@ -20,6 +20,10 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/bmesh/operators/bmo_removedoubles.c + * \ingroup bmesh + */ + #include "MEM_guardedalloc.h" #include "BLI_math.h" diff --git a/source/blender/bmesh/operators/bmo_subdivide.c b/source/blender/bmesh/operators/bmo_subdivide.c index f9758e3bf7f..e3ba4c63314 100644 --- a/source/blender/bmesh/operators/bmo_subdivide.c +++ b/source/blender/bmesh/operators/bmo_subdivide.c @@ -20,6 +20,10 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/bmesh/operators/bmo_subdivide.c + * \ingroup bmesh + */ + #include "MEM_guardedalloc.h" #include "BLI_math.h" diff --git a/source/blender/bmesh/operators/bmo_subdivide.h b/source/blender/bmesh/operators/bmo_subdivide.h index 24d621aed8e..1d9021d9756 100644 --- a/source/blender/bmesh/operators/bmo_subdivide.h +++ b/source/blender/bmesh/operators/bmo_subdivide.h @@ -20,13 +20,13 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef __BMO_SUBDIVIDE_H__ -#define __BMO_SUBDIVIDE_H__ - /** \file blender/bmesh/operators/bmo_subdivide.h * \ingroup bmesh */ +#ifndef __BMO_SUBDIVIDE_H__ +#define __BMO_SUBDIVIDE_H__ + typedef struct SubDParams { int numcuts; float smooth; diff --git a/source/blender/bmesh/operators/bmo_triangulate.c b/source/blender/bmesh/operators/bmo_triangulate.c index 47d17717567..dd23bc604be 100644 --- a/source/blender/bmesh/operators/bmo_triangulate.c +++ b/source/blender/bmesh/operators/bmo_triangulate.c @@ -20,6 +20,10 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/bmesh/operators/bmo_subdivide.c + * \ingroup bmesh + */ + #include "MEM_guardedalloc.h" #include "BLI_scanfill.h" diff --git a/source/blender/bmesh/operators/bmo_utils.c b/source/blender/bmesh/operators/bmo_utils.c index 6a994524e5f..47c9f9ce005 100644 --- a/source/blender/bmesh/operators/bmo_utils.c +++ b/source/blender/bmesh/operators/bmo_utils.c @@ -20,6 +20,13 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/bmesh/operators/bmo_subdivide.c + * \ingroup bmesh + * + * utility bmesh operators, e.g. transform, + * translate, rotate, scale, etc. + */ + #include "MEM_guardedalloc.h" #include "DNA_meshdata_types.h" @@ -34,14 +41,6 @@ #include "intern/bmesh_operators_private.h" /* own include */ -/* - * UTILS.C - * - * utility bmesh operators, e.g. transform, - * translate, rotate, scale, etc. - * - */ - void bmo_makevert_exec(BMesh *bm, BMOperator *op) { float vec[3]; |