[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56022] trunk/blender/source/blender: code cleanup: rename BKE_tessmesh -> BKE_editmesh, rename EditDerivedBMesh .tc -> em.
Campbell Barton
ideasman42 at gmail.com
Sat Apr 13 22:31:56 CEST 2013
Revision: 56022
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56022
Author: campbellbarton
Date: 2013-04-13 20:31:52 +0000 (Sat, 13 Apr 2013)
Log Message:
-----------
code cleanup: rename BKE_tessmesh -> BKE_editmesh, rename EditDerivedBMesh.tc -> em. ('tc' is odd name which isn't used elsewhere).
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/anim.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/editderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/key.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
trunk/blender/source/blender/blenkernel/intern/multires.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c
trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
trunk/blender/source/blender/bmesh/tools/BME_bevel.c
trunk/blender/source/blender/editors/mesh/editface.c
trunk/blender/source/blender/editors/mesh/editmesh_add.c
trunk/blender/source/blender/editors/mesh/editmesh_bevel.c
trunk/blender/source/blender/editors/mesh/editmesh_bvh.c
trunk/blender/source/blender/editors/mesh/editmesh_extrude.c
trunk/blender/source/blender/editors/mesh/editmesh_inset.c
trunk/blender/source/blender/editors/mesh/editmesh_knife.c
trunk/blender/source/blender/editors/mesh/editmesh_knife_project.c
trunk/blender/source/blender/editors/mesh/editmesh_loopcut.c
trunk/blender/source/blender/editors/mesh/editmesh_rip.c
trunk/blender/source/blender/editors/mesh/editmesh_select.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/mesh/editmesh_utils.c
trunk/blender/source/blender/editors/mesh/mesh_data.c
trunk/blender/source/blender/editors/mesh/mesh_navmesh.c
trunk/blender/source/blender/editors/mesh/meshtools.c
trunk/blender/source/blender/editors/object/object_edit.c
trunk/blender/source/blender/editors/object/object_hook.c
trunk/blender/source/blender/editors/object/object_modifier.c
trunk/blender/source/blender/editors/object/object_relations.c
trunk/blender/source/blender/editors/object/object_transform.c
trunk/blender/source/blender/editors/object/object_vgroup.c
trunk/blender/source/blender/editors/render/render_shading.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt_uv.c
trunk/blender/source/blender/editors/space_image/image_edit.c
trunk/blender/source/blender/editors/space_image/space_image.c
trunk/blender/source/blender/editors/space_info/info_stats.c
trunk/blender/source/blender/editors/space_view3d/drawmesh.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
trunk/blender/source/blender/editors/space_view3d/view3d_header.c
trunk/blender/source/blender/editors/space_view3d/view3d_select.c
trunk/blender/source/blender/editors/space_view3d/view3d_snap.c
trunk/blender/source/blender/editors/transform/transform.h
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/transform/transform_generics.c
trunk/blender/source/blender/editors/transform/transform_manipulator.c
trunk/blender/source/blender/editors/transform/transform_orientations.c
trunk/blender/source/blender/editors/transform/transform_snap.c
trunk/blender/source/blender/editors/util/crazyspace.c
trunk/blender/source/blender/editors/uvedit/uvedit_buttons.c
trunk/blender/source/blender/editors/uvedit/uvedit_draw.c
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
trunk/blender/source/blender/makesrna/intern/rna_mesh.c
trunk/blender/source/blender/makesrna/intern/rna_object.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/modifiers/intern/MOD_laplaciansmooth.c
trunk/blender/source/blender/modifiers/intern/MOD_meshdeform.c
trunk/blender/source/blender/modifiers/intern/MOD_triangulate.c
trunk/blender/source/blender/python/bmesh/bmesh_py_api.c
trunk/blender/source/blender/python/bmesh/bmesh_py_types.c
trunk/blender/source/blender/python/bmesh/bmesh_py_types_select.c
Added Paths:
-----------
trunk/blender/source/blender/blenkernel/BKE_editmesh.h
Removed Paths:
-------------
trunk/blender/source/blender/blenkernel/BKE_tessmesh.h
Copied: trunk/blender/source/blender/blenkernel/BKE_editmesh.h (from rev 56021, trunk/blender/source/blender/blenkernel/BKE_tessmesh.h)
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_editmesh.h (rev 0)
+++ trunk/blender/source/blender/blenkernel/BKE_editmesh.h 2013-04-13 20:31:52 UTC (rev 56022)
@@ -0,0 +1,94 @@
+/*
+ * ***** 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_EDITMESH_H__
+#define __BKE_EDITMESH_H__
+
+#include "BKE_customdata.h"
+#include "bmesh.h"
+
+struct BMesh;
+struct BMLoop;
+struct BMFace;
+struct Mesh;
+struct DerivedMesh;
+
+/* ok: the EDBM module is for editmode bmesh stuff. in contrast, the
+ * BMEdit module is for code shared with blenkernel that concerns
+ * the BMEditMesh structure.
+ */
+
+/* this structure replaces EditMesh.
+ *
+ * through this, you get access to both the edit 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,
+ * and not BMesh. Mesh->edit_bmesh stores a pointer to this structure. */
+typedef struct BMEditMesh {
+ struct BMesh *bm;
+
+ /*this is for undoing failed operations*/
+ struct BMEditMesh *emcopy;
+ int emcopyusers;
+
+ /* we store tessellations as triplets of three loops,
+ * which each define a triangle.*/
+ struct BMLoop *(*looptris)[3];
+ int tottri;
+
+ /*derivedmesh stuff*/
+ struct DerivedMesh *derivedFinal, *derivedCage;
+ CustomDataMask lastDataMask;
+ unsigned char (*derivedVertColor)[4];
+ int derivedVertColorLen;
+
+ /* index tables, to map indices to elements via
+ * EDBM_index_arrays_init and associated functions. don't
+ * touch this or read it directly.*/
+ struct BMVert **vert_index;
+ struct BMEdge **edge_index;
+ struct BMFace **face_index;
+
+ /*selection mode*/
+ short selectmode;
+ short mat_nr;
+
+ /* Object this editmesh came from (if it came from one) */
+ struct Object *ob;
+
+ /* Unused for now, we could bring it back and assign in the same way 'ob' is */
+ // struct Mesh *me;
+
+ /*temp variables for x-mirror editing*/
+ int mirror_cdlayer; /* -1 is invalid */
+} BMEditMesh;
+
+void BMEdit_RecalcTessellation(BMEditMesh *em);
+BMEditMesh *BMEdit_Create(BMesh *bm, const bool do_tessellate);
+BMEditMesh *BMEdit_Copy(BMEditMesh *em);
+BMEditMesh *BMEdit_FromObject(struct Object *ob);
+void BMEdit_Free(BMEditMesh *em);
+void BMEdit_UpdateLinkedCustomData(BMEditMesh *em);
+
+#endif /* __BKE_EDITMESH_H__ */
Deleted: trunk/blender/source/blender/blenkernel/BKE_tessmesh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_tessmesh.h 2013-04-13 20:20:21 UTC (rev 56021)
+++ trunk/blender/source/blender/blenkernel/BKE_tessmesh.h 2013-04-13 20:31:52 UTC (rev 56022)
@@ -1,94 +0,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.
- *
- * Contributor(s): Joseph Eagar.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#ifndef __BKE_TESSMESH_H__
-#define __BKE_TESSMESH_H__
-
-#include "BKE_customdata.h"
-#include "bmesh.h"
-
-struct BMesh;
-struct BMLoop;
-struct BMFace;
-struct Mesh;
-struct DerivedMesh;
-
-/* ok: the EDBM module is for editmode bmesh stuff. in contrast, the
- * BMEdit module is for code shared with blenkernel that concerns
- * the BMEditMesh structure.
- */
-
-/* this structure replaces EditMesh.
- *
- * through this, you get access to both the edit 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,
- * and not BMesh. Mesh->edit_bmesh stores a pointer to this structure. */
-typedef struct BMEditMesh {
- struct BMesh *bm;
-
- /*this is for undoing failed operations*/
- struct BMEditMesh *emcopy;
- int emcopyusers;
-
- /* we store tessellations as triplets of three loops,
- * which each define a triangle.*/
- struct BMLoop *(*looptris)[3];
- int tottri;
-
- /*derivedmesh stuff*/
- struct DerivedMesh *derivedFinal, *derivedCage;
- CustomDataMask lastDataMask;
- unsigned char (*derivedVertColor)[4];
- int derivedVertColorLen;
-
- /* index tables, to map indices to elements via
- * EDBM_index_arrays_init and associated functions. don't
- * touch this or read it directly.*/
- struct BMVert **vert_index;
- struct BMEdge **edge_index;
- struct BMFace **face_index;
-
- /*selection mode*/
- short selectmode;
- short mat_nr;
-
- /* Object this editmesh came from (if it came from one) */
- struct Object *ob;
-
- /* Unused for now, we could bring it back and assign in the same way 'ob' is */
- // struct Mesh *me;
-
- /*temp variables for x-mirror editing*/
- int mirror_cdlayer; /* -1 is invalid */
-} BMEditMesh;
-
-void BMEdit_RecalcTessellation(BMEditMesh *em);
-BMEditMesh *BMEdit_Create(BMesh *bm, const bool do_tessellate);
-BMEditMesh *BMEdit_Copy(BMEditMesh *em);
-BMEditMesh *BMEdit_FromObject(struct Object *ob);
-void BMEdit_Free(BMEditMesh *em);
-void BMEdit_UpdateLinkedCustomData(BMEditMesh *em);
-
-#endif /* __BKE_TESSMESH_H__ */
Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt 2013-04-13 20:20:21 UTC (rev 56021)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt 2013-04-13 20:31:52 UTC (rev 56022)
@@ -236,7 +236,7 @@
BKE_speaker.h
BKE_subsurf.h
BKE_suggestions.h
- BKE_tessmesh.h
+ BKE_editmesh.h
BKE_text.h
BKE_texture.h
BKE_tracking.h
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2013-04-13 20:20:21 UTC (rev 56021)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2013-04-13 20:31:52 UTC (rev 56022)
@@ -63,7 +63,7 @@
#include "BKE_multires.h"
#include "BKE_armature.h"
#include "BKE_particle.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
#include "BKE_bvhutils.h"
#include "BKE_deform.h"
#include "BKE_global.h" /* For debug flag, DM_update_tessface_data() func. */
Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim.c 2013-04-13 20:20:21 UTC (rev 56021)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c 2013-04-13 20:31:52 UTC (rev 56022)
@@ -65,7 +65,7 @@
#include "BKE_object.h"
#include "BKE_particle.h"
#include "BKE_scene.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
#include "BKE_depsgraph.h"
#include "BKE_anim.h"
#include "BKE_report.h"
Modified: trunk/blender/source/blender/blenkernel/intern/bvhutils.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/bvhutils.c 2013-04-13 20:20:21 UTC (rev 56021)
+++ trunk/blender/source/blender/blenkernel/intern/bvhutils.c 2013-04-13 20:31:52 UTC (rev 56022)
@@ -41,7 +41,7 @@
#include "BLI_math.h"
#include "BKE_DerivedMesh.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
#include "MEM_guardedalloc.h"
Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2013-04-13 20:20:21 UTC (rev 56021)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2013-04-13 20:31:52 UTC (rev 56022)
@@ -50,7 +50,7 @@
#include "BKE_global.h"
#include "BKE_mesh.h"
#include "BKE_paint.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
#include "BKE_curve.h"
#include "DNA_mesh_types.h"
Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/constraint.c 2013-04-13 20:20:21 UTC (rev 56021)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c 2013-04-13 20:31:52 UTC (rev 56022)
@@ -81,7 +81,7 @@
#include "BKE_mesh.h"
#include "BKE_shrinkwrap.h"
#include "BKE_mesh.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
#include "BKE_tracking.h"
#include "BKE_movieclip.h"
Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2013-04-13 20:20:21 UTC (rev 56021)
+++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2013-04-13 20:31:52 UTC (rev 56022)
@@ -59,7 +59,7 @@
#include "GPU_material.h"
/* bmesh */
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
#include "BLI_array.h"
#include "BLI_scanfill.h"
@@ -365,8 +365,7 @@
typedef struct EditDerivedBMesh {
DerivedMesh dm;
- Object *ob;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list