[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43947] branches/bmesh/blender: Style Cleanup: whitespace and some formatting.
Campbell Barton
ideasman42 at gmail.com
Tue Feb 7 09:50:40 CET 2012
Revision: 43947
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43947
Author: campbellbarton
Date: 2012-02-07 08:50:24 +0000 (Tue, 07 Feb 2012)
Log Message:
-----------
Style Cleanup: whitespace and some formatting.
Modified Paths:
--------------
branches/bmesh/blender/build_files/cmake/cmake_static_check_cppcheck.py
branches/bmesh/blender/source/blender/bmesh/bmesh.h
branches/bmesh/blender/source/blender/bmesh/bmesh_iterators.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/intern/bmesh_construct.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_opdefines.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_queries.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_structure.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/bmesh/blender/source/blender/bmesh/operators/bevel.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/mirror.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/triangulateop.c
branches/bmesh/blender/source/blender/bmesh/operators/utils.c
branches/bmesh/blender/source/blender/bmesh/tools/BME_bevel.c
Modified: branches/bmesh/blender/build_files/cmake/cmake_static_check_cppcheck.py
===================================================================
--- branches/bmesh/blender/build_files/cmake/cmake_static_check_cppcheck.py 2012-02-07 06:53:19 UTC (rev 43946)
+++ branches/bmesh/blender/build_files/cmake/cmake_static_check_cppcheck.py 2012-02-07 08:50:24 UTC (rev 43947)
@@ -49,8 +49,8 @@
check_commands = []
for c, inc_dirs, defs in source_info:
- if not 'bevel' in c: continue
- if 'MOD' in c: continue
+ # if not 'bevel' in c: continue
+ # if 'MOD' in c: continue
cmd = ([CHECKER_BIN] +
CHECKER_ARGS +
[c] +
Modified: branches/bmesh/blender/source/blender/bmesh/bmesh.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh.h 2012-02-07 06:53:19 UTC (rev 43946)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh.h 2012-02-07 08:50:24 UTC (rev 43947)
@@ -39,20 +39,20 @@
/*
* short introduction:
- *
+ *
* the bmesh structure is a boundary representation, supporting non-manifold
* locally modifiable topology. the API is designed to allow clean, maintainable
* code, that never (or almost never) directly inspects the underlying structure.
- *
+ *
* The API includes iterators, including many useful topological iterators;
* walkers, which walk over a mesh, without the risk of hitting the recursion
* limit; operators, which are logical, reusable mesh modules; topological
* modification functions (like split face, join faces, etc), which are used for
* topological manipulations; and some (not yet finished) geometric utility
* functions.
- *
+ *
* some definitions:
- *
+ *
* tool flags: private flags for tools. each operator has it's own private
* tool flag "layer", which it can use to flag elements.
* tool flags are also used by various other parts of the api.
@@ -265,7 +265,7 @@
/* projects a single loop, target, onto source for customdata interpolation. multires is handled.
* if do_vertex is true, target's vert data will also get interpolated.*/
-void BM_loop_interp_from_face(BMesh *bm, BMLoop *target, BMFace *source,
+void BM_loop_interp_from_face(BMesh *bm, BMLoop *target, BMFace *source,
int do_vertex, int do_multires);
/* smoothes boundaries between multires grids, including some borders in adjacent faces */
Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_iterators.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh_iterators.h 2012-02-07 06:53:19 UTC (rev 43946)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_iterators.h 2012-02-07 08:50:24 UTC (rev 43947)
@@ -22,9 +22,9 @@
/*
* BMESH ITERATORS
- *
- * The functions and structures in this file
- * provide a unified method for iterating over
+ *
+ * The functions and structures in this file
+ * provide a unified method for iterating over
* the elements of a mesh and answering simple
* adjacency queries. Tool authors should use
* the iterators provided in this file instead
@@ -58,8 +58,8 @@
#define BM_VERTS_OF_FACE 8
#define BM_EDGES_OF_FACE 9
#define BM_LOOPS_OF_FACE 10
-/* returns elements from all boundaries, and returns
- * the first element at the end to flag that we're entering
+/* returns elements from all boundaries, and returns
+ * the first element at the end to flag that we're entering
* a different face hole boundary*/
#define BM_ALL_LOOPS_OF_FACE 11
Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h 2012-02-07 06:53:19 UTC (rev 43946)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h 2012-02-07 08:50:24 UTC (rev 43947)
@@ -36,36 +36,36 @@
#include <string.h> /* for memcpy */
/*
- * operators represent logical, executable mesh modules. all topological
+ * operators represent logical, executable mesh modules. all topological
* operations involving a bmesh has to go through them.
- *
- * operators are nested, as are tool flags, which are private to an operator
+ *
+ * operators are nested, as are tool flags, which are private to an operator
* when it's executed. tool flags are allocated in layers, one per operator
* execution, and are used for all internal flagging a tool needs to do.
- *
+ *
* each operator has a series of "slots," which can be of the following types:
* - simple numerical types
* - arrays of elements (e.g. arrays of faces).
* - hash mappings.
- *
- * each slot is identified by a slot code, as are each operator.
- * operators, and their slots, are defined in bmesh_opdefines.c (with their
+ *
+ * each slot is identified by a slot code, as are each operator.
+ * operators, and their slots, are defined in bmesh_opdefines.c (with their
* execution functions prototyped in bmesh_operators_private.h), with all their
* operator code and slot codes defined in bmesh_operators.h. see
* bmesh_opdefines.c and the BMOpDefine struct for how to define new operators.
- *
+ *
* in general, operators are fed arrays of elements, created using either
* BM_HeaderFlag_To_Slot or BM_Flag_To_Slot (or through one of the format
* specifyers in BMO_CallOpf or BMO_InitOpf). Note that multiple element
* types (e.g. faces and edges) can be fed to the same slot array. Operators
* act on this data, and possibly spit out data into output slots.
- *
+ *
* some notes:
* - operators should never read from header flags (e.g. element->head.flag). for
* example, if you want an operator to only operate on selected faces, you
* should use BM_HeaderFlag_To_Slot to put the selected elements into a slot.
- * - when you read from an element slot array or mapping, you can either tool-flag
- * all the elements in it, or read them using an iterator APi (which is
+ * - when you read from an element slot array or mapping, you can either tool-flag
+ * all the elements in it, or read them using an iterator APi (which is
* semantically similar to the iterator api in bmesh_iterators.h).
*/
@@ -73,14 +73,14 @@
/* slot type arrays are terminated by the last member
* having a slot type of 0.*/
-#define BMOP_OPSLOT_SENTINEL 0
+#define BMOP_OPSLOT_SENTINEL 0
#define BMOP_OPSLOT_INT 1
#define BMOP_OPSLOT_FLT 2
#define BMOP_OPSLOT_PNT 3
#define BMOP_OPSLOT_MAT 4
#define BMOP_OPSLOT_VEC 7
-/* after BMOP_OPSLOT_VEC, everything is
+/* after BMOP_OPSLOT_VEC, everything is
* dynamically allocated arrays. we
* leave a space in the identifiers
@@ -88,8 +88,8 @@
*/
//it's very important this remain a power of two
#define BMOP_OPSLOT_ELEMENT_BUF 8
-#define BMOP_OPSLOT_MAPPING 9
-#define BMOP_OPSLOT_TYPES 10
+#define BMOP_OPSLOT_MAPPING 9
+#define BMOP_OPSLOT_TYPES 10
/* please ignore all these structures, don't touch them in tool code, except
* for when your defining an operator with BMOpDefine.*/
@@ -109,7 +109,7 @@
} 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
@@ -136,7 +136,7 @@
const char *name;
BMOSlotType slottypes[BMOP_MAX_SLOTS];
void (*exec)(BMesh *bm, BMOperator *op);
- int flag;
+ int flag;
} BMOpDefine;
/*BMOpDefine->flag*/
@@ -157,23 +157,23 @@
void BMO_Init_Op(struct BMesh *bm, struct BMOperator *op, const char *opname);
-/* executes an operator, pushing and popping a new tool flag
+/* executes an operator, pushing and popping a new tool flag
* layer as appropriate.*/
void BMO_Exec_Op(struct BMesh *bm, struct BMOperator *op);
-/* finishes an operator (though note the operator's tool flag is removed
+/* finishes an operator (though note the operator's tool flag is removed
* after it finishes executing in BMO_Exec_Op).*/
void BMO_Finish_Op(struct BMesh *bm, struct BMOperator *op);
-/* tool flag API. never, ever ever should tool code put junk in
- * header flags (element->head.flag), nor should they use
+/* tool flag API. never, ever ever should tool code put junk in
+ * header flags (element->head.flag), nor should they use
* element->head.eflag1/eflag2. instead, use this api to set
* flags.
- *
+ *
* if you need to store a value per element, use a
* ghash or a mapping slot to do it. */
-
+
/* flags 15 and 16 (1<<14 and 1<<15) are reserved for bmesh api use */
#define BMO_TestFlag(bm, element, flag) (((BMHeader*)(element))->flags[bm->stackdepth-1].f & (flag))
#define BMO_SetFlag(bm, element, flag) (((BMHeader*)(element))->flags[bm->stackdepth-1].f |= (flag))
@@ -199,7 +199,7 @@
*
* the basic format for the format string is:
* [operatorname] [slotname]=%[code] [slotname]=%[code]
- *
+ *
* as in printf, you pass in one additional argument to the function
* for every code.
*
@@ -248,7 +248,7 @@
/* 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,
+void BMO_CopySlot(struct BMOperator *source_op, struct BMOperator *dest_op,
const char *src, const char *dst);
/*remove tool flagged elements*/
@@ -320,11 +320,11 @@
/* inserts a key/value mapping into a mapping slot. note that it copies the
* value, it doesn't store a reference to it. */
-//BM_INLINE void BMO_Insert_Mapping(BMesh *bm, BMOperator *op, const char *slotname,
+//BM_INLINE void BMO_Insert_Mapping(BMesh *bm, BMOperator *op, const char *slotname,
//void *element, void *data, int len);
/* inserts a key/float mapping pair into a mapping slot. */
-//BM_INLINE void BMO_Insert_MapFloat(BMesh *bm, BMOperator *op, const char *slotname,
+//BM_INLINE void BMO_Insert_MapFloat(BMesh *bm, BMOperator *op, const char *slotname,
//void *element, float val);
//returns 1 if the specified pointer is in the map.
@@ -338,15 +338,15 @@
/* flags all elements in a mapping. note that the mapping must only have
* bmesh elements in it.*/
-void BMO_Mapping_To_Flag(struct BMesh *bm, struct BMOperator *op,
- const char *slotname, int flag);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list