[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44607] trunk/blender/source: style cleanup

Campbell Barton ideasman42 at gmail.com
Fri Mar 2 17:06:02 CET 2012


Revision: 44607
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44607
Author:   campbellbarton
Date:     2012-03-02 16:05:54 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
style cleanup
- spelling - turns out we had tessellation spelt wrong all over.
- use \directive for doxy (not @directive)
- remove BLI_sparsemap.h - was from bmesh merge IIRC but entire file commented and not used.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h
    trunk/blender/source/blender/blenkernel/BKE_cdderivedmesh.h
    trunk/blender/source/blender/blenkernel/BKE_idcode.h
    trunk/blender/source/blender/blenkernel/BKE_mesh.h
    trunk/blender/source/blender/blenkernel/BKE_tessmesh.h
    trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
    trunk/blender/source/blender/blenkernel/intern/anim.c
    trunk/blender/source/blender/blenkernel/intern/anim_sys.c
    trunk/blender/source/blender/blenkernel/intern/bvhutils.c
    trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
    trunk/blender/source/blender/blenkernel/intern/constraint.c
    trunk/blender/source/blender/blenkernel/intern/displist.c
    trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
    trunk/blender/source/blender/blenkernel/intern/fcurve.c
    trunk/blender/source/blender/blenkernel/intern/fmodifier.c
    trunk/blender/source/blender/blenkernel/intern/mesh.c
    trunk/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
    trunk/blender/source/blender/blenkernel/intern/nla.c
    trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c
    trunk/blender/source/blender/blenkernel/intern/softbody.c
    trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
    trunk/blender/source/blender/blenlib/BLI_dlrbTree.h
    trunk/blender/source/blender/blenlib/BLI_dynstr.h
    trunk/blender/source/blender/blenlib/BLI_ghash.h
    trunk/blender/source/blender/blenlib/BLI_graph.h
    trunk/blender/source/blender/blenlib/BLI_gsqueue.h
    trunk/blender/source/blender/blenlib/BLI_math_geom.h
    trunk/blender/source/blender/blenlib/BLI_path_util.h
    trunk/blender/source/blender/blenlib/BLI_rand.h
    trunk/blender/source/blender/blenlib/BLI_rect.h
    trunk/blender/source/blender/blenlib/BLI_scanfill.h
    trunk/blender/source/blender/blenlib/BLI_string.h
    trunk/blender/source/blender/blenlib/BLI_vfontdata.h
    trunk/blender/source/blender/blenlib/CMakeLists.txt
    trunk/blender/source/blender/blenlib/PIL_time.h
    trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
    trunk/blender/source/blender/blenlib/intern/DLRB_tree.c
    trunk/blender/source/blender/blenlib/intern/fileops.c
    trunk/blender/source/blender/blenlib/intern/math_matrix.c
    trunk/blender/source/blender/blenlib/intern/path_util.c
    trunk/blender/source/blender/blenlib/intern/string_utf8.c
    trunk/blender/source/blender/blenloader/BLO_readfile.h
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/blenloader/intern/writefile.c
    trunk/blender/source/blender/blenpluginapi/documentation.h
    trunk/blender/source/blender/bmesh/bmesh_class.h
    trunk/blender/source/blender/bmesh/bmesh_error.h
    trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c
    trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
    trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
    trunk/blender/source/blender/bmesh/operators/bmo_mesh_conv.c
    trunk/blender/source/blender/bmesh/tools/BME_bevel.c
    trunk/blender/source/blender/collada/AnimationExporter.cpp
    trunk/blender/source/blender/collada/DocumentImporter.cpp
    trunk/blender/source/blender/collada/DocumentImporter.h
    trunk/blender/source/blender/editors/animation/anim_channels_defines.c
    trunk/blender/source/blender/editors/animation/anim_channels_edit.c
    trunk/blender/source/blender/editors/animation/anim_deps.c
    trunk/blender/source/blender/editors/animation/anim_markers.c
    trunk/blender/source/blender/editors/animation/fmodifier_ui.c
    trunk/blender/source/blender/editors/animation/keyframes_draw.c
    trunk/blender/source/blender/editors/animation/keyframing.c
    trunk/blender/source/blender/editors/armature/poseSlide.c
    trunk/blender/source/blender/editors/armature/poseobject.c
    trunk/blender/source/blender/editors/gpencil/drawgpencil.c
    trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c
    trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
    trunk/blender/source/blender/editors/include/BIF_glutil.h
    trunk/blender/source/blender/editors/include/ED_anim_api.h
    trunk/blender/source/blender/editors/include/ED_view3d.h
    trunk/blender/source/blender/editors/interface/interface_regions.c
    trunk/blender/source/blender/editors/interface/interface_templates.c
    trunk/blender/source/blender/editors/interface/view2d.c
    trunk/blender/source/blender/editors/interface/view2d_ops.c
    trunk/blender/source/blender/editors/mesh/bmesh_tools.c
    trunk/blender/source/blender/editors/mesh/bmesh_utils.c
    trunk/blender/source/blender/editors/mesh/editmesh_bvh.c
    trunk/blender/source/blender/editors/mesh/meshtools.c
    trunk/blender/source/blender/editors/object/object_add.c
    trunk/blender/source/blender/editors/object/object_modifier.c
    trunk/blender/source/blender/editors/physics/physics_fluid.c
    trunk/blender/source/blender/editors/screen/glutil.c
    trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
    trunk/blender/source/blender/editors/space_action/action_draw.c
    trunk/blender/source/blender/editors/space_action/action_select.c
    trunk/blender/source/blender/editors/space_clip/clip_graph_draw.c
    trunk/blender/source/blender/editors/space_file/fsmenu.h
    trunk/blender/source/blender/editors/space_graph/graph_buttons.c
    trunk/blender/source/blender/editors/space_graph/graph_draw.c
    trunk/blender/source/blender/editors/space_graph/graph_edit.c
    trunk/blender/source/blender/editors/space_graph/graph_select.c
    trunk/blender/source/blender/editors/space_info/info_ops.c
    trunk/blender/source/blender/editors/space_nla/nla_edit.c
    trunk/blender/source/blender/editors/space_outliner/outliner_edit.c
    trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c
    trunk/blender/source/blender/editors/space_text/text_ops.c
    trunk/blender/source/blender/editors/space_view3d/drawarmature.c
    trunk/blender/source/blender/editors/space_view3d/drawobject.c
    trunk/blender/source/blender/editors/transform/transform.c
    trunk/blender/source/blender/editors/transform/transform_conversions.c
    trunk/blender/source/blender/editors/transform/transform_generics.c
    trunk/blender/source/blender/editors/util/undo.c
    trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
    trunk/blender/source/blender/gpu/intern/gpu_extensions.c
    trunk/blender/source/blender/ikplugin/intern/itasc_plugin.cpp
    trunk/blender/source/blender/imbuf/IMB_imbuf.h
    trunk/blender/source/blender/imbuf/intern/IMB_metadata.h
    trunk/blender/source/blender/imbuf/intern/dds/PixelFormat.h
    trunk/blender/source/blender/imbuf/intern/imbuf_cocoa.m
    trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.h
    trunk/blender/source/blender/imbuf/intern/tiff.c
    trunk/blender/source/blender/makesdna/DNA_curve_types.h
    trunk/blender/source/blender/makesdna/DNA_material_types.h
    trunk/blender/source/blender/makesdna/DNA_mesh_types.h
    trunk/blender/source/blender/makesdna/DNA_meshdata_types.h
    trunk/blender/source/blender/makesdna/DNA_texture_types.h
    trunk/blender/source/blender/makesrna/intern/rna_mesh_api.c
    trunk/blender/source/blender/makesrna/intern/rna_scene.c
    trunk/blender/source/blender/nodes/shader/node_shader_tree.c
    trunk/blender/source/blender/render/intern/include/pixelshading.h
    trunk/blender/source/blender/render/intern/include/shadbuf.h
    trunk/blender/source/blender/render/intern/source/convertblender.c
    trunk/blender/source/blender/render/intern/source/pixelshading.c
    trunk/blender/source/blender/render/intern/source/shadeinput.c
    trunk/blender/source/blender/render/intern/source/shadeoutput.c
    trunk/blender/source/blender/render/intern/source/voxeldata.c
    trunk/blender/source/blender/render/intern/source/zbuf.c
    trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
    trunk/blender/source/gameengine/Converter/BL_MeshDeformer.cpp
    trunk/blender/source/gameengine/Expressions/ListValue.h
    trunk/blender/source/gameengine/Expressions/PyObjectPlus.cpp
    trunk/blender/source/gameengine/Expressions/Value.h
    trunk/blender/source/gameengine/GameLogic/SCA_ISensor.h
    trunk/blender/source/gameengine/GameLogic/SCA_JoystickSensor.h
    trunk/blender/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    trunk/blender/source/gameengine/GamePlayer/common/GPC_Canvas.h
    trunk/blender/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h
    trunk/blender/source/gameengine/GamePlayer/common/GPC_MouseDevice.h
    trunk/blender/source/gameengine/GamePlayer/common/GPC_RawImage.h
    trunk/blender/source/gameengine/GamePlayer/common/GPC_RenderTools.h
    trunk/blender/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h
    trunk/blender/source/gameengine/Ketsji/KX_Camera.h
    trunk/blender/source/gameengine/Ketsji/KX_GameObject.h
    trunk/blender/source/gameengine/Ketsji/KX_IPhysicsController.cpp
    trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.h
    trunk/blender/source/gameengine/Ketsji/KX_MouseFocusSensor.h
    trunk/blender/source/gameengine/Ketsji/KX_PolygonMaterial.h
    trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
    trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
    trunk/blender/source/gameengine/Ketsji/KX_Scene.h
    trunk/blender/source/gameengine/Ketsji/KX_TimeCategoryLogger.h
    trunk/blender/source/gameengine/Ketsji/KX_TimeLogger.h
    trunk/blender/source/gameengine/Network/NG_NetworkScene.h
    trunk/blender/source/gameengine/PyDoc/API_intro.py
    trunk/blender/source/gameengine/PyDoc/PhysicsConstraints.py
    trunk/blender/source/gameengine/PyDoc/VideoTexture.py
    trunk/blender/source/gameengine/Rasterizer/RAS_FramingManager.h
    trunk/blender/source/gameengine/Rasterizer/RAS_ICanvas.h
    trunk/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
    trunk/blender/source/gameengine/Rasterizer/RAS_IRasterizer.h
    trunk/blender/source/gameengine/Rasterizer/RAS_IRenderTools.h
    trunk/blender/source/gameengine/SceneGraph/SG_BBox.h
    trunk/blender/source/gameengine/SceneGraph/SG_Controller.cpp
    trunk/blender/source/gameengine/SceneGraph/SG_Controller.h
    trunk/blender/source/gameengine/SceneGraph/SG_Node.h
    trunk/blender/source/gameengine/SceneGraph/SG_ParentRelation.h
    trunk/blender/source/gameengine/SceneGraph/SG_Tree.h
    trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp
    trunk/blender/source/tools/spell_check_source.py

Removed Paths:
-------------
    trunk/blender/source/blender/blenlib/BLI_sparsemap.h

Modified: trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h	2012-03-02 15:14:42 UTC (rev 44606)
+++ trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h	2012-03-02 16:05:54 UTC (rev 44607)
@@ -133,8 +133,8 @@
 	/* calculate vert and face normals */
 	void (*calcNormals)(DerivedMesh *dm);
 
-	/* recalculates mesh tesselation */
-	void (*recalcTesselation)(DerivedMesh *dm);
+	/* recalculates mesh tessellation */
+	void (*recalcTessellation)(DerivedMesh *dm);
 
 	/* Misc. Queries */
 
@@ -407,19 +407,19 @@
 	void (*release)(DerivedMesh *dm);
 };
 
-/* utility function to initialise a DerivedMesh's function pointers to
+/* utility function to initialize a DerivedMesh's function pointers to
  * the default implementation (for those functions which have a default)
  */
 void DM_init_funcs(DerivedMesh *dm);
 
-/* utility function to initialise a DerivedMesh for the desired number
+/* utility function to initialize a DerivedMesh for the desired number
  * of vertices, edges and faces (doesn't allocate memory for them, just
  * sets up the custom data layers)
  */
 void DM_init(DerivedMesh *dm, DerivedMeshType type, int numVerts, int numEdges, 
              int numFaces, int numLoops, int numPolys);
 
-/* utility function to initialise a DerivedMesh for the desired number
+/* utility function to initialize a DerivedMesh for the desired number
  * of vertices, edges and faces, with a layer setup copied from source
  */
 void DM_from_template(DerivedMesh *dm, DerivedMesh *source,

Modified: trunk/blender/source/blender/blenkernel/BKE_cdderivedmesh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_cdderivedmesh.h	2012-03-02 15:14:42 UTC (rev 44606)
+++ trunk/blender/source/blender/blenkernel/BKE_cdderivedmesh.h	2012-03-02 16:05:54 UTC (rev 44607)
@@ -106,13 +106,13 @@
  */
 void CDDM_calc_edges_tessface(struct DerivedMesh *dm);
 
-/* same as CDDM_calc_edges_tessface only makes edges from ngon faces instead of tesselation
+/* same as CDDM_calc_edges_tessface only makes edges from ngon faces instead of tessellation
    faces*/
 void CDDM_calc_edges(struct DerivedMesh *dm);
 
 /* reconstitute face triangulation */
-void CDDM_recalc_tesselation(struct DerivedMesh *dm);
-void CDDM_recalc_tesselation_ex(struct DerivedMesh *dm, const int do_face_nor_cpy);
+void CDDM_recalc_tessellation(struct DerivedMesh *dm);
+void CDDM_recalc_tessellation_ex(struct DerivedMesh *dm, const int do_face_nor_cpy);
 
 /* lowers the number of vertices/edges/faces in a CDDerivedMesh
  * the layer data stays the same size

Modified: trunk/blender/source/blender/blenkernel/BKE_idcode.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_idcode.h	2012-03-02 15:14:42 UTC (rev 44606)
+++ trunk/blender/source/blender/blenkernel/BKE_idcode.h	2012-03-02 16:05:54 UTC (rev 44607)
@@ -35,8 +35,8 @@
 /**
  * Convert an idcode into a name.
  * 
- * @param code The code to convert.
- * @return A static string representing the name of
+ * \param code The code to convert.
+ * \return A static string representing the name of
  * the code.
  */
 const char *BKE_idcode_to_name(int code);
@@ -44,8 +44,8 @@
 /**
  * Convert an idcode into a name (plural).
  * 
- * @param code The code to convert.
- * @return A static string representing the name of
+ * \param code The code to convert.
+ * \return A static string representing the name of
  * the code.
  */
 const char *BKE_idcode_to_name_plural(int code);
@@ -53,32 +53,32 @@
 /**
  * Convert a name into an idcode (ie. ID_SCE)
  * 
- * @param name The name to convert.
- * @return The code for the name, or 0 if invalid.
+ * \param name The name to convert.
+ * \return The code for the name, or 0 if invalid.
  */
 int BKE_idcode_from_name(const char *name);
 
 /**
  * Return non-zero when an ID type is linkable.
  * 
- * @param code The code to check.
- * @return Boolean, 0 when non linkable.
+ * \param code The code to check.
+ * \return Boolean, 0 when non linkable.
  */
 int BKE_idcode_is_linkable(int code);
 
 /**
  * Return if the ID code is a valid ID code.
  * 
- * @param code The code to check.
- * @return Boolean, 0 when invalid.
+ * \param code The code to check.
+ * \return Boolean, 0 when invalid.
  */
 int BKE_idcode_is_valid(int code);
 
 /**
  * Return an ID code and steps the index forward 1.
  *
- * @param index start as 0.
- * @return the code, 0 when all codes have been returned.
+ * \param index start as 0.
+ * \return the code, 0 when all codes have been returned.
  */
 int BKE_idcode_iter_step(int *index);
 

Modified: trunk/blender/source/blender/blenkernel/BKE_mesh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_mesh.h	2012-03-02 15:14:42 UTC (rev 44606)
+++ trunk/blender/source/blender/blenkernel/BKE_mesh.h	2012-03-02 16:05:54 UTC (rev 44607)
@@ -64,19 +64,19 @@
 struct BMesh *BKE_mesh_to_bmesh(struct Mesh *me, struct Object *ob);
 
 /*
- * this function recreates a tesselation.
- * returns number of tesselation faces.
+ * this function recreates a tessellation.
+ * returns number of tessellation faces.
  *
- * use_poly_origindex sets whether or not the tesselation faces' origindex
+ * use_poly_origindex sets whether or not the tessellation faces' origindex
  * layer should point to original poly indices or real poly indices.
  *
- * use_face_origindex sets the tesselation faces' origindex layer
- * to point to the tesselation faces themselves, not the polys.
+ * use_face_origindex sets the tessellation faces' origindex layer
+ * to point to the tessellation faces themselves, not the polys.
  *
  * if both of the above are 0, it'll use the indices of the mpolys of the MPoly
  * data in pdata, and ignore the origindex layer altogether.
  */
-int mesh_recalcTesselation(struct CustomData *fdata, struct CustomData *ldata, struct CustomData *pdata,
+int mesh_recalcTessellation(struct CustomData *fdata, struct CustomData *ldata, struct CustomData *pdata,
                            struct MVert *mvert,
                            int totface, int totloop, int totpoly,
                            const int do_face_normals);
@@ -198,7 +198,7 @@
 
 /* UvElement stores per uv information so that we can quickly access information for a uv.
  * it is actually an improved UvMapVert, including an island and a direct pointer to the face
- * to avoid initialising face arrays */
+ * to avoid initializing face arrays */
 typedef struct UvElement {
 	/* Next UvElement corresponding to same vertex */
 	struct UvElement *next;

Modified: trunk/blender/source/blender/blenkernel/BKE_tessmesh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_tessmesh.h	2012-03-02 15:14:42 UTC (rev 44606)
+++ trunk/blender/source/blender/blenkernel/BKE_tessmesh.h	2012-03-02 16:05:54 UTC (rev 44607)
@@ -40,7 +40,7 @@
 /*this structure replaces EditMesh.
  
   through this, you get access to both the edit bmesh,
-  it's tesselation, and various stuff that doesn't belong in the BMesh
+  it's tessellation, and various stuff that doesn't belong in the BMesh
   struct itself.
   
   the entire derivedmesh and modifier system works with this structure,
@@ -52,7 +52,7 @@
 	struct BMEditMesh *emcopy;
 	int emcopyusers;
 	
-	/*we store tesselations as triplets of three loops,
+	/*we store tessellations as triplets of three loops,
 	  which each define a triangle.*/
 	struct BMLoop *(*looptris)[3];
 	int tottri;
@@ -85,7 +85,7 @@
  * BMESH_TODO, look into having the update elsewhere. */
 #define BMESH_EM_UNDO_RECALC_TESSFACE_WORKAROUND
 
-void BMEdit_RecalcTesselation(BMEditMesh *tm);
+void BMEdit_RecalcTessellation(BMEditMesh *tm);
 BMEditMesh *BMEdit_Create(BMesh *bm, int do_tesselate);
 BMEditMesh *BMEdit_Copy(BMEditMesh *tm);
 BMEditMesh *BMEdit_FromObject(struct Object *ob);

Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2012-03-02 15:14:42 UTC (rev 44606)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2012-03-02 16:05:54 UTC (rev 44607)
@@ -360,7 +360,7 @@
 	const int numPolys =     dm->getNumPolys(dm);
 
 	if ( (numTessFaces == 0) && (numPolys != 0)) {
-		dm->recalcTesselation(dm);
+		dm->recalcTessellation(dm);
 
 		if (dm->getNumTessFaces(dm) != 0) {
 			/* printf("info %s: polys -> ngons calculated\n", __func__); */
@@ -1091,9 +1091,9 @@
 			wtcol_v = calc_weightpaint_vert_array(ob, dm, draw_flag, coba);
 
 		/* Now copy colors in all face verts. */
-		/*first add colors to the tesselation faces*/
+		/*first add colors to the tessellation faces*/
 		/* XXX Why update that layer? We have to update WEIGHT_MLOOPCOL anyway, 
-		 *     and tesselation recreates mface layers from mloop/mpoly ones, so no
+		 *     and tessellation recreates mface layers from mloop/mpoly ones, so no
 		 *     need to fill WEIGHT_MCOL here. */
 #if 0
 		for (i = 0; i < numFaces; i++, mf++, wtcol_f_step += (4 * 4)) {
@@ -1661,7 +1661,7 @@
 		/* calculating normals can re-calculate tessfaces in some cases */
 		int num_tessface = finaldm->getNumTessFaces(finaldm);
 		/* --------------------------------------------------------------------- */
-		/* First calculate the polygon and vertex normals, re-tesselation
+		/* First calculate the polygon and vertex normals, re-tessellation
 		 * copies these into the tessface's normal layer */
 
 
@@ -1673,13 +1673,13 @@
 		finaldm->calcNormals(finaldm);
 #endif
 
-		/* Re-tesselation is necessary to push render data (uvs, textures, colors)
+		/* Re-tessellation is necessary to push render data (uvs, textures, colors)
 		 * from loops and polys onto the tessfaces. This may be currently be
-		 * redundantin cases where the render mode doesn't use these inputs, but
-		 * ideally eventually tesselation would happen on-demand, and this is one
+		 * redundant in cases where the render mode doesn't use these inputs, but
+		 * ideally eventually tessellation would happen on-demand, and this is one
 		 * of the primary places it would be needed. */
 		if (num_tessface == 0 && finaldm->getNumTessFaces(finaldm) == 0) {

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list