[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44483] trunk/blender: Code Cleanup:
Campbell Barton
ideasman42 at gmail.com
Mon Feb 27 14:48:03 CET 2012
Revision: 44483
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44483
Author: campbellbarton
Date: 2012-02-27 13:47:53 +0000 (Mon, 27 Feb 2012)
Log Message:
-----------
Code Cleanup:
* made bmesh_structure.h function names more consistant.
* remove unused code in bmesh_structure.c
* removed 'Edge Flip' operator (missing from bmesh but looked into trunk feature and dont think its worth keeping).
* tagged some BMESH_TODO's
Modified Paths:
--------------
trunk/blender/release/scripts/presets/keyconfig/maya.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
trunk/blender/source/blender/bmesh/bmesh.h
trunk/blender/source/blender/bmesh/bmesh_class.h
trunk/blender/source/blender/bmesh/bmesh_iterators.h
trunk/blender/source/blender/bmesh/bmesh_marking.h
trunk/blender/source/blender/bmesh/bmesh_operator_api.h
trunk/blender/source/blender/bmesh/bmesh_operators.h
trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
trunk/blender/source/blender/bmesh/intern/bmesh_iterators.c
trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
trunk/blender/source/blender/bmesh/intern/bmesh_newcore.c
trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
trunk/blender/source/blender/bmesh/intern/bmesh_structure.c
trunk/blender/source/blender/bmesh/intern/bmesh_structure.h
trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
trunk/blender/source/blender/bmesh/tools/BME_bevel.c
trunk/blender/source/blender/editors/include/ED_mesh.h
trunk/blender/source/blender/editors/include/ED_uvedit.h
trunk/blender/source/blender/editors/include/ED_view3d.h
trunk/blender/source/blender/editors/mesh/bmesh_tools.c
trunk/blender/source/blender/editors/mesh/loopcut.c
trunk/blender/source/blender/editors/mesh/mesh_intern.h
trunk/blender/source/blender/editors/mesh/mesh_ops.c
trunk/blender/source/blender/editors/space_view3d/view3d_intern.h
trunk/blender/source/blender/editors/space_view3d/view3d_select.c
trunk/blender/source/blender/editors/transform/transform.h
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/uvedit/uvedit_intern.h
trunk/blender/source/blender/makesdna/DNA_mesh_types.h
trunk/blender/source/blender/modifiers/intern/MOD_util.h
trunk/blender/source/blender/windowmanager/intern/wm_gesture.c
trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
Modified: trunk/blender/release/scripts/presets/keyconfig/maya.py
===================================================================
--- trunk/blender/release/scripts/presets/keyconfig/maya.py 2012-02-27 12:53:23 UTC (rev 44482)
+++ trunk/blender/release/scripts/presets/keyconfig/maya.py 2012-02-27 13:47:53 UTC (rev 44483)
@@ -333,7 +333,7 @@
kmi = km.keymap_items.new('mesh.beautify_fill', 'F', 'PRESS', shift=True, alt=True)
kmi = km.keymap_items.new('mesh.quads_convert_to_tris', 'T', 'PRESS', ctrl=True)
kmi = km.keymap_items.new('mesh.tris_convert_to_quads', 'J', 'PRESS', alt=True)
-kmi = km.keymap_items.new('mesh.edge_flip', 'F', 'PRESS', shift=True, ctrl=True)
+# kmi = km.keymap_items.new('mesh.edge_flip', 'F', 'PRESS', shift=True, ctrl=True) # removed since bmesh, can be made into something else?
kmi = km.keymap_items.new('mesh.rip_move', 'V', 'PRESS')
kmi = km.keymap_items.new('mesh.merge', 'M', 'PRESS', alt=True)
kmi = km.keymap_items.new('transform.shrink_fatten', 'S', 'PRESS', ctrl=True, alt=True)
Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2012-02-27 12:53:23 UTC (rev 44482)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2012-02-27 13:47:53 UTC (rev 44483)
@@ -1720,7 +1720,6 @@
layout.operator("mesh.quads_convert_to_tris")
layout.operator("mesh.tris_convert_to_quads")
- layout.operator("mesh.edge_flip")
layout.separator()
Modified: trunk/blender/source/blender/bmesh/bmesh.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh.h 2012-02-27 12:53:23 UTC (rev 44482)
+++ trunk/blender/source/blender/bmesh/bmesh.h 2012-02-27 13:47:53 UTC (rev 44483)
@@ -62,14 +62,7 @@
*/
/*forward declarations*/
-struct BMesh;
-struct BMVert;
-struct BMEdge;
-struct BMFace;
-struct BMLoop;
-struct BMOperator;
struct Mesh;
-struct EditMesh;
/*
* BMHeader
@@ -216,7 +209,7 @@
* the nl member to a loop in the newly created edge.*/
BMFace *BM_face_split(BMesh *bm, BMFace *f,
BMVert *v1, BMVert *v2,
- struct BMLoop **nl, BMEdge *example);
+ BMLoop **nl, BMEdge *example);
/* these 2 functions are very similar */
BMEdge* BM_vert_collapse_faces(BMesh *bm, BMEdge *ke, BMVert *kv, float fac,
@@ -287,13 +280,13 @@
void BM_vert_interp_from_face(BMesh *bm, BMVert *v, BMFace *source);
void BM_data_interp_from_verts(BMesh *bm, BMVert *v1, BMVert *v2, BMVert *v, const float fac);
-void BM_data_interp_face_vert_edge(BMesh *bm, BMVert *v1, BMVert *v2, BMVert *v, struct BMEdge *e1, const float fac);
+void BM_data_interp_face_vert_edge(BMesh *bm, BMVert *v1, BMVert *v2, BMVert *v, BMEdge *e1, const float fac);
void BM_data_layer_add(BMesh *em, CustomData *data, int type);
void BM_data_layer_add_named(BMesh *bm, CustomData *data, int type, const char *name);
void BM_data_layer_free(BMesh *em, CustomData *data, int type);
void BM_data_layer_free_n(BMesh *bm, CustomData *data, int type, int n);
-float BM_elem_float_data_get(struct CustomData *cd, void *element, int type);
-void BM_elem_float_data_set(struct CustomData *cd, void *element, int type, const float val);
+float BM_elem_float_data_get(CustomData *cd, void *element, int type);
+void BM_elem_float_data_set(CustomData *cd, void *element, int type, const float val);
/* get the area of the face */
float BM_face_area_calc(BMesh *bm, BMFace *f);
Modified: trunk/blender/source/blender/bmesh/bmesh_class.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh_class.h 2012-02-27 12:53:23 UTC (rev 44482)
+++ trunk/blender/source/blender/bmesh/bmesh_class.h 2012-02-27 13:47:53 UTC (rev 44483)
@@ -30,24 +30,23 @@
/* bmesh data structures */
/* dissable holes for now, these are ifdef'd because they use more memory and cant be saved in DNA currently */
-#define USE_BMESH_HOLES
+// #define USE_BMESH_HOLES
struct BMesh;
struct BMVert;
struct BMEdge;
struct BMLoop;
struct BMFace;
-struct BMFlagLayer;
-struct BMLayerType;
-struct BMSubClassLayer;
struct BLI_mempool;
struct Object;
-/*note: it is very important for BMHeader to start with two
- pointers. this is a requirement of mempool's method of
- iteration.
-*/
+/* note: it is very important for BMHeader to start with two
+ * pointers. this is a requirement of mempool's method of
+ * iteration.
+ *
+ * hrm. it doesnt but stull works ok, remove the comment above? - campbell.
+ */
typedef struct BMHeader {
void *data; /* customdata layers */
int index; /* notes:
@@ -99,10 +98,10 @@
struct BMFace *f;
struct BMLoop *radial_next, *radial_prev;
-
+
/* these were originally commented as private but are used all over the code */
/* can't use ListBase API, due to head */
- struct BMLoop *next, *prev;
+ struct BMLoop *next, *prev; /* next/prev verts around the face */
} BMLoop;
/* can cast BMFace/BMEdge/BMVert, but NOT BMLoop, since these dont have a flag layer */
Modified: trunk/blender/source/blender/bmesh/bmesh_iterators.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh_iterators.h 2012-02-27 12:53:23 UTC (rev 44482)
+++ trunk/blender/source/blender/bmesh/bmesh_iterators.h 2012-02-27 13:47:53 UTC (rev 44483)
@@ -94,11 +94,11 @@
typedef struct BMIter {
BLI_mempool_iter pooliter;
- struct BMVert *firstvert, *nextvert, *vdata;
- struct BMEdge *firstedge, *nextedge, *edata;
- struct BMLoop *firstloop, *nextloop, *ldata, *l;
- struct BMFace *firstpoly, *nextpoly, *pdata;
- struct BMesh *bm;
+ BMVert *firstvert, *nextvert, *vdata;
+ BMEdge *firstedge, *nextedge, *edata;
+ BMLoop *firstloop, *nextloop, *ldata, *l;
+ BMFace *firstpoly, *nextpoly, *pdata;
+ BMesh *bm;
void (*begin)(struct BMIter *iter);
void *(*step)(struct BMIter *iter);
union {
@@ -111,8 +111,8 @@
char itype;
} BMIter;
-void *BM_iter_at_index(struct BMesh *bm, const char itype, void *data, int index);
-int BM_iter_as_array(struct BMesh *bm, const char itype, void *data, void **array, const int len);
+void *BM_iter_at_index(BMesh *bm, const char itype, void *data, int index);
+int BM_iter_as_array(BMesh *bm, const char itype, void *data, void **array, const int len);
/* private for bmesh_iterators_inline.c */
void bmiter__vert_of_mesh_begin(struct BMIter *iter);
Modified: trunk/blender/source/blender/bmesh/bmesh_marking.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh_marking.h 2012-02-27 12:53:23 UTC (rev 44482)
+++ trunk/blender/source/blender/bmesh/bmesh_marking.h 2012-02-27 13:47:53 UTC (rev 44483)
@@ -41,7 +41,7 @@
void BM_face_hide_set(BMesh *bm, BMFace *f, int hide);
/* Selection code */
-void BM_elem_select_set(struct BMesh *bm, void *element, int select);
+void BM_elem_select_set(BMesh *bm, void *element, int select);
/* use BM_elem_flag_test(ele, BM_ELEM_SELECT) to test selection */
@@ -50,14 +50,14 @@
/* individual element select functions, BM_elem_select_set is a shortcut for these
* that automatically detects which one to use*/
-void BM_vert_select_set(struct BMesh *bm, struct BMVert *v, int select);
-void BM_edge_select_set(struct BMesh *bm, struct BMEdge *e, int select);
-void BM_face_select_set(struct BMesh *bm, struct BMFace *f, int select);
+void BM_vert_select_set(BMesh *bm, BMVert *v, int select);
+void BM_edge_select_set(BMesh *bm, BMEdge *e, int select);
+void BM_face_select_set(BMesh *bm, BMFace *f, int select);
-void BM_select_mode_set(struct BMesh *bm, int selectmode);
+void BM_select_mode_set(BMesh *bm, int selectmode);
/* counts number of elements with flag set */
-int BM_mesh_count_flag(struct BMesh *bm, const char htype, const char hflag, int respecthide);
+int BM_mesh_count_flag(BMesh *bm, const char htype, const char hflag, int respecthide);
/* edit selection stuff */
void BM_active_face_set(BMesh *em, BMFace *f);
Modified: trunk/blender/source/blender/bmesh/bmesh_operator_api.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh_operator_api.h 2012-02-27 12:53:23 UTC (rev 44482)
+++ trunk/blender/source/blender/bmesh/bmesh_operator_api.h 2012-02-27 13:47:53 UTC (rev 44483)
@@ -140,8 +140,7 @@
int slottype;
int needflag;
int flag;
- struct BMOpSlot slots[BMO_OP_MAX_SLOTS];
- void (*exec)(struct BMesh *bm, struct BMOperator *op);
+ struct BMOpSlot slots[BMO_OP_MAX_SLOTS]; void (*exec)(BMesh *bm, struct BMOperator *op);
MemArena *arena;
} BMOperator;
Modified: trunk/blender/source/blender/bmesh/bmesh_operators.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh_operators.h 2012-02-27 12:53:23 UTC (rev 44482)
+++ trunk/blender/source/blender/bmesh/bmesh_operators.h 2012-02-27 13:47:53 UTC (rev 44483)
@@ -93,10 +93,9 @@
* to get more useful information (such as the mapping from
* original to new elements) you should run the dupe op manually.*/
struct Object;
-struct EditMesh;
#if 0
-void BMO_dupe_from_flag(struct BMesh *bm, int etypeflag, const char hflag);
+void BMO_dupe_from_flag(BMesh *bm, int etypeflag, const char hflag);
#endif
void BM_mesh_esubdivideflag(struct Object *obedit, BMesh *bm, int flag, float smooth,
float fractal, int beauty, int numcuts, int seltype,
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-02-27 12:53:23 UTC (rev 44482)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-02-27 13:47:53 UTC (rev 44483)
@@ -205,7 +205,7 @@
BLI_array_append(edges2, e);
do {
- e2 = bmesh_disk_nextedge(e2, v);
+ e2 = bmesh_disk_edge_next(e2, v);
if (e2 != e && BM_ELEM_API_FLAG_TEST(e2, _FLAG_MF)) {
v = BM_edge_other_vert(e2, v);
break;
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_iterators.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_iterators.c 2012-02-27 12:53:23 UTC (rev 44482)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list