diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-09-06 04:33:59 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-06 04:33:59 +0400 |
commit | d75a66674d17e2f4b1250b63ddb42b431135265c (patch) | |
tree | 1e2007535ec4a11cbd3671e8c02a4f0a1e1cbbf3 /source/blender/editors | |
parent | 20b84ec37c68ce1f9b1a82815f8c7cb7b5e7f7f3 (diff) |
code cleanup: remove deprecated defines and some struct members
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/armature/reeb.c | 2 | ||||
-rw-r--r-- | source/blender/editors/armature/reeb.h | 4 | ||||
-rw-r--r-- | source/blender/editors/include/ED_mesh.h | 3 | ||||
-rw-r--r-- | source/blender/editors/include/ED_render.h | 8 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_intern.h | 2 | ||||
-rw-r--r-- | source/blender/editors/uvedit/uvedit_intern.h | 4 |
6 files changed, 4 insertions, 19 deletions
diff --git a/source/blender/editors/armature/reeb.c b/source/blender/editors/armature/reeb.c index ce4e1db23b5..00f88a69fb6 100644 --- a/source/blender/editors/armature/reeb.c +++ b/source/blender/editors/armature/reeb.c @@ -3272,7 +3272,7 @@ ReebGraph *BIF_ReebGraphFromEditMesh(void) freeEdgeIndex(&indexed_edges); #ifdef DEBUG_REEB - weightToVCol(em, 1); +// weightToVCol(em, 1); #endif rg = generateReebGraph(em, G.scene->toolsettings->skgen_resolution); diff --git a/source/blender/editors/armature/reeb.h b/source/blender/editors/armature/reeb.h index d71e80ca0ca..bb8b3003baf 100644 --- a/source/blender/editors/armature/reeb.h +++ b/source/blender/editors/armature/reeb.h @@ -146,9 +146,9 @@ struct EdgeIndex; int weightToHarmonic(struct EditMesh *em, struct EdgeIndex *indexed_edges); int weightFromDistance(struct EditMesh *em, struct EdgeIndex *indexed_edges); int weightFromLoc(struct EditMesh *me, int axis); -void weightToVCol(struct EditMesh *em, int index); +//void weightToVCol(struct EditMesh *em, int index); void arcToVCol(struct ReebGraph *rg, struct EditMesh *em, int index); -void angleToVCol(struct EditMesh *em, int index); +//void angleToVCol(struct EditMesh *em, int index); void renormalizeWeight(struct EditMesh *em, float newmax); ReebGraph *generateReebGraph(struct EditMesh *me, int subdivisions); diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h index da440063552..c25401d570f 100644 --- a/source/blender/editors/include/ED_mesh.h +++ b/source/blender/editors/include/ED_mesh.h @@ -141,9 +141,6 @@ void EDBM_uv_vert_map_free(struct UvVertMap *vmap); struct UvMapVert *EDBM_uv_vert_map_at_index(struct UvVertMap *vmap, unsigned int v); struct UvVertMap *EDBM_uv_vert_map_create(struct BMEditMesh *em, int selected, int do_face_idx_array, const float limit[2]); -void EDBM_data_layer_add(struct BMEditMesh *em, struct CustomData *data, int type, const char *name); -void EDBM_data_layer_free(struct BMEditMesh *em, struct CustomData *data, int type); - void EDBM_select_toggle_all(struct BMEditMesh *em); void EDBM_select_swap(struct BMEditMesh *em); /* exported for UV */ int EDBM_select_interior_faces(struct BMEditMesh *em); diff --git a/source/blender/editors/include/ED_render.h b/source/blender/editors/include/ED_render.h index 7891315be9f..39e2c28a61a 100644 --- a/source/blender/editors/include/ED_render.h +++ b/source/blender/editors/include/ED_render.h @@ -56,18 +56,12 @@ void ED_render_scene_update(struct Main *bmain, struct Scene *scene, int updated typedef struct RenderInfo { int pr_rectx; int pr_recty; - short curtile, tottile, status; + short curtile, tottile; rcti disprect; /* storage for view3d preview rect */ unsigned int *rect; struct Render *re; /* persistent render */ } RenderInfo; -/* ri->status */ -#define PR_DBASE 1 -#define PR_DISPRECT 2 -#define PR_PROJECTED 4 -#define PR_ROTATED 8 - /* Render the preview * * pr_method: diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h index f5c3a4c4d89..935bd13fcfc 100644 --- a/source/blender/editors/space_sequencer/sequencer_intern.h +++ b/source/blender/editors/space_sequencer/sequencer_intern.h @@ -118,8 +118,6 @@ void SEQUENCER_OT_paste(struct wmOperatorType *ot); void SEQUENCER_OT_rebuild_proxy(struct wmOperatorType *ot); -void SEQUENCER_OT_update_strip_length(struct wmOperatorType *ot); - /* preview specific operators */ void SEQUENCER_OT_view_all_preview(struct wmOperatorType *ot); diff --git a/source/blender/editors/uvedit/uvedit_intern.h b/source/blender/editors/uvedit/uvedit_intern.h index d258d271833..f0ff79ae25e 100644 --- a/source/blender/editors/uvedit/uvedit_intern.h +++ b/source/blender/editors/uvedit/uvedit_intern.h @@ -46,10 +46,6 @@ struct BMLoop; struct BMEdge; struct BMVert; -/* id can be from 0 to 3 */ -#define TF_PIN_MASK(id) (TF_PIN1 << id) -#define TF_SEL_MASK(id) (TF_SEL1 << id) - /* visibility and selection */ int uvedit_face_visible_nolocal(struct Scene *scene, struct BMFace *efa); |