[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55812] trunk/blender/source/blender/ editors: code cleanup: use bool's for vgroup and editmode.
Campbell Barton
ideasman42 at gmail.com
Fri Apr 5 16:58:31 CEST 2013
Revision: 55812
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55812
Author: campbellbarton
Date: 2013-04-05 14:58:30 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
code cleanup: use bool's for vgroup and editmode.
Modified Paths:
--------------
trunk/blender/source/blender/editors/include/ED_mesh.h
trunk/blender/source/blender/editors/include/ED_view3d.h
trunk/blender/source/blender/editors/mesh/editface.c
trunk/blender/source/blender/editors/mesh/editmesh_select.c
trunk/blender/source/blender/editors/mesh/editmesh_utils.c
trunk/blender/source/blender/editors/mesh/mesh_data.c
trunk/blender/source/blender/editors/object/object_vgroup.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
Modified: trunk/blender/source/blender/editors/include/ED_mesh.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_mesh.h 2013-04-05 13:34:32 UTC (rev 55811)
+++ trunk/blender/source/blender/editors/include/ED_mesh.h 2013-04-05 14:58:30 UTC (rev 55812)
@@ -114,19 +114,19 @@
void undo_push_mesh(struct bContext *C, const char *name);
-int EDBM_vert_color_check(struct BMEditMesh *em);
+bool EDBM_vert_color_check(struct BMEditMesh *em);
-void EDBM_mesh_hide(struct BMEditMesh *em, int swap);
+void EDBM_mesh_hide(struct BMEditMesh *em, bool swap);
void EDBM_mesh_reveal(struct BMEditMesh *em);
void EDBM_update_generic(struct BMEditMesh *em, const bool do_tessface, const bool is_destructive);
-struct UvElementMap *EDBM_uv_element_map_create(struct BMEditMesh *em, int selected, int doIslands);
+struct UvElementMap *EDBM_uv_element_map_create(struct BMEditMesh *em, const bool selected, const bool do_islands);
void EDBM_uv_element_map_free(struct UvElementMap *vmap);
struct UvElement *ED_uv_element_get(struct UvElementMap *map, struct BMFace *efa, struct BMLoop *l);
-int EDBM_mtexpoly_check(struct BMEditMesh *em);
-struct MTexPoly *EDBM_mtexpoly_active_get(struct BMEditMesh *em, struct BMFace **r_act_efa, int sloppy, int selected);
+bool EDBM_mtexpoly_check(struct BMEditMesh *em);
+struct MTexPoly *EDBM_mtexpoly_active_get(struct BMEditMesh *em, struct BMFace **r_act_efa, const bool sloppy, const bool selected);
void EDBM_uv_vert_map_free(struct UvVertMap *vmap);
struct UvMapVert *EDBM_uv_vert_map_at_index(struct UvVertMap *vmap, unsigned int v);
@@ -138,7 +138,7 @@
/* editmesh_select.c */
void EDBM_select_mirrored(struct Object *obedit, struct BMEditMesh *em, bool extend);
-void EDBM_automerge(struct Scene *scene, struct Object *ob, int update);
+void EDBM_automerge(struct Scene *scene, struct Object *ob, bool update);
bool EDBM_backbuf_border_init(struct ViewContext *vc, short xmin, short ymin, short xmax, short ymax);
int EDBM_backbuf_check(unsigned int index);
@@ -170,7 +170,7 @@
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);
+bool EDBM_select_interior_faces(struct BMEditMesh *em);
void em_setup_viewcontext(struct bContext *C, struct ViewContext *vc); /* rename? */
extern unsigned int bm_vertoffs, bm_solidoffs, bm_wireoffs;
@@ -192,7 +192,7 @@
void paintface_select_linked(struct bContext *C, struct Object *ob, const int mval[2], int mode);
bool paintface_minmax(struct Object *ob, float r_min[3], float r_max[3]);
-void paintface_hide(struct Object *ob, const int unselected);
+void paintface_hide(struct Object *ob, const bool unselected);
void paintface_reveal(struct Object *ob);
void paintvert_deselect_all_visible(struct Object *ob, int action, bool flush_flags);
@@ -223,13 +223,14 @@
void ED_vgroup_delete(struct Object *ob, struct bDeformGroup *defgroup);
void ED_vgroup_clear(struct Object *ob);
void ED_vgroup_select_by_name(struct Object *ob, const char *name);
-int ED_vgroup_data_create(struct ID *id);
+bool ED_vgroup_data_create(struct ID *id);
void ED_vgroup_data_clamp_range(struct ID *id, const int total);
-int ED_vgroup_give_array(struct ID *id, struct MDeformVert **dvert_arr, int *dvert_tot);
-int ED_vgroup_copy_array(struct Object *ob, struct Object *ob_from);
-void ED_vgroup_mirror(struct Object *ob, const short mirror_weights, const short flip_vgroups, const short all_vgroups);
+bool ED_vgroup_give_array(struct ID *id, struct MDeformVert **dvert_arr, int *dvert_tot);
+bool ED_vgroup_copy_array(struct Object *ob, struct Object *ob_from);
+void ED_vgroup_mirror(struct Object *ob,
+ const bool mirror_weights, const bool flip_vgroups, const bool all_vgroups);
-int ED_vgroup_object_is_edit_mode(struct Object *ob);
+bool ED_vgroup_object_is_edit_mode(struct Object *ob);
void ED_vgroup_vert_add(struct Object *ob, struct bDeformGroup *dg, int vertnum, float weight, int assignmode);
void ED_vgroup_vert_remove(struct Object *ob, struct bDeformGroup *dg, int vertnum);
@@ -253,13 +254,13 @@
void ED_mesh_calc_tessface(struct Mesh *mesh);
void ED_mesh_update(struct Mesh *mesh, struct bContext *C, int calc_edges, int calc_tessface);
-int ED_mesh_uv_texture_add(struct Mesh *me, const char *name, const bool active_set);
+int ED_mesh_uv_texture_add(struct Mesh *me, const char *name, const bool active_set);
bool ED_mesh_uv_texture_remove_index(struct Mesh *me, const int n);
bool ED_mesh_uv_texture_remove_active(struct Mesh *me);
bool ED_mesh_uv_texture_remove_named(struct Mesh *me, const char *name);
-int ED_mesh_uv_loop_reset(struct bContext *C, struct Mesh *me);
-int ED_mesh_uv_loop_reset_ex(struct Mesh *me, const int layernum);
-int ED_mesh_color_add(struct Mesh *me, const char *name, const bool active_set);
+void ED_mesh_uv_loop_reset(struct bContext *C, struct Mesh *me);
+void ED_mesh_uv_loop_reset_ex(struct Mesh *me, const int layernum);
+int ED_mesh_color_add(struct Mesh *me, const char *name, const bool active_set);
bool ED_mesh_color_remove_index(struct Mesh *me, const int n);
bool ED_mesh_color_remove_active(struct Mesh *me);
bool ED_mesh_color_remove_named(struct Mesh *me, const char *name);
Modified: trunk/blender/source/blender/editors/include/ED_view3d.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_view3d.h 2013-04-05 13:34:32 UTC (rev 55811)
+++ trunk/blender/source/blender/editors/include/ED_view3d.h 2013-04-05 14:58:30 UTC (rev 55812)
@@ -243,7 +243,7 @@
struct ImBuf *view3d_read_backbuf(struct ViewContext *vc, short xmin, short ymin, short xmax, short ymax);
unsigned int view3d_sample_backbuf_rect(struct ViewContext *vc, const int mval[2], int size,
unsigned int min, unsigned int max, float *dist, short strict,
- void *handle, unsigned int (*indextest)(void *handle, unsigned int index));
+ void *handle, bool (*indextest)(void *handle, unsigned int index));
unsigned int view3d_sample_backbuf(struct ViewContext *vc, int x, int y);
/* draws and does a 4x4 sample */
Modified: trunk/blender/source/blender/editors/mesh/editface.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editface.c 2013-04-05 13:34:32 UTC (rev 55811)
+++ trunk/blender/source/blender/editors/mesh/editface.c 2013-04-05 14:58:30 UTC (rev 55812)
@@ -126,7 +126,7 @@
}
}
-void paintface_hide(Object *ob, const int unselected)
+void paintface_hide(Object *ob, const bool unselected)
{
Mesh *me;
MPoly *mpoly;
Modified: trunk/blender/source/blender/editors/mesh/editmesh_select.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_select.c 2013-04-05 13:34:32 UTC (rev 55811)
+++ trunk/blender/source/blender/editors/mesh/editmesh_select.c 2013-04-05 14:58:30 UTC (rev 55812)
@@ -104,7 +104,7 @@
EDBM_verts_mirror_cache_end(em);
}
-void EDBM_automerge(Scene *scene, Object *obedit, int update)
+void EDBM_automerge(Scene *scene, Object *obedit, bool update)
{
if ((scene->toolsettings->automerge) &&
@@ -377,13 +377,11 @@
-static unsigned int findnearestvert__backbufIndextest(void *handle, unsigned int index)
+static bool findnearestvert__backbufIndextest(void *handle, unsigned int index)
{
BMEditMesh *em = (BMEditMesh *)handle;
BMVert *eve = BM_vert_at_index(em->bm, index - 1);
-
- if (eve && BM_elem_flag_test(eve, BM_ELEM_SELECT)) return 0;
- return 1;
+ return !(eve && BM_elem_flag_test(eve, BM_ELEM_SELECT));
}
/**
* findnearestvert
@@ -2306,7 +2304,7 @@
// if (EM_texFaceCheck())
}
-int EDBM_select_interior_faces(BMEditMesh *em)
+bool EDBM_select_interior_faces(BMEditMesh *em)
{
BMesh *bm = em->bm;
BMIter iter;
@@ -2914,7 +2912,7 @@
}
}
-static int edbm_deselect_nth(BMEditMesh *em, int nth, int offset)
+static bool edbm_deselect_nth(BMEditMesh *em, int nth, int offset)
{
BMVert *v;
BMEdge *e;
@@ -2924,18 +2922,18 @@
if (v) {
walker_deselect_nth(em, nth, offset, &v->head);
- return 1;
+ return true;
}
else if (e) {
walker_deselect_nth(em, nth, offset, &e->head);
- return 1;
+ return true;
}
else if (f) {
walker_deselect_nth(em, nth, offset, &f->head);
- return 1;
+ return true;
}
- return 0;
+ return false;
}
static int edbm_select_nth_exec(bContext *C, wmOperator *op)
@@ -2948,7 +2946,7 @@
/* so input of offset zero ends up being (nth - 1) */
offset = (offset + (nth - 1)) % nth;
- if (edbm_deselect_nth(em, nth, offset) == 0) {
+ if (edbm_deselect_nth(em, nth, offset) == false) {
BKE_report(op->reports, RPT_ERROR, "Mesh has no active vert/edge/face");
return OPERATOR_CANCELLED;
}
Modified: trunk/blender/source/blender/editors/mesh/editmesh_utils.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_utils.c 2013-04-05 13:34:32 UTC (rev 55811)
+++ trunk/blender/source/blender/editors/mesh/editmesh_utils.c 2013-04-05 14:58:30 UTC (rev 55812)
@@ -816,7 +816,7 @@
/* A specialized vert map used by stitch operator */
-UvElementMap *EDBM_uv_element_map_create(BMEditMesh *em, int selected, int do_islands)
+UvElementMap *EDBM_uv_element_map_create(BMEditMesh *em, const bool selected, const bool do_islands)
{
BMVert *ev;
BMFace *efa;
@@ -1070,7 +1070,7 @@
/* last_sel, use em->act_face otherwise get the last selected face in the editselections
* at the moment, last_sel is mainly useful for making sure the space image dosnt flicker */
-MTexPoly *EDBM_mtexpoly_active_get(BMEditMesh *em, BMFace **r_act_efa, int sloppy, int selected)
+MTexPoly *EDBM_mtexpoly_active_get(BMEditMesh *em, BMFace **r_act_efa, const bool sloppy, const bool selected)
{
BMFace *efa = NULL;
@@ -1089,14 +1089,14 @@
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list