[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43926] branches/bmesh/blender/source/ blender/bmesh: Code Style: more code style edits.
Campbell Barton
ideasman42 at gmail.com
Mon Feb 6 07:04:07 CET 2012
Revision: 43926
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43926
Author: campbellbarton
Date: 2012-02-06 06:03:46 +0000 (Mon, 06 Feb 2012)
Log Message:
-----------
Code Style: more code style edits.
Modified Paths:
--------------
branches/bmesh/blender/source/blender/bmesh/bmesh.h
branches/bmesh/blender/source/blender/bmesh/bmesh_class.h
branches/bmesh/blender/source/blender/bmesh/bmesh_error.h
branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h
branches/bmesh/blender/source/blender/bmesh/bmesh_operators.h
branches/bmesh/blender/source/blender/bmesh/bmesh_queries.h
branches/bmesh/blender/source/blender/bmesh/bmesh_walkers.h
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_structure.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_to_editmesh.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/bmesh/blender/source/blender/bmesh/operators/bmesh_dupeops.c
branches/bmesh/blender/source/blender/bmesh/operators/connectops.c
branches/bmesh/blender/source/blender/bmesh/operators/createops.c
branches/bmesh/blender/source/blender/bmesh/operators/dissolveops.c
branches/bmesh/blender/source/blender/bmesh/operators/edgesplitop.c
branches/bmesh/blender/source/blender/bmesh/operators/extrudeops.c
branches/bmesh/blender/source/blender/bmesh/operators/join_triangles.c
branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
branches/bmesh/blender/source/blender/bmesh/operators/removedoubles.c
branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.h
branches/bmesh/blender/source/blender/bmesh/operators/utils.c
branches/bmesh/blender/source/blender/bmesh/tools/BME_bevel.c
branches/bmesh/blender/source/blender/bmesh/tools/BME_duplicate.c
branches/bmesh/blender/source/blender/bmesh/tools/BME_weld.c
Modified: branches/bmesh/blender/source/blender/bmesh/bmesh.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh.h 2012-02-06 05:18:08 UTC (rev 43925)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh.h 2012-02-06 06:03:46 UTC (rev 43926)
@@ -311,11 +311,11 @@
/*convert between bmesh and Mesh flags*/
short BMFlags_To_MEFlags(void *element);
-/*convert between Mesh and bmesh flags
- type must be BM_VERT/BM_EDGE/BM_FACE,
- and represents the type of the element
- parameter (the three defines map to
- MVert, MEdge, and MPoly, respectively).*/
+/* convert between Mesh and bmesh flags
+ * type must be BM_VERT/BM_EDGE/BM_FACE,
+ * and represents the type of the element
+ * parameter (the three defines map to
+ * MVert, MEdge, and MPoly, respectively). */
char MEFlags_To_BMFlags(const short hflag, const char htype);
#endif
Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_class.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh_class.h 2012-02-06 05:18:08 UTC (rev 43925)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_class.h 2012-02-06 06:03:46 UTC (rev 43926)
@@ -47,7 +47,7 @@
iteration.
*/
typedef struct BMHeader {
- void *data; /*customdata layers*/
+ void *data; /* customdata layers */
struct BMFlagLayer *flags;
int index; /* notes:
* - Use BM_GetIndex/SetIndex macros for index
@@ -56,8 +56,8 @@
* this is abused by various tools which set it dirty.
* - For loops this is used for sorting during tesselation. */
- char htype; /*element geometric type (verts/edges/loops/faces)*/
- char hflag; /*this would be a CD layer, see below*/
+ char htype; /* element geometric type (verts/edges/loops/faces) */
+ char hflag; /* this would be a CD layer, see below */
} BMHeader;
/*note: need some way to specify custom locations for custom data layers. so we can
@@ -94,10 +94,10 @@
struct BMLoop *radial_next, *radial_prev;
/*private variables*/
- struct BMLoop *next, *prev; /*won't be able to use listbase API, ger, due to head*/
+ struct BMLoop *next, *prev; /* won't be able to use listbase API, ger, due to head */
} BMLoop;
-/*eventually, this structure will be used for supporting holes in faces*/
+/* eventually, this structure will be used for supporting holes in faces */
typedef struct BMLoopList {
struct BMLoopList *next, *prev;
struct BMLoop *first, *last;
@@ -154,9 +154,9 @@
BMFace *act_face;
ListBase errorstack;
- struct Object *ob; /*owner object*/
+ struct Object *ob; /* owner object */
- int opflag; /*current operator flag*/
+ int opflag; /* current operator flag */
} BMesh;
BMFace *BM_Copy_Face(BMesh *bm, BMFace *f, int copyedges, int copyverts);
Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_error.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh_error.h 2012-02-06 05:18:08 UTC (rev 43925)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_error.h 2012-02-06 06:03:46 UTC (rev 43926)
@@ -3,16 +3,16 @@
/*----------- bmop error system ----------*/
-/*pushes an error onto the bmesh error stack.
- if msg is null, then the default message for the errorcode is used.*/
+/* pushes an error onto the bmesh error stack.
+ * if msg is null, then the default message for the errorcode is used.*/
void BMO_RaiseError(BMesh *bm, BMOperator *owner, int errcode, const char *msg);
-/*gets the topmost error from the stack.
- returns error code or 0 if no error.*/
+/* gets the topmost error from the stack.
+ * returns error code or 0 if no error.*/
int BMO_GetError(BMesh *bm, const char **msg, BMOperator **op);
int BMO_HasError(BMesh *bm);
-/*same as geterror, only pops the error off the stack as well*/
+/* same as geterror, only pops the error off the stack as well */
int BMO_PopError(BMesh *bm, const char **msg, BMOperator **op);
void BMO_ClearStack(BMesh *bm);
@@ -20,9 +20,9 @@
//this is meant for handling errors, like self-intersection test failures.
//it's dangerous to handle errors in general though, so disabled for now.
-/*catches an error raised by the op pointed to by catchop.
- errorcode is either the errorcode, or BMERR_ALL for any
- error.*/
+/* catches an error raised by the op pointed to by catchop.
+ * errorcode is either the errorcode, or BMERR_ALL for any
+ * error.*/
int BMO_CatchOpError(BMesh *bm, BMOperator *catchop, int errorcode, char **msg);
#endif
Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h 2012-02-06 05:18:08 UTC (rev 43925)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h 2012-02-06 06:03:46 UTC (rev 43926)
@@ -76,18 +76,18 @@
int slottype;
int len;
int flag;
- int index; /*index within slot array*/
+ int index; /* index within slot array */
union {
int i;
- float f;
- void *p;
+ float f;
+ void *p;
float vec[3];
void *buf;
GHash *ghash;
} data;
} BMOpSlot;
-#define BMOP_MAX_SLOTS 16 /*way more than probably needed*/
+#define BMOP_MAX_SLOTS 16 /* way more than probably needed */
#ifdef slots
#undef slots
@@ -163,8 +163,8 @@
void BMO_ClearFlag(struct BMesh *bm, void *element, int flag);
int BMO_TestFlag(struct BMesh *bm, void *element, int flag);*/
-/*count the number of elements with a specific flag. type
- can be a bitmask of BM_FACE, BM_EDGE, or BM_FACE.*/
+/* count the number of elements with a specific flag.
+ * type can be a bitmask of BM_FACE, BM_EDGE, or BM_FACE. */
int BMO_CountFlag(struct BMesh *bm, int flag, const char htype);
/*---------formatted operator initialization/execution-----------*/
@@ -209,23 +209,23 @@
/*executes an operator*/
int BMO_CallOpf(BMesh *bm, const char *fmt, ...);
-/*initializes, but doesn't execute an operator. this is so you can
- gain access to the outputs of the operator. note that you have
- to execute/finitsh (BMO_Exec_Op and BMO_Finish_Op) yourself.*/
+/* initializes, but doesn't execute an operator. this is so you can
+ * gain access to the outputs of the operator. note that you have
+ * to execute/finitsh (BMO_Exec_Op and BMO_Finish_Op) yourself. */
int BMO_InitOpf(BMesh *bm, BMOperator *op, const char *fmt, ...);
-/*va_list version, used to implement the above two functions,
- plus EDBM_CallOpf in bmeshutils.c.*/
+/* va_list version, used to implement the above two functions,
+ * plus EDBM_CallOpf in bmeshutils.c. */
int BMO_VInitOpf(BMesh *bm, BMOperator *op, const char *fmt, va_list vlist);
-/*test whether a named slot exists*/
+/* test whether a named slot exists */
int BMO_HasSlot(struct BMOperator *op, const char *slotname);
-/*get a pointer to a slot. this may be removed layer on from the public API.*/
+/* get a pointer to a slot. this may be removed layer on from the public API. */
BMOpSlot *BMO_GetSlot(struct BMOperator *op, const char *slotname);
-/*copies the data of a slot from one operator to another. src and dst are the
- source/destination slot codes, respectively.*/
+/* copies the data of a slot from one operator to another. src and dst are the
+ * source/destination slot codes, respectively. */
void BMO_CopySlot(struct BMOperator *source_op, struct BMOperator *dest_op,
const char *src, const char *dst);
@@ -242,119 +242,120 @@
void BMO_Set_Int(struct BMOperator *op, const char *slotname, int i);
int BMO_Get_Int(BMOperator *op, const char *slotname);
-/*don't pass in arrays that are supposed to map to elements this way.
-
- so, e.g. passing in list of floats per element in another slot is bad.
- passing in, e.g. pointer to an editmesh for the conversion operator is fine
- though.*/
+/* don't pass in arrays that are supposed to map to elements this way.
+ *
+ * so, e.g. passing in list of floats per element in another slot is bad.
+ * passing in, e.g. pointer to an editmesh for the conversion operator is fine
+ * though. */
void BMO_Set_Pnt(struct BMOperator *op, const char *slotname, void *p);
void *BMO_Get_Pnt(BMOperator *op, const char *slotname);
void BMO_Set_Vec(struct BMOperator *op, const char *slotname, const float vec[3]);
void BMO_Get_Vec(BMOperator *op, const char *slotname, float r_vec[3]);
-/*only supports square mats*/
-/*size must be 3 or 4; this api is meant only for transformation matrices.
- note that internally the matrix is stored in 4x4 form, and it's safe to
- call whichever BMO_Get_Mat* function you want.*/
+/* only supports square mats */
+/* size must be 3 or 4; this api is meant only for transformation matrices.
+ * note that internally the matrix is stored in 4x4 form, and it's safe to
+ * call whichever BMO_Get_Mat* function you want. */
void BMO_Set_Mat(struct BMOperator *op, const char *slotname, float *mat, int size);
void BMO_Get_Mat4(struct BMOperator *op, const char *slotname, float mat[4][4]);
void BMO_Get_Mat3(struct BMOperator *op, const char *slotname, float mat[3][3]);
void BMO_Clear_Flag_All(BMesh *bm, BMOperator *op, const char htype, int flag);
-/*puts every element of type type (which is a bitmask) with tool flag flag,
- into a slot.*/
+/* puts every element of type type (which is a bitmask) with tool flag flag,
+ * into a slot. */
void BMO_Flag_To_Slot(struct BMesh *bm, struct BMOperator *op, const char *slotname, const int flag, const char htype);
-/*tool-flags all elements inside an element slot array with flag flag.*/
+/* tool-flags all elements inside an element slot array with flag flag. */
void BMO_Flag_Buffer(struct BMesh *bm, struct BMOperator *op, const char *slotname, const int hflag, const char htype);
-/*clears tool-flag flag from all elements inside a slot array.*/
+/* clears tool-flag flag from all elements inside a slot array. */
void BMO_Unflag_Buffer(struct BMesh *bm, struct BMOperator *op, const char *slotname, const int flag, const char htype);
-/*tool-flags all elements inside an element slot array with flag flag.*/
+/* tool-flags all elements inside an element slot array with flag flag. */
void BMO_HeaderFlag_Buffer(struct BMesh *bm, struct BMOperator *op, const char *slotname, const char hflag, const char htype);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list