diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-24 00:18:09 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-24 00:18:09 +0400 |
commit | 7ff77ed4ea7c6d8fb8b2e75320175b9cbd6ff20a (patch) | |
tree | fcdb22c3f2fa64e08a6cf8182b80405ab0e141f9 /source/blender/editors | |
parent | 402a9d59383d68bff72b3c9da3e53f3e5abcd578 (diff) |
code cleanup: use zero_v3
Diffstat (limited to 'source/blender/editors')
8 files changed, 31 insertions, 31 deletions
diff --git a/source/blender/editors/mesh/bmesh_tools.c b/source/blender/editors/mesh/bmesh_tools.c index 2860886eaec..d587ecfbf24 100644 --- a/source/blender/editors/mesh/bmesh_tools.c +++ b/source/blender/editors/mesh/bmesh_tools.c @@ -322,7 +322,7 @@ static short EDBM_Extrude_edge(Object *obedit, BMEditMesh *em, const char hflag, BMO_op_exec(bm, &extop); - nor[0] = nor[1] = nor[2] = 0.0f; + zero_v3(nor); BMO_ITER(ele, &siter, bm, &extop, "geomout", BM_ALL) { BM_elem_select_set(bm, ele, TRUE); @@ -337,11 +337,11 @@ static short EDBM_Extrude_edge(Object *obedit, BMEditMesh *em, const char hflag, BMO_op_finish(bm, &extop); - if (nor[0] == 0.0f && nor[1] == 0.0f && nor[2] == 0.0f) return 'g'; // grab - return 'n'; // normal constraint - + /* grab / normal constraint */ + return is_zero_v3(nor) ? 'g' : 'n'; } -static short EDBM_Extrude_vert(Object *obedit, BMEditMesh *em, const char hflag, float *nor) + +static short EDBM_Extrude_vert(Object *obedit, BMEditMesh *em, const char hflag, float nor[3]) { BMIter iter; BMEdge *eed; @@ -435,7 +435,7 @@ static int EDBM_Extrude_Mesh(Scene *scene, Object *obedit, BMEditMesh *em, wmOpe float stacknor[3] = {0.0f, 0.0f, 0.0f}; float *nor = norin ? norin : stacknor; - nor[0] = nor[1] = nor[2] = 0.0f; + zero_v3(nor); if (em->selectmode & SCE_SELECT_VERTEX) { if (em->bm->totvertsel == 0) nr = 0; @@ -482,12 +482,12 @@ static int EDBM_Extrude_Mesh(Scene *scene, Object *obedit, BMEditMesh *em, wmOpe } else { - /* We need to force immediate calculation here because - * transform may use derived objects (which are now stale). - * - * This shouldn't be necessary, derived queries should be - * automatically building this data if invalid. Or something. - */ + /* We need to force immediate calculation here because + * transform may use derived objects (which are now stale). + * + * This shouldn't be necessary, derived queries should be + * automatically building this data if invalid. Or something. + */ // DAG_object_flush_update(scene, obedit, OB_RECALC_DATA); object_handle_update(scene, obedit); diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c index 13294a3e240..6c0df7a2076 100644 --- a/source/blender/editors/object/object_hook.c +++ b/source/blender/editors/object/object_hook.c @@ -178,7 +178,7 @@ static int return_editlattice_indexar(Lattice *editlatt, int *tot, int **indexar *indexar= index= MEM_mallocN(4*totvert, "hook indexar"); *tot= totvert; nr= 0; - cent[0]= cent[1]= cent[2]= 0.0; + zero_v3(cent); a= editlatt->pntsu*editlatt->pntsv*editlatt->pntsw; bp= editlatt->def; @@ -251,7 +251,7 @@ static int return_editcurve_indexar(Object *obedit, int *tot, int **indexar, flo *indexar= index= MEM_mallocN(4*totvert, "hook indexar"); *tot= totvert; nr= 0; - cent[0]= cent[1]= cent[2]= 0.0; + zero_v3(cent); for(nu= editnurb->first; nu; nu= nu->next) { if(nu->type == CU_BEZIER) { diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 49216310713..6b3e80e9224 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -1599,7 +1599,7 @@ static void draw_bgpic(Scene *scene, ARegion *ar, View3D *v3d) asp= ( (float)ibuf->y)/(float)ibuf->x; - vec[0] = vec[1] = vec[2] = 0.0; + zero_v3(vec); ED_view3d_project_float_v2(ar, vec, sco, rv3d->persmat); cx = sco[0]; cy = sco[1]; diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c index 6e5a3b2dc54..819d3e0ca4a 100644 --- a/source/blender/editors/space_view3d/view3d_fly.c +++ b/source/blender/editors/space_view3d/view3d_fly.c @@ -314,7 +314,7 @@ static int initFlyInfo(bContext *C, FlyInfo *fly, wmOperator *op, wmEvent *event #ifdef NDOF_FLY_DRAW_TOOMUCH fly->redraw= 1; #endif - fly->dvec_prev[0] = fly->dvec_prev[1] = fly->dvec_prev[2] = 0.0f; + zero_v3(fly->dvec_prev); fly->timer = WM_event_add_timer(CTX_wm_manager(C), win, TIMER, 0.01f); diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index 55cc5af493e..1cc63e02c5d 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -225,7 +225,7 @@ static void make_trans_verts(Object *obedit, float *min, float *max, int mode) tottrans= 0; // global! INIT_MINMAX(min, max); - centroid[0]=centroid[1]=centroid[2]= 0.0; + zero_v3(centroid); if (obedit->type==OB_MESH) { Mesh *me= obedit->data; @@ -874,7 +874,7 @@ static int snap_curs_to_sel(bContext *C, wmOperator *UNUSED(op)) count= 0; INIT_MINMAX(min, max); - centroid[0]= centroid[1]= centroid[2]= 0.0; + zero_v3(centroid); if (obedit) { tottrans=0; diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 5174c832ac4..b3d41150a31 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -807,7 +807,7 @@ void ED_view3d_project_float_v3(ARegion *ar, const float vec[3], float adr[3], f adr[2] = vec4[2]/vec4[3]; } else { - adr[0] = adr[1] = adr[2] = 0.0f; + zero_v3(adr); } } diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index 9188d048154..c9dfd3464d9 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -287,8 +287,8 @@ int calc_manipulator_stats(const bContext *C) rv3d->twdrawflag= 0xFFFF; /* transform widget centroid/center */ - scene->twcent[0]= scene->twcent[1]= scene->twcent[2]= 0.0f; INIT_MINMAX(scene->twmin, scene->twmax); + zero_v3(scene->twcent); if(obedit) { ob= obedit; @@ -1104,20 +1104,19 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving, static void drawsolidcube(float size) { static float cube[8][3] = { - {-1.0, -1.0, -1.0}, - {-1.0, -1.0, 1.0}, - {-1.0, 1.0, 1.0}, - {-1.0, 1.0, -1.0}, - { 1.0, -1.0, -1.0}, - { 1.0, -1.0, 1.0}, - { 1.0, 1.0, 1.0}, - { 1.0, 1.0, -1.0}, }; - float n[3]; + {-1.0, -1.0, -1.0}, + {-1.0, -1.0, 1.0}, + {-1.0, 1.0, 1.0}, + {-1.0, 1.0, -1.0}, + { 1.0, -1.0, -1.0}, + { 1.0, -1.0, 1.0}, + { 1.0, 1.0, 1.0}, + { 1.0, 1.0, -1.0}, }; + float n[3] = {0.0f}; glPushMatrix(); glScalef(size, size, size); - n[0]=0; n[1]=0; n[2]=0; glBegin(GL_QUADS); n[0]= -1.0; glNormal3fv(n); diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index 76fa08e0702..10f1e34d6e7 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -699,7 +699,8 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3], } else if (em->bm->totvertsel > 3) { BMIter iter; - normal[0] = normal[1] = normal[2] = 0.0f; + + zero_v3(normal); BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) { |