style cleanup for bmesh headers
- use consistant header guards - correct doxy comments - remove ED_toolmode.h (unused)
This commit is contained in:
parent
07ca47fc52
commit
2fcb6d058e
|
@ -1,5 +1,27 @@
|
|||
#ifndef _BKE_TESSMESH_H
|
||||
#define _BKE_TESSMESH_H
|
||||
/*
|
||||
* ***** BEGIN GPL LICENSE BLOCK *****
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*
|
||||
* Contributor(s): Joseph Eagar.
|
||||
*
|
||||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
#ifndef __BKE_TESSMESH_H__
|
||||
#define __BKE_TESSMESH_H__
|
||||
|
||||
#include "bmesh.h"
|
||||
|
||||
|
@ -72,4 +94,4 @@ BMEditMesh *BMEdit_Copy(BMEditMesh *tm);
|
|||
void BMEdit_Free(BMEditMesh *em);
|
||||
void BMEdit_UpdateLinkedCustomData(BMEditMesh *em);
|
||||
|
||||
#endif /* _BKE_TESSMESH_H */
|
||||
#endif /* __BKE_TESSMESH_H__ */
|
||||
|
|
|
@ -30,15 +30,12 @@
|
|||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
/** \file blender/blenkernel/intern/bmesh_private.h
|
||||
* \ingroup bke
|
||||
*/
|
||||
|
||||
|
||||
#ifndef BMESH_PRIVATE
|
||||
#define BMESH_PRIVATE
|
||||
|
||||
#include "BKE_bmesh.h"
|
||||
/** \file blender/bmesh/bmesh_private.h
|
||||
* \ingroup bmesh
|
||||
*/
|
||||
|
||||
/*ALLOCATION/DEALLOCATION*/
|
||||
struct BME_Vert *BME_addvertlist(struct BME_Mesh *bm, struct BME_Vert *example);
|
||||
|
|
|
@ -25,8 +25,8 @@
|
|||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
#ifndef BLI_SMALLHASH_H
|
||||
#define BLI_SMALLHASH_H
|
||||
#ifndef __BLI_SMALLHASH_H__
|
||||
#define __BLI_SMALLHASH_H__
|
||||
|
||||
/** \file BLI_smallhash.h
|
||||
* \ingroup bli
|
||||
|
@ -70,4 +70,4 @@ void * BLI_smallhash_iternext(SmallHashIter *iter, uintptr_t *key);
|
|||
void * BLI_smallhash_iternew(SmallHash *hash, SmallHashIter *iter, uintptr_t *key);
|
||||
/* void BLI_smallhash_print(SmallHash *hash); */ /* UNUSED */
|
||||
|
||||
#endif // BLI_SMALLHASH_H
|
||||
#endif /* __BLI_SMALLHASH_H__ */
|
||||
|
|
|
@ -24,6 +24,13 @@
|
|||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
#ifndef __BLI_SPARSEMAP_H__
|
||||
#define __BLI_SPARSEMAP_H__
|
||||
|
||||
/** \file BLI_sparsemap.h
|
||||
* \ingroup bli
|
||||
*/
|
||||
|
||||
#include "BLI_math_inline.h"
|
||||
|
||||
typedef struct SparseMap {
|
||||
|
@ -68,4 +75,7 @@ MALWAYS_INLINE void BLI_sparsemap_set(SparseMap *sm, int index, void *ptr)
|
|||
|
||||
sm->blocks[index/sm->blocksize] = ptr;
|
||||
}
|
||||
|
||||
#endif /* __BLI_SPARSEMAP_H__ */
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
/*
|
||||
* BMesh API.
|
||||
*
|
||||
* ***** BEGIN GPL LICENSE BLOCK *****
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
@ -22,8 +20,12 @@
|
|||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
#ifndef BMESH_H
|
||||
#define BMESH_H
|
||||
#ifndef __BMESH_H__
|
||||
#define __BMESH_H__
|
||||
|
||||
/** \file blender/bmesh/bmesh.h
|
||||
* \ingroup bmesh
|
||||
*/
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
@ -368,4 +370,4 @@ void bmesh_end_edit(BMesh *bm, int flag);
|
|||
}
|
||||
#endif
|
||||
|
||||
#endif /* BMESH_H */
|
||||
#endif /* __BMESH_H__ */
|
||||
|
|
|
@ -20,10 +20,14 @@
|
|||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
#ifndef _BMESH_CLASS_H
|
||||
#define _BMESH_CLASS_H
|
||||
#ifndef __BMESH_CLASS_H__
|
||||
#define __BMESH_CLASS_H__
|
||||
|
||||
/*bmesh data structures*/
|
||||
/** \file blender/bmesh/bmesh_class.h
|
||||
* \ingroup bmesh
|
||||
*/
|
||||
|
||||
/* bmesh data structures */
|
||||
|
||||
struct BMesh;
|
||||
struct BMVert;
|
||||
|
@ -158,4 +162,4 @@ typedef struct BMesh {
|
|||
#define BM_LOOP 4
|
||||
#define BM_FACE 8
|
||||
|
||||
#endif /* _BMESH_CLASS_H */
|
||||
#endif /* __BMESH_CLASS_H__ */
|
||||
|
|
|
@ -20,8 +20,12 @@
|
|||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
#ifndef _BMESH_ERROR_H
|
||||
#define _BMESH_ERROR_H
|
||||
#ifndef __BMESH_ERROR_H__
|
||||
#define __BMESH_ERROR_H__
|
||||
|
||||
/** \file blender/bmesh/bmesh_error.h
|
||||
* \ingroup bmesh
|
||||
*/
|
||||
|
||||
/*----------- bmop error system ----------*/
|
||||
|
||||
|
@ -65,4 +69,4 @@ int BMO_error_catch_op(BMesh *bm, BMOperator *catchop, int errorcode, char **msg
|
|||
#define BMERR_INVALID_SELECTION 9
|
||||
#define BMERR_MESH_ERROR 10
|
||||
|
||||
#endif /* _BMESH_ERROR_H */
|
||||
#endif /* __BMESH_ERROR_H__ */
|
||||
|
|
|
@ -20,6 +20,13 @@
|
|||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
#ifndef __BMESH_ITERATORS_H__
|
||||
#define __BMESH_ITERATORS_H__
|
||||
|
||||
/** \file blender/bmesh/bmesh_iterators.h
|
||||
* \ingroup bmesh
|
||||
*/
|
||||
|
||||
/*
|
||||
* BMESH ITERATORS
|
||||
*
|
||||
|
@ -32,9 +39,6 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#ifndef BM_ITERATORS_H
|
||||
#define BM_ITERATORS_H
|
||||
|
||||
#include "BLI_mempool.h"
|
||||
|
||||
/* Defines for passing to BM_iter_new.
|
||||
|
@ -129,4 +133,4 @@ void *bmiter__loop_of_face_step(struct BMIter *iter);
|
|||
|
||||
#include "intern/bmesh_iterators_inline.c"
|
||||
|
||||
#endif
|
||||
#endif /* __BMESH_ITERATORS_H__ */
|
||||
|
|
|
@ -20,8 +20,12 @@
|
|||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
#ifndef BM_MARKING_H
|
||||
#define BM_MARKING_H
|
||||
#ifndef __BMESH_MARKING_H__
|
||||
#define __BMESH_MARKING_H__
|
||||
|
||||
/** \file blender/bmesh/bmesh_marking.h
|
||||
* \ingroup bmesh
|
||||
*/
|
||||
|
||||
typedef struct BMEditSelection
|
||||
{
|
||||
|
@ -69,4 +73,4 @@ void BM_select_history_store(BMesh *bm, void *data);
|
|||
void BM_select_history_validate(BMesh *bm);
|
||||
void BM_select_history_clear(BMesh *em);
|
||||
|
||||
#endif
|
||||
#endif /* __BMESH_MARKING_H__ */
|
||||
|
|
|
@ -20,8 +20,12 @@
|
|||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
#ifndef _BMESH_OPERATOR_API_H
|
||||
#define _BMESH_OPERATOR_API_H
|
||||
#ifndef __BMESH_OPERATOR_API_H__
|
||||
#define __BMESH_OPERATOR_API_H__
|
||||
|
||||
/** \file blender/bmesh/bmesh_operator_api.h
|
||||
* \ingroup bmesh
|
||||
*/
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
@ -549,4 +553,4 @@ BM_INLINE void *BMO_slot_map_ptr_get(BMesh *bm, BMOperator *op, const char *slot
|
|||
}
|
||||
#endif
|
||||
|
||||
#endif /* _BMESH_OPERATOR_API_H */
|
||||
#endif /* __BMESH_OPERATOR_API_H__ */
|
||||
|
|
|
@ -20,8 +20,12 @@
|
|||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
#ifndef _BMESH_OPERATORS_H
|
||||
#define _BMESH_OPERATORS_H
|
||||
#ifndef __BMESH_OPERATORS_H__
|
||||
#define __BMESH_OPERATORS_H__
|
||||
|
||||
/** \file blender/bmesh/bmesh_operators.h
|
||||
* \ingroup bmesh
|
||||
*/
|
||||
|
||||
/*see comments in intern/bmesh_opdefines.c for documentation of specific operators*/
|
||||
|
||||
|
@ -98,4 +102,4 @@ void BM_esubdivideflag(struct Object *obedit, BMesh *bm, int flag, float smooth,
|
|||
float fractal, int beauty, int numcuts, int seltype,
|
||||
int cornertype, int singleedge, int gridfill, int seed);
|
||||
|
||||
#endif
|
||||
#endif /* __BMESH_OPERATORS_H__ */
|
||||
|
|
|
@ -20,8 +20,13 @@
|
|||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
#ifndef BMESH_QUERIES_H
|
||||
#define BMESH_QUERIES_H
|
||||
#ifndef __BMESH_QUERIES_H__
|
||||
#define __BMESH_QUERIES_H__
|
||||
|
||||
/** \file blender/bmesh/bmesh_queries.h
|
||||
* \ingroup bmesh
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
/* Queries */
|
||||
|
@ -113,4 +118,4 @@ int BM_face_validate(BMesh *bm, BMFace *face, FILE *err);
|
|||
* edges in the face.*/
|
||||
void BM_face_legal_splits(BMesh *bm, BMFace *f, BMLoop *(*loops)[2], int len);
|
||||
|
||||
#endif
|
||||
#endif /* __BMESH_QUERIES_H__ */
|
||||
|
|
|
@ -20,8 +20,12 @@
|
|||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
#ifndef BM_WALKERS_H
|
||||
#define BM_WALKERS_H
|
||||
#ifndef __BMESH_WALKERS_H__
|
||||
#define __BMESH_WALKERS_H__
|
||||
|
||||
/** \file blender/bmesh/bmesh_walkers.h
|
||||
* \ingroup bmesh
|
||||
*/
|
||||
|
||||
#include "BLI_ghash.h"
|
||||
|
||||
|
@ -132,4 +136,4 @@ enum {
|
|||
/* use with BMW_init, so as not to confuse with restrict flags */
|
||||
#define BMW_NIL_LAY 0
|
||||
|
||||
#endif
|
||||
#endif /* __BMESH_WALKERS_H__ */
|
||||
|
|
|
@ -20,8 +20,12 @@
|
|||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
#ifndef BM_OPERATORS_PRIVATE_H
|
||||
#define BM_OPERATORS_PRIVATE_H
|
||||
#ifndef __BMESH_OPERATORS_PRIVATE_H__
|
||||
#define __BMESH_OPERATORS_PRIVATE_H__
|
||||
|
||||
/** \file blender/bmesh/intern/bmesh_operators_private.h
|
||||
* \ingroup bmesh
|
||||
*/
|
||||
|
||||
struct BMesh;
|
||||
struct BMOperator;
|
||||
|
@ -98,4 +102,4 @@ void bmesh_create_circle_exec(BMesh *bm, BMOperator *op);
|
|||
void bmesh_bridge_loops_exec(BMesh *bm, BMOperator *op);
|
||||
void bmesh_solidify_face_region_exec(BMesh *bm, BMOperator *op);
|
||||
|
||||
#endif
|
||||
#endif /* __BMESH_OPERATORS_PRIVATE_H__ */
|
||||
|
|
|
@ -25,6 +25,9 @@
|
|||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
#ifndef __BMESH_PRIVATE_H__
|
||||
#define __BMESH_PRIVATE_H__
|
||||
|
||||
/** \file blender/bmesh/intern/bmesh_private.h
|
||||
* \ingroup bmesh
|
||||
*
|
||||
|
@ -33,9 +36,6 @@
|
|||
* parts of the bmesh internals.
|
||||
*/
|
||||
|
||||
#ifndef BMESH_PRIVATE_H
|
||||
#define BMESH_PRIVATE_H
|
||||
|
||||
struct Link;
|
||||
struct BMLoop;
|
||||
|
||||
|
@ -59,7 +59,7 @@ int bmesh_check_element(BMesh *bm, void *element, const char htype);
|
|||
int bmesh_radial_length(struct BMLoop *l);
|
||||
int bmesh_disk_count(BMVert *v);
|
||||
|
||||
/*internal selection flushing*/
|
||||
/* internal selection flushing */
|
||||
void bmesh_selectmode_flush(struct BMesh *bm);
|
||||
|
||||
/*internal filter API*/
|
||||
|
@ -91,8 +91,8 @@ void bmesh_flip_normal(struct BMesh *bm, struct BMFace *f);
|
|||
BMEdge *bmesh_disk_next(BMEdge *e, BMVert *v);
|
||||
BMEdge *bmesh_disk_prev(BMEdge *e, BMVert *v);
|
||||
|
||||
/*include the rest of our private declarations*/
|
||||
/* include the rest of our private declarations */
|
||||
#include "bmesh_structure.h"
|
||||
#include "bmesh_operators_private.h"
|
||||
|
||||
#endif
|
||||
#endif /* __BMESH_PRIVATE_H__ */
|
||||
|
|
|
@ -25,6 +25,9 @@
|
|||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
#ifndef __BMESH_STRUCTURE_H__
|
||||
#define __BMESH_STRUCTURE_H__
|
||||
|
||||
/** \file blender/bmesh/intern/bmesh_structure.h
|
||||
* \ingroup bmesh
|
||||
*
|
||||
|
@ -36,9 +39,6 @@
|
|||
* descriptive comments. but seriously, don't use this stuff.
|
||||
*/
|
||||
|
||||
#ifndef BM_STRUCTURE_H
|
||||
#define BM_STRUCTURE_H
|
||||
|
||||
struct ListBase;
|
||||
|
||||
void remove_loop_radial_link(BMLoop *l);
|
||||
|
@ -99,4 +99,4 @@ struct BMFace *bmesh_jfke(struct BMesh *bm, struct BMFace *f1, struct BMFace *f2
|
|||
struct BMVert *bmesh_urmv(struct BMesh *bm, struct BMFace *sf, struct BMVert *sv);
|
||||
//int *bmesh_grkv(struct BMesh *bm, struct BMFace *sf, struct BMVert *kv);
|
||||
|
||||
#endif
|
||||
#endif /* __BMESH_STRUCTURE_H__ */
|
||||
|
|
|
@ -20,6 +20,9 @@
|
|||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
#ifndef __BMESH_WALKERS_PRIVATE_H__
|
||||
#define __BMESH_WALKERS_PRIVATE_H__
|
||||
|
||||
/** \file blender/bmesh/intern/bmesh_walkers_private.h
|
||||
* \ingroup bmesh
|
||||
*
|
||||
|
@ -82,3 +85,5 @@ typedef struct connectedVertexWalker {
|
|||
bmesh_walkerGeneric header;
|
||||
BMVert *curvert;
|
||||
} connectedVertexWalker;
|
||||
|
||||
#endif /* __BMESH_WALKERS_PRIVATE_H__ */
|
||||
|
|
|
@ -20,8 +20,12 @@
|
|||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
#ifndef _SUBDIVIDEOP_H
|
||||
#define _SUBDIVIDEOP_H
|
||||
#ifndef __BMO_SUBDIVIDE_H__
|
||||
#define __BMO_SUBDIVIDE_H__
|
||||
|
||||
/** \file blender/bmesh/operators/bmo_subdivide.h
|
||||
* \ingroup bmesh
|
||||
*/
|
||||
|
||||
typedef struct subdparams {
|
||||
int numcuts;
|
||||
|
@ -59,4 +63,4 @@ typedef struct SubDPattern {
|
|||
* split the edge only?
|
||||
*/
|
||||
|
||||
#endif /* _SUBDIVIDEOP_H */
|
||||
#endif /* __BMO_SUBDIVIDE_H__ */
|
||||
|
|
|
@ -1,78 +0,0 @@
|
|||
#if 0
|
||||
/*
|
||||
* ***** BEGIN GPL LICENSE BLOCK *****
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*
|
||||
* The Original Code is Copyright (C) 2008 Blender Foundation.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Contributor(s): Joseph Eagar
|
||||
*
|
||||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
#ifndef ED_TOOLMODE_H
|
||||
#define ED_TOOLMODE_H
|
||||
|
||||
struct ID;
|
||||
struct View3D;
|
||||
struct ARegion;
|
||||
struct bContext;
|
||||
struct wmWindowManager;
|
||||
struct wmKeyConfig;
|
||||
struct ReportList;
|
||||
struct ViewContext;
|
||||
struct bDeformGroup;
|
||||
struct MDeformWeight;
|
||||
struct MDeformVert;
|
||||
struct Scene;
|
||||
struct Mesh;
|
||||
struct MCol;
|
||||
struct UvVertMap;
|
||||
struct UvMapVert;
|
||||
struct CustomData;
|
||||
struct BMEditMesh;
|
||||
struct BMEditSelection;
|
||||
struct BMesh;
|
||||
struct BMVert;
|
||||
struct BMEdge;
|
||||
struct BMFace;
|
||||
struct UvVertMap;
|
||||
struct UvMapVert;
|
||||
struct Material;
|
||||
struct Object;
|
||||
struct rcti;
|
||||
struct wmOperator;
|
||||
|
||||
typedef struct ToolModeDefine {
|
||||
short idtype, icon;
|
||||
char *name;
|
||||
void (*create)(void *args);
|
||||
void (*free)(void *self);
|
||||
|
||||
/*called when mode is set active*/
|
||||
void (*enter)(void *self, struct bContext *C);
|
||||
void (*exit)(void *self, struct bContext *C);
|
||||
|
||||
/*called on draw*/
|
||||
void (*draw)(void *self, struct bContext *C);
|
||||
/*modal is option, and should be used carefully*/
|
||||
void (*modal)(struct bContext *C, struct wmOperator *op, struct wmEvent *event);
|
||||
|
||||
/*keymap stuff*/
|
||||
void (*create_keymap)(struct wmKeyConfig *km);
|
||||
void (*keymap_poll)(struct bContext *C);
|
||||
};
|
||||
#endif
|
|
@ -29,8 +29,8 @@
|
|||
* \ingroup edmesh
|
||||
*/
|
||||
|
||||
#ifndef _EDITBMESH_BVH
|
||||
#define _EDITBMESH_BVH
|
||||
#ifndef __EDITBMESH_BVH_H__
|
||||
#define __EDITBMESH_BVH_H__
|
||||
|
||||
struct BMEditMesh;
|
||||
struct BMFace;
|
||||
|
@ -64,4 +64,4 @@ struct BMVert *BMBVH_FindClosestVert(struct BMBVHTree *tree, float *co, float ma
|
|||
#define BMBVH_USE_CAGE 1 /*project geometry onto modifier cage */
|
||||
#define BMBVH_RETURN_ORIG 2 /*use with BMBVH_USE_CAGE, returns hits in relation to original geometry*/
|
||||
|
||||
#endif /* _EDITBMESH_H */
|
||||
#endif /* __EDITBMESH_BVH_H__ */
|
||||
|
|
|
@ -76,7 +76,6 @@ set(SRC
|
|||
../include/ED_sound.h
|
||||
../include/ED_space_api.h
|
||||
../include/ED_text.h
|
||||
../include/ED_toolmode.h
|
||||
../include/ED_transform.h
|
||||
../include/ED_types.h
|
||||
../include/ED_util.h
|
||||
|
|
|
@ -28,6 +28,9 @@
|
|||
/** \file blender/source/blender/makesrna/intern/rna_mesh_utils.h
|
||||
* \ingroup RNA
|
||||
*/
|
||||
|
||||
#ifndef __RNA_MESH_UTILS_H__
|
||||
#define __RNA_MESH_UTILS_H__
|
||||
|
||||
/* Macros to help reduce code clutter in rna_mesh.c */
|
||||
|
||||
|
@ -103,3 +106,5 @@
|
|||
CustomData_set_layer_##active_type(data, layer_type, value); \
|
||||
mesh_update_customdata_pointers(me, TRUE); \
|
||||
}
|
||||
|
||||
#endif /* __RNA_MESH_UTILS_H__ */
|
||||
|
|
Loading…
Reference in New Issue