diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2007-04-04 17:18:41 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2007-04-04 17:18:41 +0400 |
| commit | afdd54fa3720c267f30e48ed45c449d80449bac0 (patch) | |
| tree | 3192044fa53f6e1fd3d1b0256963c2d4c090d700 /source/blender/src | |
| parent | 203e6ed82b444786d7999e88cebef84d6d429765 (diff) | |
moved source and text to american spelling
* colour -> color
* centre -> center
* normalise -> normalize
* modelling -> modeling
Diffstat (limited to 'source/blender/src')
43 files changed, 268 insertions, 268 deletions
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c index b89ee8b1bd6..3d46c3b4c43 100644 --- a/source/blender/src/buttons_editing.c +++ b/source/blender/src/buttons_editing.c @@ -549,14 +549,14 @@ void do_common_editbuts(unsigned short event) // old name, is a mix of object an if(ELEM3(ob->type, OB_CURVE, OB_SURF, OB_FONT)) tex_space_curve(ob->data); } break; - case B_DOCENTRE: - docentre(0); + case B_DOCENTER: + docenter(0); break; - case B_DOCENTRENEW: - docentre_new(); + case B_DOCENTERNEW: + docenter_new(); break; - case B_DOCENTRECURSOR: - docentre_cursor(); + case B_DOCENTERCURSOR: + docenter_cursor(); break; case B_SETSMOOTH: case B_SETSOLID: @@ -824,9 +824,9 @@ static void editing_panel_mesh_type(Object *ob, Mesh *me) } uiBlockBeginAlign(block); - uiDefBut(block, BUT,B_DOCENTRE, "Center", 10, 80, 65, 19, 0, 0, 0, 0, 0, "Shifts object data to be centered about object's origin"); - uiDefBut(block, BUT,B_DOCENTRENEW, "Center New", 75, 80, 105, 19, 0, 0, 0, 0, 0, "Shifts object's origin to center of object data"); - uiDefBut(block, BUT,B_DOCENTRECURSOR, "Center Cursor", 10, 60, 170, 19, 0, 0, 0, 0, 0, "Shifts object's origin to cursor location"); + uiDefBut(block, BUT,B_DOCENTER, "Center", 10, 80, 65, 19, 0, 0, 0, 0, 0, "Shifts object data to be centered about object's origin"); + uiDefBut(block, BUT,B_DOCENTERNEW, "Center New", 75, 80, 105, 19, 0, 0, 0, 0, 0, "Shifts object's origin to center of object data"); + uiDefBut(block, BUT,B_DOCENTERCURSOR, "Center Cursor", 10, 60, 170, 19, 0, 0, 0, 0, 0, "Shifts object's origin to cursor location"); uiBlockEndAlign(block); uiBlockBeginAlign(block); @@ -2918,9 +2918,9 @@ static void editing_panel_curve_type(Object *ob, Curve *cu) uiDefButBitS(block, TOG, CU_NOPUNOFLIP, REDRAWVIEW3D, "No Puno Flip", 600,140,150,19, &cu->flag, 0, 0, 0, 0, "Don't flip vertex normals while render"); uiBlockBeginAlign(block); - uiDefBut(block, BUT,B_DOCENTRE, "Center", 600, 115, 55, 19, 0, 0, 0, 0, 0, "Shifts object data to be centered about object's origin"); - uiDefBut(block, BUT,B_DOCENTRENEW, "Center New", 655, 115, 95, 19, 0, 0, 0, 0, 0, "Shifts object's origin to center of object data"); - uiDefBut(block, BUT,B_DOCENTRECURSOR, "Center Cursor", 600, 95, 150, 19, 0, 0, 0, 0, 0, "Shifts object's origin to cursor location"); + uiDefBut(block, BUT,B_DOCENTER, "Center", 600, 115, 55, 19, 0, 0, 0, 0, 0, "Shifts object data to be centered about object's origin"); + uiDefBut(block, BUT,B_DOCENTERNEW, "Center New", 655, 115, 95, 19, 0, 0, 0, 0, 0, "Shifts object's origin to center of object data"); + uiDefBut(block, BUT,B_DOCENTERCURSOR, "Center Cursor", 600, 95, 150, 19, 0, 0, 0, 0, 0, "Shifts object's origin to cursor location"); uiBlockEndAlign(block); if(cu->key) { diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c index 0d4ccf4ae10..5cb5f4671bd 100644 --- a/source/blender/src/buttons_object.c +++ b/source/blender/src/buttons_object.c @@ -1727,7 +1727,7 @@ void do_object_panels(unsigned short event) do_ob_ipo(ob); where_is_object(ob); VecSubf(vec, vec, ob->obmat[3]); - prspeed= Normalise(vec); + prspeed= Normalize(vec); scrarea_queue_winredraw(curarea); } break; diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c index 2047fc5d9ad..ca0a319c159 100644 --- a/source/blender/src/buttons_scene.c +++ b/source/blender/src/buttons_scene.c @@ -858,16 +858,16 @@ static uiBlock *edge_render_menu(void *arg_unused) uiDefButS(block, NUM, 0,"Eint:", 45,75,175,19, &G.scene->r.edgeint, 0.0, 255.0, 0, 0, "Sets edge intensity for Toon shading"); - /* colour settings for the toon shading */ + /* color settings for the toon shading */ uiDefButF(block, COL, 0, "", 10, 10,30,60, &(G.scene->r.edgeR), 0, 0, 0, B_EDGECOLSLI, ""); uiBlockBeginAlign(block); uiDefButF(block, NUMSLI, 0, "R ", 45, 50, 175,19, &G.scene->r.edgeR, 0.0, 1.0, B_EDGECOLSLI, 0, - "Colour for edges in toon shading mode."); + "Color for edges in toon shading mode."); uiDefButF(block, NUMSLI, 0, "G ", 45, 30, 175,19, &G.scene->r.edgeG, 0.0, 1.0, B_EDGECOLSLI, 0, - "Colour for edges in toon shading mode."); + "Color for edges in toon shading mode."); uiDefButF(block, NUMSLI, 0, "B ", 45, 10, 175,19, &G.scene->r.edgeB, 0.0, 1.0, B_EDGECOLSLI, 0, - "Colour for edges in toon shading mode."); + "Color for edges in toon shading mode."); uiBlockSetDirection(block, UI_TOP); @@ -1289,7 +1289,7 @@ static void render_panel_render(void) uiBlockBeginAlign(block); uiDefButS(block, ROW,800,"Sky", 369,13,35,20,&G.scene->r.alphamode,3.0,0.0, 0, 0, "Fill background with sky"); uiDefButS(block, ROW,800,"Premul", 405,13,50,20,&G.scene->r.alphamode,3.0,1.0, 0, 0, "Multiply alpha in advance"); - uiDefButS(block, ROW,800,"Key", 456,13,35,20,&G.scene->r.alphamode,3.0,2.0, 0, 0, "Alpha and colour values remain unchanged"); + uiDefButS(block, ROW,800,"Key", 456,13,35,20,&G.scene->r.alphamode,3.0,2.0, 0, 0, "Alpha and color values remain unchanged"); uiBlockEndAlign(block); if(G.scene->r.mode & R_RAYTRACE) diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c index bd9599064fc..979cb492a93 100644 --- a/source/blender/src/buttons_shading.c +++ b/source/blender/src/buttons_shading.c @@ -1238,7 +1238,7 @@ static void texture_panel_image_map(Tex *tex) /* crop extend clip */ uiBlockBeginAlign(block); - uiDefButS(block, ROW, B_TEXREDR_PRV, "Extend", 10,90,63,19, &tex->extend, 4.0, 1.0, 0, 0, "Extends the colour of the edge pixels"); + uiDefButS(block, ROW, B_TEXREDR_PRV, "Extend", 10,90,63,19, &tex->extend, 4.0, 1.0, 0, 0, "Extends the color of the edge pixels"); uiDefButS(block, ROW, B_TEXREDR_PRV, "Clip", 73,90,48,19, &tex->extend, 4.0, 2.0, 0, 0, "Sets alpha 0.0 outside Image edges"); uiDefButS(block, ROW, B_TEXREDR_PRV, "ClipCube", 121,90,63,19, &tex->extend, 4.0, 4.0, 0, 0, "Sets alpha to 0.0 outside cubeshaped area around Image"); uiDefButS(block, ROW, B_TEXREDR_PRV, "Repeat", 184,90,63,19, &tex->extend, 4.0, 3.0, 0, 0, "Causes Image to repeat horizontally and vertically"); @@ -1431,9 +1431,9 @@ static void draw_colorband_buts(uiBlock *block, ColorBand *coba, int xoffs, int if(coba==NULL) return; - bt= uiDefBut(block, BUT, redraw, "Add", 80+xoffs,95+yoffs,37,20, 0, 0, 0, 0, 0, "Adds a new colour position to the colorband"); + bt= uiDefBut(block, BUT, redraw, "Add", 80+xoffs,95+yoffs,37,20, 0, 0, 0, 0, 0, "Adds a new color position to the colorband"); uiButSetFunc(bt, colorband_add_cb, coba, NULL); - uiDefButS(block, NUM, redraw, "Cur:", 117+xoffs,95+yoffs,81,20, &coba->cur, 0.0, (float)(coba->tot-1), 0, 0, "Displays the active colour from the colorband"); + uiDefButS(block, NUM, redraw, "Cur:", 117+xoffs,95+yoffs,81,20, &coba->cur, 0.0, (float)(coba->tot-1), 0, 0, "Displays the active color from the colorband"); bt= uiDefBut(block, BUT, redraw, "Del", 199+xoffs,95+yoffs,37,20, 0, 0, 0, 0, 0, "Deletes the active position"); uiButSetFunc(bt, colorband_del_cb, coba, NULL); uiDefButS(block, ROW, redraw, "E", 236+xoffs,95+yoffs,16,20, &coba->ipotype, 5.0, 1.0, 0, 0, "Sets interpolation type 'Ease' (quadratic) "); @@ -1446,15 +1446,15 @@ static void draw_colorband_buts(uiBlock *block, ColorBand *coba, int xoffs, int cbd= coba->data + coba->cur; uiBlockBeginAlign(block); - bt= uiDefButF(block, NUM, redraw, "Pos", xoffs,40+yoffs,110,20, &cbd->pos, 0.0, 1.0, 10, 0, "Sets the position of the active colour"); + bt= uiDefButF(block, NUM, redraw, "Pos", xoffs,40+yoffs,110,20, &cbd->pos, 0.0, 1.0, 10, 0, "Sets the position of the active color"); uiButSetFunc(bt, colorband_pos_cb, coba, NULL); uiDefButF(block, COL, redraw, "", xoffs,20+yoffs,110,20, &(cbd->r), 0, 0, 0, B_BANDCOL, ""); uiDefButF(block, NUMSLI, redraw, "A ", xoffs,yoffs,110,20, &cbd->a, 0.0, 1.0, 10, 0, "Sets the alpha value for this position"); uiBlockBeginAlign(block); - uiDefButF(block, NUMSLI, redraw, "R ", 115+xoffs,40+yoffs,185,20, &cbd->r, 0.0, 1.0, B_BANDCOL, 0, "Sets the red value for the active colour"); - uiDefButF(block, NUMSLI, redraw, "G ", 115+xoffs,20+yoffs,185,20, &cbd->g, 0.0, 1.0, B_BANDCOL, 0, "Sets the green value for the active colour"); - uiDefButF(block, NUMSLI, redraw, "B ", 115+xoffs,yoffs,185,20, &cbd->b, 0.0, 1.0, B_BANDCOL, 0, "Sets the blue value for the active colour"); + uiDefButF(block, NUMSLI, redraw, "R ", 115+xoffs,40+yoffs,185,20, &cbd->r, 0.0, 1.0, B_BANDCOL, 0, "Sets the red value for the active color"); + uiDefButF(block, NUMSLI, redraw, "G ", 115+xoffs,20+yoffs,185,20, &cbd->g, 0.0, 1.0, B_BANDCOL, 0, "Sets the green value for the active color"); + uiDefButF(block, NUMSLI, redraw, "B ", 115+xoffs,yoffs,185,20, &cbd->b, 0.0, 1.0, B_BANDCOL, 0, "Sets the blue value for the active color"); uiBlockEndAlign(block); } @@ -1470,7 +1470,7 @@ void draw_colorband_buts_small(uiBlock *block, ColorBand *coba, rctf *butr, int uiBlockBeginAlign(block); uiDefButF(block, COL, event, "", xs,butr->ymin+20.0f,2.0f*unit,20, &(cbd->r), 0, 0, 0, B_BANDCOL, ""); uiDefButF(block, NUM, event, "A:", xs+2.0f*unit,butr->ymin+20.0f,4.0f*unit,20, &(cbd->a), 0.0f, 1.0f, 10, 2, ""); - bt= uiDefBut(block, BUT, event, "Add", xs+6.0f*unit,butr->ymin+20.0f,2.0f*unit,20, NULL, 0, 0, 0, 0, "Adds a new colour position to the colorband"); + bt= uiDefBut(block, BUT, event, "Add", xs+6.0f*unit,butr->ymin+20.0f,2.0f*unit,20, NULL, 0, 0, 0, 0, "Adds a new color position to the colorband"); uiButSetFunc(bt, colorband_add_cb, coba, NULL); bt= uiDefBut(block, BUT, event, "Del", xs+8.0f*unit,butr->ymin+20.0f,2.0f*unit,20, NULL, 0, 0, 0, 0, "Deletes the active position"); uiButSetFunc(bt, colorband_del_cb, coba, NULL); @@ -1510,8 +1510,8 @@ static void texture_panel_colors(Tex *tex) } uiBlockBeginAlign(block); - uiDefButF(block, NUMSLI, B_TEXPRV, "Bright", 10,10,150,20, &tex->bright, 0.0, 2.0, 0, 0, "Changes the brightness of the colour or intensity of a texture"); - uiDefButF(block, NUMSLI, B_TEXPRV, "Contr", 160,10,150,20, &tex->contrast, 0.01, 5.0, 0, 0, "Changes the contrast of the colour or intensity of a texture"); + uiDefButF(block, NUMSLI, B_TEXPRV, "Bright", 10,10,150,20, &tex->bright, 0.0, 2.0, 0, 0, "Changes the brightness of the color or intensity of a texture"); + uiDefButF(block, NUMSLI, B_TEXPRV, "Contr", 160,10,150,20, &tex->contrast, 0.01, 5.0, 0, 0, "Changes the contrast of the color or intensity of a texture"); } @@ -1825,8 +1825,8 @@ static void radio_panel_tool(Radio *rad, int flag) if(flag & RAD_PHASE_FACES) uiBlockSetCol(block, TH_AUTO); else uiBlockSetCol(block, TH_BUT_NEUTRAL); - uiDefBut(block, BUT, B_RAD_REPLACE, "Replace Meshes", 1, 0, 10, 12, NULL, 0, 0, 0, 0, "Converts meshes to Mesh objects with vertex colours, changing input-meshes"); - uiDefBut(block, BUT, B_RAD_ADDMESH, "Add new Meshes", 1, 0, 10, 12, NULL, 0, 0, 0, 0, "Converts meshes to Mesh objects with vertex colours, unchanging input-meshes"); + uiDefBut(block, BUT, B_RAD_REPLACE, "Replace Meshes", 1, 0, 10, 12, NULL, 0, 0, 0, 0, "Converts meshes to Mesh objects with vertex colors, changing input-meshes"); + uiDefBut(block, BUT, B_RAD_ADDMESH, "Add new Meshes", 1, 0, 10, 12, NULL, 0, 0, 0, 0, "Converts meshes to Mesh objects with vertex colors, unchanging input-meshes"); uiBlockSetCol(block, TH_AUTO); uiDefButS(block, ROW, B_RAD_DRAW, "Wire", 2, 0, 10, 10, &rad->drawtype, 0.0, 0.0, 0, 0, "Enables wireframe drawmode"); @@ -1957,10 +1957,10 @@ static void world_panel_mapto(World *wrld) /* MAP TO */ uiBlockBeginAlign(block); - uiDefButBitS(block, TOG, WOMAP_BLEND, B_WORLDPRV, "Blend", 10,180,75,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the colour progression of the background"); - uiDefButBitS(block, TOG, WOMAP_HORIZ, B_WORLDPRV, "Hori", 85,180,75,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the colour of the horizon"); - uiDefButBitS(block, TOG, WOMAP_ZENUP, B_WORLDPRV, "ZenUp", 160,180,75,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the colour of the zenith above"); - uiDefButBitS(block, TOG, WOMAP_ZENDOWN, B_WORLDPRV, "ZenDo", 235,180,75,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the colour of the zenith below"); + uiDefButBitS(block, TOG, WOMAP_BLEND, B_WORLDPRV, "Blend", 10,180,75,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the color progression of the background"); + uiDefButBitS(block, TOG, WOMAP_HORIZ, B_WORLDPRV, "Hori", 85,180,75,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the color of the horizon"); + uiDefButBitS(block, TOG, WOMAP_ZENUP, B_WORLDPRV, "ZenUp", 160,180,75,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the color of the zenith above"); + uiDefButBitS(block, TOG, WOMAP_ZENDOWN, B_WORLDPRV, "ZenDo", 235,180,75,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the color of the zenith below"); uiBlockEndAlign(block); uiBlockBeginAlign(block); @@ -1968,7 +1968,7 @@ static void world_panel_mapto(World *wrld) uiBlockEndAlign(block); uiBlockBeginAlign(block); - uiDefButF(block, NUMSLI, B_WORLDPRV, "Col ", 155,100,155,19, &(mtex->colfac), 0.0, 1.0, 0, 0, "Sets the amount the texture affects colour values"); + uiDefButF(block, NUMSLI, B_WORLDPRV, "Col ", 155,100,155,19, &(mtex->colfac), 0.0, 1.0, 0, 0, "Sets the amount the texture affects color values"); uiDefButF(block, NUMSLI, B_WORLDPRV, "Nor ", 155,80,155,19, &(mtex->norfac), 0.0, 1.0, 0, 0, "Sets the amount the texture affects normal values"); uiDefButF(block, NUMSLI, B_WORLDPRV, "Var ", 155,60,155,19, &(mtex->varfac), 0.0, 1.0, 0, 0, "Sets the amount the texture affects other values"); @@ -2105,7 +2105,7 @@ static void world_panel_mistaph(World *wrld) uiDefButF(block, NUM,B_DIFF,"StarDist:", 160,70,140,19, &(wrld->stardist), 2.0, 1000.0, 100, 0, "Specifies the average distance between any two stars"); uiDefButF(block, NUM,B_DIFF,"MinDist:", 160,50,140,19, &(wrld->starmindist), 0.0, 1000.0, 100, 0, "Specifies the minimum distance to the camera for stars"); uiDefButF(block, NUMSLI,B_DIFF,"Size:", 160,30,140,19, &(wrld->starsize), 0.0, 10.0, 10, 0, "Specifies the average screen dimension of stars"); - uiDefButF(block, NUMSLI,B_DIFF,"Colnoise:", 160,10,140,19, &(wrld->starcolnoise), 0.0, 1.0, 100, 0, "Randomizes starcolour"); + uiDefButF(block, NUMSLI,B_DIFF,"Colnoise:", 160,10,140,19, &(wrld->starcolnoise), 0.0, 1.0, 100, 0, "Randomizes star color"); uiBlockEndAlign(block); } @@ -2177,19 +2177,19 @@ static void world_panel_world(World *wrld) uiDefButF(block, COL, B_WORLDPRV, "", 160,150,145,19, &wrld->zenr, 0, 0, 0, B_COLZEN, ""); uiBlockBeginAlign(block); - uiDefButF(block, NUMSLI,B_WORLDPRV,"HoR ", 10,130,145,19, &(wrld->horr), 0.0, 1.0, B_COLHOR,0, "Sets the amount of red colour at the horizon"); - uiDefButF(block, NUMSLI,B_WORLDPRV,"HoG ", 10,110,145,19, &(wrld->horg), 0.0, 1.0, B_COLHOR,0, "Sets the amount of green colour at the horizon"); - uiDefButF(block, NUMSLI,B_WORLDPRV,"HoB ", 10,90,145,19, &(wrld->horb), 0.0, 1.0, B_COLHOR,0, "Sets the amount of blue colour at the horizon"); + uiDefButF(block, NUMSLI,B_WORLDPRV,"HoR ", 10,130,145,19, &(wrld->horr), 0.0, 1.0, B_COLHOR,0, "Sets the amount of red color at the horizon"); + uiDefButF(block, NUMSLI,B_WORLDPRV,"HoG ", 10,110,145,19, &(wrld->horg), 0.0, 1.0, B_COLHOR,0, "Sets the amount of green color at the horizon"); + uiDefButF(block, NUMSLI,B_WORLDPRV,"HoB ", 10,90,145,19, &(wrld->horb), 0.0, 1.0, B_COLHOR,0, "Sets the amount of blue color at the horizon"); uiBlockBeginAlign(block); - uiDefButF(block, NUMSLI,B_WORLDPRV,"ZeR ", 160,130,145,19, &(wrld->zenr), 0.0, 1.0, B_COLZEN,0, "Sets the amount of red colour at the zenith"); - uiDefButF(block, NUMSLI,B_WORLDPRV,"ZeG ", 160,110,145,19, &(wrld->zeng), 0.0, 1.0, B_COLZEN,0, "Sets the amount of green colour at the zenith"); - uiDefButF(block, NUMSLI,B_WORLDPRV,"ZeB ", 160,90,145,19, &(wrld->zenb), 0.0, 1.0, B_COLZEN,0, "Sets the amount of blue colour at the zenith"); + uiDefButF(block, NUMSLI,B_WORLDPRV,"ZeR ", 160,130,145,19, &(wrld->zenr), 0.0, 1.0, B_COLZEN,0, "Sets the amount of red color at the zenith"); + uiDefButF(block, NUMSLI,B_WORLDPRV,"ZeG ", 160,110,145,19, &(wrld->zeng), 0.0, 1.0, B_COLZEN,0, "Sets the amount of green color at the zenith"); + uiDefButF(block, NUMSLI,B_WORLDPRV,"ZeB ", 160,90,145,19, &(wrld->zenb), 0.0, 1.0, B_COLZEN,0, "Sets the amount of blue color at the zenith"); uiBlockBeginAlign(block); - uiDefButF(block, NUMSLI,B_WORLDPRV,"AmbR ", 10,50,145,19, &(wrld->ambr), 0.0, 1.0 ,0,0, "Sets the amount of red ambient colour"); - uiDefButF(block, NUMSLI,B_WORLDPRV,"AmbG ", 10,30,145,19, &(wrld->ambg), 0.0, 1.0 ,0,0, "Sets the amount of green ambient colour"); - uiDefButF(block, NUMSLI,B_WORLDPRV,"AmbB ", 10,10,145,19, &(wrld->ambb), 0.0, 1.0 ,0,0, "Sets the amount of blue ambient colour"); + uiDefButF(block, NUMSLI,B_WORLDPRV,"AmbR ", 10,50,145,19, &(wrld->ambr), 0.0, 1.0 ,0,0, "Sets the amount of red ambient color"); + uiDefButF(block, NUMSLI,B_WORLDPRV,"AmbG ", 10,30,145,19, &(wrld->ambg), 0.0, 1.0 ,0,0, "Sets the amount of green ambient color"); + uiDefButF(block, NUMSLI,B_WORLDPRV,"AmbB ", 10,10,145,19, &(wrld->ambb), 0.0, 1.0 ,0,0, "Sets the amount of blue ambient color"); uiBlockBeginAlign(block); uiBlockSetCol(block, TH_BUT_SETTING1); @@ -2341,13 +2341,13 @@ static void lamp_panel_mapto(Object *ob, Lamp *la) uiDefButF(block, NUMSLI, B_LAMPPRV, "DVar ", 10,10,135,19, &(mtex->def_var), 0.0, 1.0, 0, 0, "The default value the textures uses to mix with"); /* MAP TO */ - uiDefButBitS(block, TOG, MAP_COL, B_LAMPPRV, "Col", 10,180,135,19, &(mtex->mapto), 0, 0, 0, 0, "Lets the texture affect the basic colour of the lamp"); + uiDefButBitS(block, TOG, MAP_COL, B_LAMPPRV, "Col", 10,180,135,19, &(mtex->mapto), 0, 0, 0, 0, "Lets the texture affect the basic color of the lamp"); uiBlockBeginAlign(block); uiDefButS(block, MENU, B_LAMPPRV, mapto_blendtype_pup(),155,125,155,19, &(mtex->blendtype), 0, 0, 0, 0, "Texture blending mode"); uiBlockEndAlign(block); - uiDefButF(block, NUMSLI, B_LAMPPRV, "Col ", 155,100,155,19, &(mtex->colfac), 0.0, 1.0, 0, 0, "Sets the amount the texture affects colour values"); + uiDefButF(block, NUMSLI, B_LAMPPRV, "Col ", 155,100,155,19, &(mtex->colfac), 0.0, 1.0, 0, 0, "Sets the amount the texture affects color values"); } @@ -2983,10 +2983,10 @@ static void material_panel_map_to(Material *ma) /* MAP TO */ uiBlockBeginAlign(block); - uiDefButBitS(block, TOG, MAP_COL, B_MATPRV, "Col", 10,180,40,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect basic colour of the material"); + uiDefButBitS(block, TOG, MAP_COL, B_MATPRV, "Col", 10,180,40,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect basic color of the material"); uiDefButBitS(block, TOG3, MAP_NORM, B_MATPRV, "Nor", 50,180,40,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the rendered normal"); - uiDefButBitS(block, TOG, MAP_COLSPEC, B_MATPRV, "Csp", 90,180,40,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the specularity colour"); - uiDefButBitS(block, TOG, MAP_COLMIR, B_MATPRV, "Cmir", 130,180,50,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the mirror colour"); + uiDefButBitS(block, TOG, MAP_COLSPEC, B_MATPRV, "Csp", 90,180,40,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the specularity color"); + uiDefButBitS(block, TOG, MAP_COLMIR, B_MATPRV, "Cmir", 130,180,50,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the mirror color"); uiDefButBitS(block, TOG3, MAP_REF, B_MATPRV, "Ref", 180,180,40,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the value of the materials reflectivity"); uiDefButBitS(block, TOG3, MAP_SPEC, B_MATPRV, "Spec", 220,180,50,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the value of specularity"); uiDefButBitS(block, TOG3, MAP_AMB, B_MATPRV, "Amb", 270,180,40,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the value of ambient"); @@ -3004,7 +3004,7 @@ static void material_panel_map_to(Material *ma) uiBlockEndAlign(block); uiBlockBeginAlign(block); - uiDefButF(block, NUMSLI, B_MATPRV, "Col ", 155,100,155,19, &(mtex->colfac), 0.0, 1.0, 0, 0, "Sets the amount the texture affects colour values"); + uiDefButF(block, NUMSLI, B_MATPRV, "Col ", 155,100,155,19, &(mtex->colfac), 0.0, 1.0, 0, 0, "Sets the amount the texture affects color values"); /* newnoise: increased range to 25, the constant offset for bumpmapping quite often needs a higher nor setting */ uiDefButF(block, NUMSLI, B_MATPRV, "Nor ", 155,80,155,19, &(mtex->norfac), 0.0, 25.0, 0, 0, "Sets the amount the texture affects normal values"); uiDefButF(block, NUMSLI, B_MATPRV, "Var ", 155,60,155,19, &(mtex->varfac), 0.0, 1.0, 0, 0, "Sets the amount the texture affects other values"); @@ -3459,8 +3459,8 @@ static void material_panel_material(Material *ma) if(!(ma->mode & MA_HALO)) { uiBlockBeginAlign(block); uiBlockSetCol(block, TH_BUT_SETTING1); - uiDefButBitI(block, TOG, MA_VERTEXCOL, B_MAT_VCOL_LIGHT, "VCol Light", 8,166,74,20, &(ma->mode), 0, 0, 0, 0, "Adds vertex colours as extra light"); - uiDefButBitI(block, TOG, MA_VERTEXCOLP, B_MAT_VCOL_PAINT, "VCol Paint", 82,166,74,20, &(ma->mode), 0, 0, 0, 0, "Replaces material's colours with vertex colours"); + uiDefButBitI(block, TOG, MA_VERTEXCOL, B_MAT_VCOL_LIGHT, "VCol Light", 8,166,74,20, &(ma->mode), 0, 0, 0, 0, "Adds vertex colors as extra light"); + uiDefButBitI(block, TOG, MA_VERTEXCOLP, B_MAT_VCOL_PAINT, "VCol Paint", 82,166,74,20, &(ma->mode), 0, 0, 0, 0, "Replaces material's colors with vertex colors"); uiDefButBitI(block, TOG, MA_FACETEXTURE, B_REDR, "TexFace", 156,166,74,20, &(ma->mode), 0, 0, 0, 0, "Sets UV-Editor assigned texture as color and texture info for faces"); uiDefButBitI(block, TOG, MA_SHLESS, B_MATPRV, "Shadeless", 230,166,73,20, &(ma->mode), 0, 0, 0, 0, "Makes material insensitive to light or shadow"); @@ -3476,14 +3476,14 @@ static void material_panel_material(Material *ma) uiBlockBeginAlign(block); if(ma->mode & MA_HALO) { - uiDefButC(block, ROW, REDRAWBUTSSHADING, "Halo", 83,97,40,20, &(ma->rgbsel), 2.0, 0.0, 0, 0, "Sets the colour of the halo with the RGB sliders"); - uiDefButC(block, ROW, REDRAWBUTSSHADING, "Line", 83,77,40,20, &(ma->rgbsel), 2.0, 1.0, 0, 0, "Sets the colour of the lines with the RGB sliders"); - uiDefButC(block, ROW, REDRAWBUTSSHADING, "Ring", 83,57,40,20, &(ma->rgbsel), 2.0, 2.0, 0, 0, "Sets the colour of the rings with the RGB sliders"); + uiDefButC(block, ROW, REDRAWBUTSSHADING, "Halo", 83,97,40,20, &(ma->rgbsel), 2.0, 0.0, 0, 0, "Sets the color of the halo with the RGB sliders"); + uiDefButC(block, ROW, REDRAWBUTSSHADING, "Line", 83,77,40,20, &(ma->rgbsel), 2.0, 1.0, 0, 0, "Sets the color of the lines with the RGB sliders"); + uiDefButC(block, ROW, REDRAWBUTSSHADING, "Ring", 83,57,40,20, &(ma->rgbsel), 2.0, 2.0, 0, 0, "Sets the color of the rings with the RGB sliders"); } else { - uiDefButC(block, ROW, REDRAWBUTSSHADING, "Col", 83,97,40,20, &(ma->rgbsel), 2.0, 0.0, 0, 0, "Sets the diffuse colour of the material"); - uiDefButC(block, ROW, REDRAWBUTSSHADING, "Spe", 83,77,40,20, &(ma->rgbsel), 2.0, 1.0, 0, 0, "Sets the specular colour of the material"); - uiDefButC(block, ROW, REDRAWBUTSSHADING, "Mir", 83,57,40,20, &(ma->rgbsel), 2.0, 2.0, 0, 0, "Sets the mirror colour of the material"); + uiDefButC(block, ROW, REDRAWBUTSSHADING, "Col", 83,97,40,20, &(ma->rgbsel), 2.0, 0.0, 0, 0, "Sets the diffuse color of the material"); + uiDefButC(block, ROW, REDRAWBUTSSHADING, "Spe", 83,77,40,20, &(ma->rgbsel), 2.0, 1.0, 0, 0, "Sets the specular color of the material"); + uiDefButC(block, ROW, REDRAWBUTSSHADING, "Mir", 83,57,40,20, &(ma->rgbsel), 2.0, 2.0, 0, 0, "Sets the mirror color of the material"); } if(ma->rgbsel==0) {colpoin= &(ma->r); rgbsel= B_MATCOL;} @@ -3510,8 +3510,8 @@ static void material_panel_material(Material *ma) } uiBlockBeginAlign(block); - uiDefButS(block, ROW, REDRAWBUTSSHADING, "RGB", 8,30,38,19, &(ma->colormodel), 1.0, (float)MA_RGB, 0, 0, "Creates colour using red, green and blue"); - uiDefButS(block, ROW, REDRAWBUTSSHADING, "HSV", 46,30,38,19, &(ma->colormodel), 1.0, (float)MA_HSV, 0, 0, "Creates colour using hue, saturation and value"); + uiDefButS(block, ROW, REDRAWBUTSSHADING, "RGB", 8,30,38,19, &(ma->colormodel), 1.0, (float)MA_RGB, 0, 0, "Creates color using red, green and blue"); + uiDefButS(block, ROW, REDRAWBUTSSHADING, "HSV", 46,30,38,19, &(ma->colormodel), 1.0, (float)MA_HSV, 0, 0, "Creates color using hue, saturation and value"); uiDefButBitS(block, TOG, MA_DRAW_DYNABUTS, REDRAWBUTSSHADING, "DYN", 84,30,39,19, &(ma->dynamode), 0.0, 0.0, 0, 0, "Adjusts parameters for dynamics options"); } diff --git a/source/blender/src/drawarmature.c b/source/blender/src/drawarmature.c index 6d3a6360989..9752561445a 100644 --- a/source/blender/src/drawarmature.c +++ b/source/blender/src/drawarmature.c @@ -447,7 +447,7 @@ static void draw_sphere_bone_dist(float smat[][4], float imat[][4], int boneflag /* move vector back */ Mat4Mul3Vecfl(imat, dirvec); - if(0.0f != Normalise(dirvec)) { + if(0.0f != Normalize(dirvec)) { float norvec[3], vec1[3], vec2[3], vec[3]; int a; @@ -591,7 +591,7 @@ static void draw_sphere_bone_wire(float smat[][4], float imat[][4], int armflag, /* move vector back */ Mat4Mul3Vecfl(imat, dirvec); - if(0.0f != Normalise(dirvec)) { + if(0.0f != Normalize(dirvec)) { float norvech[3], norvect[3], vec[3]; VECCOPY(vec, dirvec); diff --git a/source/blender/src/drawimage.c b/source/blender/src/drawimage.c index 8b1769faced..aea926ef5fb 100644 --- a/source/blender/src/drawimage.c +++ b/source/blender/src/drawimage.c @@ -1972,7 +1972,7 @@ void image_home(void) scrarea_queue_winredraw(curarea); } -void image_viewcentre(void) +void image_viewcenter(void) { ImBuf *ibuf= BKE_image_get_ibuf(G.sima->image, &G.sima->iuser); float size, min[2], max[2], d[2], xim=256.0f, yim=256.0f; diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c index 30786f8b2f5..8bb09acc462 100644 --- a/source/blender/src/drawobject.c +++ b/source/blender/src/drawobject.c @@ -512,7 +512,7 @@ static void drawshadbuflimits(Lamp *la, float mat[][4]) lavec[0]= -mat[2][0]; lavec[1]= -mat[2][1]; lavec[2]= -mat[2][2]; - Normalise(lavec); + Normalize(lavec); sta[0]= mat[3][0]+ la->clipsta*lavec[0]; sta[1]= mat[3][1]+ la->clipsta*lavec[1]; @@ -543,13 +543,13 @@ static void spotvolume(float *lvec, float *vvec, float inp) /* camera is at 0,0,0 */ float temp[3],plane[3],mat1[3][3],mat2[3][3],mat3[3][3],mat4[3][3],q[4],co,si,angle; - Normalise(lvec); - Normalise(vvec); /* is this the correct vector ? */ + Normalize(lvec); + Normalize(vvec); /* is this the correct vector ? */ Crossf(temp,vvec,lvec); /* equation for a plane through vvec en lvec */ Crossf(plane,lvec,temp); /* a plane perpendicular to this, parrallel with lvec */ - Normalise(plane); + Normalize(plane); /* now we've got two equations: one of a cone and one of a plane, but we have three unknowns. We remove one unkown by rotating the plane to z=0 (the plane normal) */ @@ -562,7 +562,7 @@ static void spotvolume(float *lvec, float *vvec, float inp) q[1] = plane[1] ; q[2] = -plane[0] ; q[3] = 0 ; - Normalise(&q[1]); + Normalize(&q[1]); angle = saacos(plane[2])/2.0; co = cos(angle); @@ -626,8 +626,8 @@ static void drawlamp(Object *ob) /* and view aligned matrix: */ Mat4CpyMat4(imat, G.vd->viewinv); - Normalise(imat[0]); - Normalise(imat[1]); + Normalize(imat[0]); + Normalize(imat[1]); /* for AA effects */ glGetFloatv(GL_CURRENT_COLOR, curcol); @@ -1661,7 +1661,7 @@ static void draw_em_measure_stats(Object *ob, EditMesh *em) float fvec[3]; char val[32]; /* Stores the measurement display text here */ char conv_float[5]; /* Use a float conversion matching the grid size */ - float area, col[3]; /* area of the face, colour of the text to draw */ + float area, col[3]; /* area of the face, color of the text to draw */ /* make the precission of the pronted value proportionate to the gridsize */ if ((G.vd->grid) < 0.01) @@ -3272,8 +3272,8 @@ static int drawmball(Base *base, int dt) mygetmatrix(tmat); Mat4Invert(imat, tmat); - Normalise(imat[0]); - Normalise(imat[1]); + Normalize(imat[0]); + Normalize(imat[1]); while(ml) { @@ -3327,8 +3327,8 @@ static void draw_forcefield(Object *ob) /* calculus here, is reused in PFIELD_FORCE */ mygetmatrix(tmat); Mat4Invert(imat, tmat); -// Normalise(imat[0]); // we don't do this because field doesnt scale either... apart from wind! -// Normalise(imat[1]); +// Normalize(imat[0]); // we don't do this because field doesnt scale either... apart from wind! +// Normalize(imat[1]); if (pd->forcefield == PFIELD_WIND) { float force_val; @@ -3440,12 +3440,12 @@ static void draw_box(float vec[8][3]) } /* uses boundbox, function used by Ketsji */ -void get_local_bounds(Object *ob, float *centre, float *size) +void get_local_bounds(Object *ob, float *center, float *size) { BoundBox *bb= object_get_boundbox(ob); if(bb==NULL) { - centre[0]= centre[1]= centre[2]= 0.0; + center[0]= center[1]= center[2]= 0.0; VECCOPY(size, ob->size); } else { @@ -3453,9 +3453,9 @@ void get_local_bounds(Object *ob, float *centre, float *size) size[1]= 0.5*fabs(bb->vec[0][1] - bb->vec[2][1]); size[2]= 0.5*fabs(bb->vec[0][2] - bb->vec[1][2]); - centre[0]= (bb->vec[0][0] + bb->vec[4][0])/2.0; - centre[1]= (bb->vec[0][1] + bb->vec[2][1])/2.0; - centre[2]= (bb->vec[0][2] + bb->vec[1][2])/2.0; + center[0]= (bb->vec[0][0] + bb->vec[4][0])/2.0; + center[1]= (bb->vec[0][1] + bb->vec[2][1])/2.0; + center[2]= (bb->vec[0][2] + bb->vec[1][2])/2.0; } } diff --git a/source/blender/src/drawoops.c b/source/blender/src/drawoops.c index 01095798444..70634a4964b 100644 --- a/source/blender/src/drawoops.c +++ b/source/blender/src/drawoops.c @@ -308,7 +308,7 @@ void calc_oopstext(char *str, float *v1) flen= BMF_GetStringWidth(font, str); - /* calc centred location for icon and text, + /* calc centerd location for icon and text, else if were zoomed too far out, just push text to the left of the oops block. */ if (oopscalex>1.1) { mval[0]= (f1+f2-flen+1)/2; @@ -454,7 +454,7 @@ void drawoopsspace(ScrArea *sa, void *spacedata) /* Draw a page about the oops */ BIF_GetThemeColor3fv(TH_BACK, col); glColor3fv(col); - glRectf(G.v2d->tot.xmin-2, G.v2d->tot.ymin-2, G.v2d->tot.xmax+2, G.v2d->tot.ymax+2); /* light square in the centre */ + glRectf(G.v2d->tot.xmin-2, G.v2d->tot.ymin-2, G.v2d->tot.xmax+2, G.v2d->tot.ymax+2); /* light square in the center */ BIF_ThemeColorShade(TH_BACK, -96); /* drop shadow color */ glRectf(G.v2d->tot.xmin-1, G.v2d->tot.ymin-2, G.v2d->tot.xmax+3, G.v2d->tot.ymin-3); /* bottom dropshadow */ glRectf(G.v2d->tot.xmax+2, G.v2d->tot.ymin-2, G.v2d->tot.xmax+3, G.v2d->tot.ymax+1); /* right hand dropshadow */ diff --git a/source/blender/src/drawseq.c b/source/blender/src/drawseq.c index 74b51655271..fac1468fdd2 100644 --- a/source/blender/src/drawseq.c +++ b/source/blender/src/drawseq.c @@ -629,7 +629,7 @@ static void draw_seq_text(Sequence *seq, float x1, float x2, float y1, float y2) BMF_DrawString(G.font, strp); } -/* draws a shaded strip, made from gradient + flat colour + gradient */ +/* draws a shaded strip, made from gradient + flat color + gradient */ static void draw_shadedstrip(Sequence *seq, char *col, float x1, float y1, float x2, float y2) { float ymid1, ymid2; @@ -697,7 +697,7 @@ static void draw_seq_strip(Sequence *seq, ScrArea *sa, SpaceSeq *sseq) y2= seq->machine+SEQ_STRIP_OFSTOP; - /* get the correct colour per strip type*/ + /* get the correct color per strip type*/ get_seq_color3ubv(seq, col); /* draw the main strip body */ diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c index ab29f86da8a..bdb56c091f5 100644 --- a/source/blender/src/drawview.c +++ b/source/blender/src/drawview.c @@ -2680,9 +2680,9 @@ void drawview3dspace(ScrArea *sa, void *spacedata) float len1, len2, vec[3]; VECCOPY(vec, v3d->persinv[0]); - len1= Normalise(vec); + len1= Normalize(vec); VECCOPY(vec, v3d->persinv[1]); - len2= Normalise(vec); + len2= Normalize(vec); v3d->pixsize= 2.0f*(len1>len2?len1:len2); diff --git a/source/blender/src/edit.c b/source/blender/src/edit.c index 0b5a32c4d5e..7bebc0cdc87 100644 --- a/source/blender/src/edit.c +++ b/source/blender/src/edit.c @@ -373,7 +373,7 @@ int get_border(rcti *rect, short flag) rect->ymax= mval[1]; retval= event; - /* normalise */ + /* normalize */ if(rect->xmin>rect->xmax) SWAP(int, rect->xmin, rect->xmax); if(rect->ymin>rect->ymax) SWAP(int, rect->ymin, rect->ymax); @@ -883,7 +883,7 @@ static void make_trans_verts(float *min, float *max, int mode) MetaElem *ml; EditVert *eve; EditBone *ebo; - float total, centre[3], centroid[3]; + float total, center[3], centroid[3]; int a; tottrans= 0; // global! @@ -1111,9 +1111,9 @@ static void make_trans_verts(float *min, float *max, int mode) centroid[2]/= total; } - centre[0]= (min[0]+max[0])/2.0; - centre[1]= (min[1]+max[1])/2.0; - centre[2]= (min[2]+max[2])/2.0; + center[0]= (min[0]+max[0])/2.0; + center[1]= (min[1]+max[1])/2.0; + center[2]= (min[2]+max[2])/2.0; } diff --git a/source/blender/src/editarmature.c b/source/blender/src/editarmature.c index fc94b73de38..5c9664d4148 100644 --- a/source/blender/src/editarmature.c +++ b/source/blender/src/editarmature.c @@ -102,7 +102,7 @@ #include "blendef.h" #include "nla.h" -extern float centre[3], centroid[3]; /* Originally defined in editobject.c */ +extern float center[3], centroid[3]; /* Originally defined in editobject.c */ /* Macros */ #define TEST_EDITARMATURE {if(G.obedit==0) return; if( (G.vd->lay & G.obedit->lay)==0 ) return;} @@ -367,8 +367,8 @@ void apply_rot_armature (Object *ob, float mat[3][3]) } } -/* 0 == do centre, 1 == centre new, 2 == centre cursor */ -void docentre_armature (Object *ob, int centremode) +/* 0 == do center, 1 == center new, 2 == center cursor */ +void docenter_armature (Object *ob, int centermode) { ListBase list; EditBone *ebone; @@ -384,8 +384,8 @@ void docentre_armature (Object *ob, int centremode) list.first= list.last = NULL; make_boneList(&list, &arm->bonebase, NULL); - /* Find the centrepoint */ - if (centremode == 2) { + /* Find the centerpoint */ + if (centermode == 2) { VECCOPY(cent, give_cursor()); Mat4Invert(ob->imat, ob->obmat); Mat4MulVecfl(ob->imat, cent); @@ -417,8 +417,8 @@ void docentre_armature (Object *ob, int centremode) BLI_freelistN(&list); } - /* Adjust object location for new centrepoint */ - if(centremode && G.obedit==0) { + /* Adjust object location for new centerpoint */ + if(centermode && G.obedit==0) { Mat3CpyMat4(omat, ob->obmat); Mat3MulVecfl(omat, cent); diff --git a/source/blender/src/editcurve.c b/source/blender/src/editcurve.c index 7aa513767c1..e3dc812831b 100644 --- a/source/blender/src/editcurve.c +++ b/source/blender/src/editcurve.c @@ -2463,7 +2463,7 @@ static void spin_nurb(float *dvec, short mode) Mat3CpyMat4(persmat, G.vd->viewmat); Mat3Inv(persinv, persmat); - /* imat and centre and size */ + /* imat and center and size */ Mat3CpyMat4(bmat, G.obedit->obmat); Mat3Inv(imat, bmat); @@ -2479,7 +2479,7 @@ static void spin_nurb(float *dvec, short mode) n[0]= G.vd->viewinv[2][0]; n[1]= G.vd->viewinv[2][1]; n[2]= G.vd->viewinv[2][2]; - Normalise(n); + Normalize(n); } phi= M_PI/8.0; @@ -3743,7 +3743,7 @@ Nurb *addNurbprim(int type, int stype, int newname) if (G.vd) grid = G.vd->grid; else grid = 1.0; - /* imat and centre and size */ + /* imat and center and size */ if(G.obedit) { Mat3CpyMat4(mat, G.obedit->obmat); diff --git a/source/blender/src/editface.c b/source/blender/src/editface.c index 9024b10691f..db4d50dccbb 100644 --- a/source/blender/src/editface.c +++ b/source/blender/src/editface.c @@ -183,7 +183,7 @@ static void uv_calc_center_vector(float *result, Object *ob, Mesh *me) switch (G.vd->around) { - case V3D_CENTRE: /* bounding box center */ + case V3D_CENTER: /* bounding box center */ min[0]= min[1]= min[2]= 1e20f; max[0]= max[1]= max[2]= -1e20f; diff --git a/source/blender/src/editipo.c b/source/blender/src/editipo.c index dd57355726a..4e184494b32 100644 --- a/source/blender/src/editipo.c +++ b/source/blender/src/editipo.c @@ -2553,7 +2553,7 @@ void common_insertkey(void) id= G.buts->lockpoin; te= G.buts->lockpoin; if(id) { - event= pupmenu("Insert Key %t|Cloud%x0|Marble%x1|Stucci%x2|Wood%x3|Magic%x4|Blend%x5|Musgrave%x6|Voronoi%x7|Distnoise%x8|ColourFilter%x9"); + event= pupmenu("Insert Key %t|Cloud%x0|Marble%x1|Stucci%x2|Wood%x3|Magic%x4|Blend%x5|Musgrave%x6|Voronoi%x7|Distnoise%x8|ColorFilter%x9"); if(event== -1) return; if(event==0) { @@ -3942,8 +3942,8 @@ void set_speed_editipo(float speed) vec1[2]= (beztar[2]->vec[1][1] - beztar[2]->vec[0][1]) / (beztar[2]->vec[1][0] - beztar[2]->vec[0][0]) ; vec2[2]= (beztar[2]->vec[1][1] - beztar[2]->vec[2][1]) / (beztar[2]->vec[2][0] - beztar[2]->vec[1][0]) ; - Normalise(vec1); - Normalise(vec2); + Normalize(vec1); + Normalize(vec2); VecMulf(vec1, speed); VecMulf(vec2, speed); diff --git a/source/blender/src/editmball.c b/source/blender/src/editmball.c index 1bde0eca710..91f0f25ec60 100644 --- a/source/blender/src/editmball.c +++ b/source/blender/src/editmball.c @@ -157,7 +157,7 @@ void add_primitiveMball(int dummy_argument) ml= ml->next; } - /* imat and centre and size */ + /* imat and center and size */ Mat3CpyMat4(mat, G.obedit->obmat); curs= give_cursor(); diff --git a/source/blender/src/editmesh.c b/source/blender/src/editmesh.c index bcb0d80d720..15840335169 100644 --- a/source/blender/src/editmesh.c +++ b/source/blender/src/editmesh.c @@ -660,7 +660,7 @@ static void edge_normal_compare(EditEdge *eed, EditFace *efa1) else CalcCent3f(cent2, efa2->v1->co, efa2->v2->co, efa2->v3->co); VecSubf(cent1, cent2, cent1); - Normalise(cent1); + Normalize(cent1); inp= cent1[0]*efa1->n[0] + cent1[1]*efa1->n[1] + cent1[2]*efa1->n[2]; if(inp < -0.001 ) eed->f1= 1; diff --git a/source/blender/src/editmesh_add.c b/source/blender/src/editmesh_add.c index 2e1aae3c0cb..e90a08e4086 100644 --- a/source/blender/src/editmesh_add.c +++ b/source/blender/src/editmesh_add.c @@ -186,9 +186,9 @@ void add_click_mesh(void) done= 1; } } - if(done) Normalise(nor); + if(done) Normalize(nor); - /* centre */ + /* center */ VecAddf(cent, min, max); VecMulf(cent, 0.5f); VECCOPY(min, cent); @@ -206,14 +206,14 @@ void add_click_mesh(void) float dot; VECCOPY(vec, min); - Normalise(vec); + Normalize(vec); dot= INPR(vec, nor); if( fabs(dot)<0.999) { float cross[3], si, q1[4]; Crossf(cross, nor, vec); - Normalise(cross); + Normalize(cross); dot= 0.5f*saacos(dot); si= (float)sin(dot); q1[0]= (float)cos(dot); @@ -865,7 +865,7 @@ int confirm_objectExists( Mesh **me, float mat[][3] ) } *me = G.obedit->data; - /* imat and centre and size */ + /* imat and center and size */ Mat3CpyMat4(mat, G.obedit->obmat); return newob; @@ -1079,7 +1079,7 @@ void make_prim(int type, float imat[3][3], int tot, int seg, } d= -d; } - /* centre vertices */ + /* center vertices */ /* type 7, a cone can only have 1 one side filled * if the cone has no capping, dont add vtop */ if((fill && type>1) || type == 7) { diff --git a/source/blender/src/editmesh_lib.c b/source/blender/src/editmesh_lib.c index f256b0b534a..78cf2d17c04 100644 --- a/source/blender/src/editmesh_lib.c +++ b/source/blender/src/editmesh_lib.c @@ -190,7 +190,7 @@ void EM_editselection_normal(float *normal, EditSelection *ese) we need the plane for this */ Crossf(vec, normal, plane); Crossf(normal, plane, vec); - Normalise(normal); + Normalize(normal); } else if (ese->type==EDITFACE) { EditFace *efa= ese->data; @@ -263,7 +263,7 @@ void EM_editselection_plane(float *plane, EditSelection *ese) VecCopyf(plane, vec); } } - Normalise(plane); + Normalize(plane); } @@ -1013,7 +1013,7 @@ short extrudeflag_edges_indiv(short flag, float *nor) } } } - Normalise(nor); + Normalize(nor); /* set correct selection */ EM_clear_flag_all(SELECT); @@ -1279,7 +1279,7 @@ static short extrudeflag_edge(short flag, float *nor) } } - Normalise(nor); // translation normal grab + Normalize(nor); // translation normal grab /* step 7: redo selection */ EM_clear_flag_all(SELECT); @@ -1540,7 +1540,7 @@ short extrudeflag_vert(short flag, float *nor) efa= nextvl; } - Normalise(nor); // for grab + Normalize(nor); // for grab /* for all vertices with eve->tmp.v!=0 if eve->f1==1: make edge @@ -1853,9 +1853,9 @@ void recalc_editnormals(void) /* following Mesh convention; we use vertex coordinate itself for normal in this case */ for(eve= em->verts.first; eve; eve=eve->next) { - if (Normalise(eve->no)==0.0) { + if (Normalize(eve->no)==0.0) { VECCOPY(eve->no, eve->co); - Normalise(eve->no); + Normalize(eve->no); } } } diff --git a/source/blender/src/editmesh_mods.c b/source/blender/src/editmesh_mods.c index 985cda68351..c9190692f1a 100644 --- a/source/blender/src/editmesh_mods.c +++ b/source/blender/src/editmesh_mods.c @@ -3324,7 +3324,7 @@ void vertices_to_sphere(void) Mat3CpyMat4(bmat, ob->obmat); Mat3Inv(imat, bmat); - /* centre */ + /* center */ curs= give_cursor(); cent[0]= curs[0]-ob->obmat[3][0]; cent[1]= curs[1]-ob->obmat[3][1]; @@ -3352,7 +3352,7 @@ void vertices_to_sphere(void) vec[1]= eve->co[1]-cent[1]; vec[2]= eve->co[2]-cent[2]; - Normalise(vec); + Normalize(vec); eve->co[0]= fac*(cent[0]+vec[0]*len) + facm*eve->co[0]; eve->co[1]= fac*(cent[1]+vec[1]*len) + facm*eve->co[1]; diff --git a/source/blender/src/editmesh_tools.c b/source/blender/src/editmesh_tools.c index 4d8c6ea17df..afcdfcc7c7f 100644 --- a/source/blender/src/editmesh_tools.c +++ b/source/blender/src/editmesh_tools.c @@ -701,7 +701,7 @@ void extrude_repeat_mesh(int steps, float offs) dvec[0]= G.vd->persinv[2][0]; dvec[1]= G.vd->persinv[2][1]; dvec[2]= G.vd->persinv[2][2]; - Normalise(dvec); + Normalize(dvec); dvec[0]*= offs; dvec[1]*= offs; dvec[2]*= offs; @@ -740,7 +740,7 @@ void spin_mesh(int steps, float degr, float *dvec, int mode) TEST_EDITMESH if(multires_test()) return; - /* imat and centre and size */ + /* imat and center and size */ Mat3CpyMat4(bmat, G.obedit->obmat); Mat3Inv(imat,bmat); @@ -762,7 +762,7 @@ void spin_mesh(int steps, float degr, float *dvec, int mode) n[0]= G.vd->viewinv[2][0]; n[1]= G.vd->viewinv[2][1]; n[2]= G.vd->viewinv[2][2]; - Normalise(n); + Normalize(n); } q[0]= (float)cos(phi); @@ -1191,7 +1191,7 @@ static void alter_co(float *co, EditEdge *edge, float rad, int beauty, float per float len, fac, nor[3], nor1[3], nor2[3]; VecSubf(nor, edge->v1->co, edge->v2->co); - len= 0.5f*Normalise(nor); + len= 0.5f*Normalize(nor); VECCOPY(nor1, edge->v1->no); VECCOPY(nor2, edge->v2->no); @@ -1220,7 +1220,7 @@ static void alter_co(float *co, EditEdge *edge, float rad, int beauty, float per } else { if(rad > 0.0) { /* subdivide sphere */ - Normalise(co); + Normalize(co); co[0]*= rad; co[1]*= rad; co[2]*= rad; @@ -1260,7 +1260,7 @@ static EditVert *subdivide_edge_addvert(EditEdge *edge, float rad, int beauty, f ev->no[0] = (edge->v2->no[0]-edge->v1->no[0])*percent + edge->v1->no[0]; ev->no[1] = (edge->v2->no[1]-edge->v1->no[1])*percent + edge->v1->no[1]; ev->no[2] = (edge->v2->no[2]-edge->v1->no[2])*percent + edge->v1->no[2]; - Normalise(ev->no); + Normalize(ev->no); return ev; } @@ -3733,12 +3733,12 @@ static void bevel_displace_vec(float *midvec, float *v1, float *v2, float *v3, f VecSubf(c, v3, v2); Crossf(n_a, a, no); - Normalise(n_a); + Normalize(n_a); Crossf(n_c, no, c); - Normalise(n_c); + Normalize(n_c); - Normalise(a); - Normalise(c); + Normalize(a); + Normalize(c); ac = Inpf(a, c); if (ac == 1 || ac == -1) { @@ -3748,7 +3748,7 @@ static void bevel_displace_vec(float *midvec, float *v1, float *v2, float *v3, f ac2 = ac * ac; fac = (float)sqrt((ac2 + 2*ac + 1)/(1 - ac2) + 1); VecAddf(mid, n_c, n_a); - Normalise(mid); + Normalize(mid); VecMulf(mid, d * fac); VecAddf(mid, mid, v2); VecCopyf(midvec, mid); @@ -3763,11 +3763,11 @@ static void fix_bevel_wrap(float *midvec, float *v1, float *v2, float *v3, float float a[3], b[3], c[3], l_a, l_b, l_c, s_a, s_b, s_c, Pos1[3], Pos2[3], Dir[3]; VecSubf(a, v3, v2); - l_a = Normalise(a); + l_a = Normalize(a); VecSubf(b, v4, v3); - Normalise(b); + Normalize(b); VecSubf(c, v1, v2); - Normalise(c); + Normalize(c); s_b = Inpf(a, c); s_b = (float)sqrt(1 - (s_b * s_b)); @@ -3905,7 +3905,7 @@ static void bevel_shrink_faces(float d, int flag) EditFace *efa; float vec[3], no[3], v1[3], v2[3], v3[3], v4[3]; - /* move edges of all faces with efa->f1 & flag closer towards their centres */ + /* move edges of all faces with efa->f1 & flag closer towards their centers */ efa= em->faces.first; while (efa) { if (efa->f1 & flag) { @@ -3946,7 +3946,7 @@ static void bevel_shrink_draw(float d, int flag) EditFace *efa; float vec[3], no[3], v1[3], v2[3], v3[3], v4[3], fv1[3], fv2[3], fv3[3], fv4[3]; - /* move edges of all faces with efa->f1 & flag closer towards their centres */ + /* move edges of all faces with efa->f1 & flag closer towards their centers */ efa= em->faces.first; while (efa) { VECCOPY(v1, efa->v1->co); @@ -4409,7 +4409,7 @@ void bevel_menu() { char Finished = 0, Canceled = 0, str[100], Recalc = 0; short mval[2], oval[2], curval[2], event = 0, recurs = 1, nr; - float vec[3], d, drawd=0.0, centre[3], fac = 1; + float vec[3], d, drawd=0.0, center[3], fac = 1; getmouseco_areawin(mval); oval[0] = mval[0]; oval[1] = mval[1]; @@ -4420,7 +4420,7 @@ void bevel_menu() // Init grabz for window to vec conversions initgrabz(-G.vd->ofs[0], -G.vd->ofs[1], -G.vd->ofs[2]); - window_to_3d(centre, mval[0], mval[1]); + window_to_3d(center, mval[0], mval[1]); if(button(&recurs, 1, 4, "Recursion:")==0) return; @@ -4442,7 +4442,7 @@ void bevel_menu() curval[1] = mval[1]; window_to_3d(vec, mval[0]-oval[0], mval[1]-oval[1]); - d = Normalise(vec) / 10; + d = Normalize(vec) / 10; drawd = d * fac; diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c index 4837d7b2c03..6e1bbe61039 100644 --- a/source/blender/src/editobject.c +++ b/source/blender/src/editobject.c @@ -1767,9 +1767,9 @@ void check_editmode(int type) exit_editmode(EM_FREEDATA|EM_FREEUNDO|EM_WAITCURSOR); /* freedata, and undo */ } -/* 0 == do centre, 1 == centre new, 2 == centre cursor */ +/* 0 == do center, 1 == center new, 2 == center cursor */ -void docentre(int centremode) +void docenter(int centermode) { EditMesh *em = G.editMesh; Base *base; @@ -1849,7 +1849,7 @@ void docentre(int centremode) return; } - if(centremode==2) { + if(centermode==2) { VECCOPY(cent, give_cursor()); Mat4Invert(base->object->imat, base->object->obmat); Mat4MulVecfl(base->object->imat, cent); @@ -1871,7 +1871,7 @@ void docentre(int centremode) } me->flag |= ME_ISDONE; - if(centremode) { + if(centermode) { Mat3CpyMat4(omat, base->object->obmat); VECCOPY(centn, cent); @@ -1925,7 +1925,7 @@ void docentre(int centremode) nu1= cu->nurb.first; } - if(centremode==2) { + if(centermode==2) { VECCOPY(cent, give_cursor()); Mat4Invert(base->object->imat, base->object->obmat); Mat4MulVecfl(base->object->imat, cent); @@ -1965,7 +1965,7 @@ void docentre(int centremode) nu= nu->next; } - if(centremode && G.obedit==0) { + if(centermode && G.obedit==0) { Mat3CpyMat4(omat, base->object->obmat); Mat3MulVecfl(omat, cent); @@ -1975,7 +1975,7 @@ void docentre(int centremode) } if(G.obedit) { - if (centremode==0) { + if (centermode==0) { DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA); } break; @@ -2008,7 +2008,7 @@ void docentre(int centremode) /* Function to recenter armatures in editarmature.c * Bone + object locations are handled there. */ - docentre_armature(base->object, centremode); + docenter_armature(base->object, centermode); if(G.obedit) break; @@ -2024,7 +2024,7 @@ void docentre(int centremode) BIF_undo_push("Do Center"); } -void docentre_new(void) +void docenter_new(void) { if(G.scene->id.lib) return; @@ -2032,11 +2032,11 @@ void docentre_new(void) error("Unable to center new in Edit Mode"); } else { - docentre(1); + docenter(1); } } -void docentre_cursor(void) +void docenter_cursor(void) { if(G.scene->id.lib) return; @@ -2044,7 +2044,7 @@ void docentre_cursor(void) error("Unable to center cursor in Edit Mode"); } else { - docentre(2); + docenter(2); } } @@ -3821,10 +3821,10 @@ int cylinder_intersect_test(void) VecSubf(rc, oldloc, base); /* the axis */ - len2= Normalise(axis); + len2= Normalize(axis); Crossf(n, speed, axis); - len= Normalise(n); + len= Normalize(n); if(len==0.0) return 0; dist= fabs( rc[0]*n[0] + rc[1]*n[1] + rc[2]*n[2] ); @@ -3880,7 +3880,7 @@ int sphere_intersect_test(void) v1= v1->next; VecSubf(speed, v1->co, oldloc); - len= Normalise(speed); + len= Normalize(speed); if(len==0.0) return 0; VecSubf(rc, oldloc, base); diff --git a/source/blender/src/editscreen.c b/source/blender/src/editscreen.c index 64481a3e31b..0ee13f676b6 100644 --- a/source/blender/src/editscreen.c +++ b/source/blender/src/editscreen.c @@ -382,7 +382,7 @@ void headerbox(ScrArea *area) if(active) BIF_ThemeColor(TH_HEADER); else BIF_ThemeColor(TH_HEADERDESEL); - /* weird values here... is because of window matrix that centres buttons */ + /* weird values here... is because of window matrix that centers buttons */ if(area->headertype==HEADERTOP) { uiSetRoundBox(3); uiRoundBoxEmboss(-0.5+area->headbutofs, -10.0, width-1.5+area->headbutofs, HEADERY-2.0, SCR_ROUND, active); @@ -2065,7 +2065,7 @@ ScrArea *closest_bigger_area(void) len= MIN4(len, len1, len2, len3); - /* plus centre */ + /* plus center */ vec[0]= (sa->v2->vec.x+sa->v3->vec.x)/2; vec[1]= (sa->v1->vec.y+sa->v2->vec.y)/2; diff --git a/source/blender/src/editview.c b/source/blender/src/editview.c index 2fc9cee5138..3b59b2fbd74 100644 --- a/source/blender/src/editview.c +++ b/source/blender/src/editview.c @@ -635,7 +635,7 @@ static char interpret_move(short mcord[][2], int count) /* new method: * - * starting from end points, calculate centre with maximum distance + * starting from end points, calculate center with maximum distance * dependant at the angle s / g / r is defined */ @@ -1278,7 +1278,7 @@ void mouse_select(void) getmouseco_areawin(mval); - /* This block uses the control key to make the object selected by its centre point rather then its contents */ + /* This block uses the control key to make the object selected by its center point rather then its contents */ if(G.obedit==0 && (G.qual & LR_CTRLKEY)) { /* note; shift+alt goes to group-flush-selecting */ @@ -2203,7 +2203,7 @@ void fly(void) /* the dist defines a vector that is infront of the offset to rotate the view about. this is no good for fly mode because we - want to rotate about the viewers centre. + want to rotate about the viewers center. but to correct the dist removal we must alter offset so the view dosent jump. */ diff --git a/source/blender/src/header_image.c b/source/blender/src/header_image.c index 4222fa24c3a..9b2c1ff41dc 100644 --- a/source/blender/src/header_image.c +++ b/source/blender/src/header_image.c @@ -438,7 +438,7 @@ static void do_image_viewmenu(void *arg, int event) add_blockhandler(curarea, IMAGE_HANDLER_PAINT, UI_PNL_UNSTOW); break; case 9: - image_viewcentre(); + image_viewcenter(); case 10: /* Display Normalized Coordinates */ G.sima->flag ^= SI_COORDFLOATS; allqueue(REDRAWIMAGE, 0); diff --git a/source/blender/src/header_info.c b/source/blender/src/header_info.c index c3bdffdc681..6810e6eb0f9 100644 --- a/source/blender/src/header_info.c +++ b/source/blender/src/header_info.c @@ -1971,7 +1971,7 @@ static void info_text(int x, int y) if (g_progress_bar) { hsize = 4 + (138.0 * g_done); - fac1 = 0.5 * g_done; // do some rainbow colours on progress + fac1 = 0.5 * g_done; /* do some rainbow colors on progress */ fac2 = 1.0; fac3 = 0.9; } else { diff --git a/source/blender/src/header_view3d.c b/source/blender/src/header_view3d.c index d41359fcf43..688c8842e5e 100644 --- a/source/blender/src/header_view3d.c +++ b/source/blender/src/header_view3d.c @@ -552,7 +552,7 @@ static void do_view3d_viewmenu(void *arg, int event) view3d_home(0); break; case 11: /* View Selected */ - centreview(); + centerview(); break; case 13: /* Play Back Animation */ play_anim(0); @@ -1681,13 +1681,13 @@ static void do_view3d_transformmenu(void *arg, int event) } else error("Only meshes can be shrinked/fattened"); break; case 10: - docentre(0); + docenter(0); break; case 11: - docentre_new(); + docenter_new(); break; case 12: - docentre_cursor(); + docenter_cursor(); break; case 13: initTransform(TFM_TILT, CTX_NONE); diff --git a/source/blender/src/interface.c b/source/blender/src/interface.c index 962b9f526a7..0bf26f5651f 100644 --- a/source/blender/src/interface.c +++ b/source/blender/src/interface.c @@ -650,7 +650,7 @@ static void ui_positionblock(uiBlock *block, uiBut *but) uiBut *bt; rctf butrct; float aspect; - int xsize, ysize, xof=0, yof=0, centre; + int xsize, ysize, xof=0, yof=0, center; short dir1= 0, dir2=0; /* first transform to screen coords, assuming matrix is stil OK */ @@ -699,13 +699,13 @@ static void ui_positionblock(uiBlock *block, uiBut *but) if(but) { short left=0, right=0, top=0, down=0; - if(block->direction & UI_CENTRE) centre= ysize/2; - else centre= 0; + if(block->direction & UI_CENTER) center= ysize/2; + else center= 0; if( butrct.xmin-xsize > 0.0) left= 1; if( butrct.xmax+xsize < G.curscreen->sizex) right= 1; - if( butrct.ymin-ysize+centre > 0.0) down= 1; - if( butrct.ymax+ysize-centre < G.curscreen->sizey) top= 1; + if( butrct.ymin-ysize+center > 0.0) down= 1; + if( butrct.ymax+ysize-center < G.curscreen->sizey) top= 1; dir1= block->direction & UI_DIRECTION; @@ -736,13 +736,13 @@ static void ui_positionblock(uiBlock *block, uiBut *but) if(dir1==UI_LEFT) { xof= butrct.xmin - block->maxx; - if(dir2==UI_TOP) yof= butrct.ymin - block->miny-centre; - else yof= butrct.ymax - block->maxy+centre; + if(dir2==UI_TOP) yof= butrct.ymin - block->miny-center; + else yof= butrct.ymax - block->maxy+center; } else if(dir1==UI_RIGHT) { xof= butrct.xmax - block->minx; - if(dir2==UI_TOP) yof= butrct.ymin - block->miny-centre; - else yof= butrct.ymax - block->maxy+centre; + if(dir2==UI_TOP) yof= butrct.ymin - block->miny-center; + else yof= butrct.ymax - block->maxy+center; } else if(dir1==UI_TOP) { yof= butrct.ymax - block->miny; @@ -3160,12 +3160,12 @@ static void do_palette_sample_cb(void *bt1, void *col1) /* frontbuf */ if(x<0 || y<0) return; - /* if we've got a glick, use OpenGL to sample the colour under the mouse pointer */ + /* if we've got a glick, use OpenGL to sample the color under the mouse pointer */ glReadBuffer(GL_FRONT); glReadPixels(x, y, 1, 1, GL_RGBA, GL_FLOAT, tempcol); glReadBuffer(GL_BACK); - /* and send that colour back to the picker */ + /* and send that color back to the picker */ rgb_to_hsv(tempcol[0], tempcol[1], tempcol[2], hsv, hsv+1, hsv+2); update_picker_buts_hsv(but1->block, hsv, but1->poin); update_picker_hex(but1->block, tempcol); @@ -3228,7 +3228,7 @@ void uiBlockPickerButtons(uiBlock *block, float *col, float *hsv, float *old, ch uiButSetFunc(bt, do_palette_sample_cb, bt, col); uiButSetFlag(bt, UI_TEXT_LEFT); - bt= uiDefBut(block, TEX, retval, "Hex: ", offs, 140, 140, 20, hexcol, 0, 8, 0, 0, "Hex triplet for colour (#RRGGBB)"); + bt= uiDefBut(block, TEX, retval, "Hex: ", offs, 140, 140, 20, hexcol, 0, 8, 0, 0, "Hex triplet for color (#RRGGBB)"); uiButSetFunc(bt, do_palette_hex_cb, bt, hexcol); uiBlockBeginAlign(block); @@ -3565,7 +3565,7 @@ static int ui_do_but_NORMAL(uiBut *but) fp[2]= -sqrt( radsq-dx*dx-dy*dy ); } } - Normalise(fp); + Normalize(fp); ui_draw_but(but); ui_block_flush_back(but->block); diff --git a/source/blender/src/interface_panel.c b/source/blender/src/interface_panel.c index ccca7a76066..4bf572b7ca4 100644 --- a/source/blender/src/interface_panel.c +++ b/source/blender/src/interface_panel.c @@ -602,7 +602,7 @@ static void ui_scale_panel_block(uiBlock *block) { uiBut *but; float facx= 1.0, facy= 1.0; - int centrex= 0, topy=0, tabsy=0; + int centerx= 0, topy=0, tabsy=0; if(block->panel==NULL) return; @@ -613,7 +613,7 @@ static void ui_scale_panel_block(uiBlock *block) if( block->maxx-block->minx > block->panel->sizex - 2*PNL_SAFETY ) { facx= (block->panel->sizex - (2*PNL_SAFETY))/( block->maxx-block->minx ); } - else centrex= (block->panel->sizex-( block->maxx-block->minx ) - 2*PNL_SAFETY)/2; + else centerx= (block->panel->sizex-( block->maxx-block->minx ) - 2*PNL_SAFETY)/2; // tabsy= PNL_HEADER*panel_has_tabs(block->panel); if( (block->maxy-block->miny) > block->panel->sizey - 2*PNL_SAFETY - tabsy) { @@ -623,9 +623,9 @@ static void ui_scale_panel_block(uiBlock *block) but= block->buttons.first; while(but) { - but->x1= PNL_SAFETY+centrex+ facx*(but->x1-block->minx); + but->x1= PNL_SAFETY+centerx+ facx*(but->x1-block->minx); but->y1= PNL_SAFETY+topy + facy*(but->y1-block->miny); - but->x2= PNL_SAFETY+centrex+ facx*(but->x2-block->minx); + but->x2= PNL_SAFETY+centerx+ facx*(but->x2-block->minx); but->y2= PNL_SAFETY+topy + facy*(but->y2-block->miny); if(facx!=1.0) ui_check_but(but); /* for strlen */ but= but->next; diff --git a/source/blender/src/parametrizer.c b/source/blender/src/parametrizer.c index 8c3ac6394f9..d70d25ecd31 100644 --- a/source/blender/src/parametrizer.c +++ b/source/blender/src/parametrizer.c @@ -145,8 +145,8 @@ static float p_vec_angle_cos(float *v1, float *v2, float *v3) d2[1] = v3[1] - v2[1]; d2[2] = v3[2] - v2[2]; - Normalise(d1); - Normalise(d2); + Normalize(d1); + Normalize(d2); return d1[0]*d2[0] + d1[1]*d2[1] + d1[2]*d2[2]; } diff --git a/source/blender/src/sculptmode.c b/source/blender/src/sculptmode.c index 7c9a2259a3c..2338765e3c9 100644 --- a/source/blender/src/sculptmode.c +++ b/source/blender/src/sculptmode.c @@ -475,13 +475,13 @@ vec3f calc_area_normal(const vec3f *outdir, const ListBase* active_verts) area_normal.z+= me->mvert[node->Index].no[2]; node= node->next; } - Normalise(&area_normal.x); + Normalize(&area_normal.x); if(outdir) { area_normal.x= outdir->x * view + area_normal.x * (10-view); area_normal.y= outdir->y * view + area_normal.y * (10-view); area_normal.z= outdir->z * view + area_normal.z * (10-view); } - Normalise(&area_normal.x); + Normalize(&area_normal.x); return area_normal; } void do_draw_brush(const EditData *e, const ListBase* active_verts) @@ -1059,7 +1059,7 @@ void update_damaged_vert(Mesh *me, ListBase *lb) add_face_normal(&norm,&me->mface[face->Index]); face= face->next; } - Normalise(&norm.x); + Normalize(&norm.x); me->mvert[vert->Index].no[0]=norm.x*32767; me->mvert[vert->Index].no[1]=norm.y*32767; @@ -1169,9 +1169,9 @@ void init_editdata(SculptData *sd, EditData *e, short *mouse, short *pr_mouse, c VecSubf(&e->up.x, &e->up.x, &zero_loc.x); VecSubf(&e->right.x, &e->right.x, &zero_loc.x); VecSubf(&e->out.x, &e->out.x, &zero_loc.x); - Normalise(&e->up.x); - Normalise(&e->right.x); - Normalise(&e->out.x); + Normalize(&e->up.x); + Normalize(&e->right.x); + Normalize(&e->out.x); /* Initialize mirror modifier clipping */ for(i=0; i<3; ++i) { diff --git a/source/blender/src/seqeffects.c b/source/blender/src/seqeffects.c index 1dad24b10dc..63069eb425d 100644 --- a/source/blender/src/seqeffects.c +++ b/source/blender/src/seqeffects.c @@ -795,9 +795,9 @@ static float gamma_range_table[RE_GAMMA_TABLE_SIZE + 1]; static float gamfactor_table[RE_GAMMA_TABLE_SIZE]; static float inv_gamma_range_table[RE_GAMMA_TABLE_SIZE + 1]; static float inv_gamfactor_table[RE_GAMMA_TABLE_SIZE]; -static float colour_domain_table[RE_GAMMA_TABLE_SIZE + 1]; -static float colour_step; -static float inv_colour_step; +static float color_domain_table[RE_GAMMA_TABLE_SIZE + 1]; +static float color_step; +static float inv_color_step; static float valid_gamma; static float valid_inv_gamma; @@ -808,15 +808,15 @@ static void makeGammaTables(float gamma) valid_gamma = gamma; valid_inv_gamma = 1.0 / gamma; - colour_step = 1.0 / RE_GAMMA_TABLE_SIZE; - inv_colour_step = (float) RE_GAMMA_TABLE_SIZE; + color_step = 1.0 / RE_GAMMA_TABLE_SIZE; + inv_color_step = (float) RE_GAMMA_TABLE_SIZE; /* We could squeeze out the two range tables to gain some memory. */ for (i = 0; i < RE_GAMMA_TABLE_SIZE; i++) { - colour_domain_table[i] = i * colour_step; - gamma_range_table[i] = pow(colour_domain_table[i], + color_domain_table[i] = i * color_step; + gamma_range_table[i] = pow(color_domain_table[i], valid_gamma); - inv_gamma_range_table[i] = pow(colour_domain_table[i], + inv_gamma_range_table[i] = pow(color_domain_table[i], valid_inv_gamma); } @@ -824,16 +824,16 @@ static void makeGammaTables(float gamma) /* rounding errors, we just set this explicitly. The last segment may */ /* have a different lenght than the other segments, but our */ /* interpolation is insensitive to that. */ - colour_domain_table[RE_GAMMA_TABLE_SIZE] = 1.0; + color_domain_table[RE_GAMMA_TABLE_SIZE] = 1.0; gamma_range_table[RE_GAMMA_TABLE_SIZE] = 1.0; inv_gamma_range_table[RE_GAMMA_TABLE_SIZE] = 1.0; /* To speed up calculations, we make these calc factor tables. They are */ /* multiplication factors used in scaling the interpolation. */ for (i = 0; i < RE_GAMMA_TABLE_SIZE; i++ ) { - gamfactor_table[i] = inv_colour_step + gamfactor_table[i] = inv_color_step * (gamma_range_table[i + 1] - gamma_range_table[i]) ; - inv_gamfactor_table[i] = inv_colour_step + inv_gamfactor_table[i] = inv_color_step * (inv_gamma_range_table[i + 1] - inv_gamma_range_table[i]) ; } @@ -845,15 +845,15 @@ static float gammaCorrect(float c) int i; float res = 0.0; - i = floor(c * inv_colour_step); + i = floor(c * inv_color_step); /* Clip to range [0,1]: outside, just do the complete calculation. */ /* We may have some performance problems here. Stretching up the LUT */ /* may help solve that, by exchanging LUT size for the interpolation. */ - /* Negative colours are explicitly handled. */ + /* Negative colors are explicitly handled. */ if (i < 0) res = -pow(abs(c), valid_gamma); else if (i >= RE_GAMMA_TABLE_SIZE ) res = pow(c, valid_gamma); else res = gamma_range_table[i] + - ( (c - colour_domain_table[i]) * gamfactor_table[i]); + ( (c - color_domain_table[i]) * gamfactor_table[i]); return res; } /* end of float gammaCorrect(float col) */ @@ -865,12 +865,12 @@ static float invGammaCorrect(float col) int i; float res = 0.0; - i = floor(col*inv_colour_step); - /* Negative colours are explicitly handled. */ + i = floor(col*inv_color_step); + /* Negative colors are explicitly handled. */ if (i < 0) res = -pow(abs(col), valid_inv_gamma); else if (i >= RE_GAMMA_TABLE_SIZE) res = pow(col, valid_inv_gamma); else res = inv_gamma_range_table[i] + - ( (col - colour_domain_table[i]) * inv_gamfactor_table[i]); + ( (col - color_domain_table[i]) * inv_gamfactor_table[i]); return res; } /* end of float invGammaCorrect(float col) */ diff --git a/source/blender/src/space.c b/source/blender/src/space.c index 399471aa091..1a4305f9eca 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -2355,7 +2355,7 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt) } else if(G.qual==LR_SHIFTKEY) { G.vd->around= V3D_CENTROID; } else if(G.qual==0) { - G.vd->around= V3D_CENTRE; + G.vd->around= V3D_CENTER; } handle_view3d_around(); @@ -2410,7 +2410,7 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt) break; case PADPERIOD: /* '.' */ if(G.qual==0) - centreview(); + centerview(); break; case PAGEUPKEY: @@ -3087,7 +3087,7 @@ void drawinfospace(ScrArea *sa, void *spacedata) y6label = y6-2; - /* set the colour to blue and draw the main 'tab' controls */ + /* set the color to blue and draw the main 'tab' controls */ uiBlockSetCol(block, TH_BUT_SETTING1); uiBlockBeginAlign(block); @@ -4792,7 +4792,7 @@ static void winqreadimagespace(ScrArea *sa, void *spacedata, BWinEvent *evt) break; case PADPERIOD: if(G.qual==0) - image_viewcentre(); + image_viewcenter(); break; } } diff --git a/source/blender/src/toets.c b/source/blender/src/toets.c index f35eb4320f4..87b76a084fe 100644 --- a/source/blender/src/toets.c +++ b/source/blender/src/toets.c @@ -320,7 +320,7 @@ void persptoetsen(unsigned short event) /* horizontal axis */ VECCOPY(q1+1, G.vd->viewinv[0]); - Normalise(q1+1); + Normalize(q1+1); phi= (float)(M_PI/360.0)*U.pad_rot_angle; if(event==PAD2) phi= -phi; si= (float)sin(phi); diff --git a/source/blender/src/toolbox.c b/source/blender/src/toolbox.c index e7f9584526b..dcbdf5758b1 100644 --- a/source/blender/src/toolbox.c +++ b/source/blender/src/toolbox.c @@ -1322,13 +1322,13 @@ static void tb_do_transform(void *arg, int event) else G.scene->proportional= 1; break; case 10: - docentre(0); + docenter(0); break; case 11: - docentre_new(); + docenter_new(); break; case 12: - docentre_cursor(); + docenter_cursor(); break; } allqueue(REDRAWVIEW3D, 0); @@ -1706,7 +1706,7 @@ static uiBlock *tb_makemenu(void *arg) if(U.uiflag & USER_PLAINMENUS) uiBlockSetDirection(block, UI_RIGHT); else - uiBlockSetDirection(block, UI_RIGHT|UI_CENTRE); + uiBlockSetDirection(block, UI_RIGHT|UI_CENTER); return block; } diff --git a/source/blender/src/transform.c b/source/blender/src/transform.c index 3bd63fed07a..2769f19f9bb 100755 --- a/source/blender/src/transform.c +++ b/source/blender/src/transform.c @@ -1269,7 +1269,7 @@ int Warp(TransInfo *t, short mval[2]) if (td->flag & TD_NOACTION) break; - /* translate point to centre, rotate in such a way that outline==distance */ + /* translate point to center, rotate in such a way that outline==distance */ VECCOPY(vec, td->iloc); Mat3MulVecfl(td->mtx, vec); @@ -1452,11 +1452,11 @@ static void TransMat3ToSize( float mat[][3], float smat[][3], float *size) float vec[3]; VecCopyf(vec, mat[0]); - size[0]= Normalise(vec); + size[0]= Normalize(vec); VecCopyf(vec, mat[1]); - size[1]= Normalise(vec); + size[1]= Normalize(vec); VecCopyf(vec, mat[2]); - size[2]= Normalise(vec); + size[2]= Normalize(vec); /* first tried with dotproduct... but the sign flip is crucial */ if( VECSIGNFLIP(mat[0], smat[0]) ) size[0]= -size[0]; @@ -1718,7 +1718,7 @@ int ToSphere(TransInfo *t, short mval[2]) VecSubf(vec, td->iloc, t->center); - radius = Normalise(vec); + radius = Normalize(vec); tratio = ratio * td->factor; @@ -1980,7 +1980,7 @@ int Rotation(TransInfo *t, short mval[2]) VECCOPY(axis, t->viewinv[2]); VecMulf(axis, -1.0f); - Normalise(axis); + Normalize(axis); dphi = saacos((float)deler); if( (dx1*dy2-dx2*dy1)>0.0 ) dphi= -dphi; @@ -2105,8 +2105,8 @@ int Trackball(TransInfo *t, short mval[2]) VECCOPY(axis1, t->persinv[0]); VECCOPY(axis2, t->persinv[1]); - Normalise(axis1); - Normalise(axis2); + Normalize(axis1); + Normalize(axis2); /* factore has to become setting or so */ phi[0]= 0.01f*(float)( t->imval[1] - mval[1] ); @@ -2607,7 +2607,7 @@ int PushPull(TransInfo *t, short mval[2]) Projf(vec, vec, axis); } } - Normalise(vec); + Normalize(vec); VecMulf(vec, distance); VecMulf(vec, td->factor); diff --git a/source/blender/src/transform_constraints.c b/source/blender/src/transform_constraints.c index dbf539a1740..423bee574f2 100755 --- a/source/blender/src/transform_constraints.c +++ b/source/blender/src/transform_constraints.c @@ -183,7 +183,7 @@ static void axisProjection(TransInfo *t, float axis[3], float in[3], float out[3 else factor*= factor; VECCOPY(out, axis); - Normalise(out); + Normalize(out); VecMulf(out, -factor); /* -factor makes move down going backwards */ } else { @@ -878,10 +878,10 @@ void setNearestAxis(TransInfo *t) axis[1] = (float)(icoord[1] - t->center2d[1]); axis[2] = 0.0f; - if (Normalise(axis) != 0.0f) { + if (Normalize(axis) != 0.0f) { Projf(proj, mvec, axis); VecSubf(axis, mvec, proj); - len[i] = Normalise(axis); + len[i] = Normalize(axis); } else { len[i] = 10000000000.0f; diff --git a/source/blender/src/transform_conversions.c b/source/blender/src/transform_conversions.c index ca2fa68a45c..f68e88deacd 100755 --- a/source/blender/src/transform_conversions.c +++ b/source/blender/src/transform_conversions.c @@ -240,7 +240,7 @@ static void set_prop_dist(TransInfo *t, short with_dist) if(td->flag & TD_SELECTED) { VecSubf(vec, tob->center, td->center); Mat3MulVecfl(tob->mtx, vec); - dist = Normalise(vec); + dist = Normalize(vec); if (tob->rdist == -1.0f) { tob->rdist = dist; } diff --git a/source/blender/src/transform_generics.c b/source/blender/src/transform_generics.c index d445603e1ed..32aed939161 100755 --- a/source/blender/src/transform_generics.c +++ b/source/blender/src/transform_generics.c @@ -131,7 +131,7 @@ void getViewVector(float coord[3], float vec[3]) else { VECCOPY(vec, t->viewinv[2]); } - Normalise(vec); + Normalize(vec); } /* ************************** GENERICS **************************** */ @@ -494,7 +494,7 @@ void initTrans (TransInfo *t) t->around = G.vd->around; } else - t->around = V3D_CENTRE; + t->around = V3D_CENTER; setTransformViewMatrices(t); } @@ -734,7 +734,7 @@ void calculateCenterBound(TransInfo *t) void calculateCenter(TransInfo *t) { switch(t->around) { - case V3D_CENTRE: + case V3D_CENTER: calculateCenterBound(t); break; case V3D_CENTROID: @@ -780,7 +780,7 @@ void calculateCenter(TransInfo *t) float axis[3]; /* persinv is nasty, use viewinv instead, always right */ VECCOPY(axis, t->viewinv[2]); - Normalise(axis); + Normalize(axis); /* 6.0 = 6 grid units */ axis[0]= t->center[0]- 6.0f*axis[0]; diff --git a/source/blender/src/transform_manipulator.c b/source/blender/src/transform_manipulator.c index 36acfcd4a59..acfb25f0d60 100644 --- a/source/blender/src/transform_manipulator.c +++ b/source/blender/src/transform_manipulator.c @@ -474,8 +474,8 @@ int calc_manipulator_stats(ScrArea *sa) Mat3MulVecfl(mat, normal); Mat3MulVecfl(mat, plane); - Normalise(normal); - if(0.0==Normalise(plane)) VECCOPY(plane, mat[1]); + Normalize(normal); + if(0.0==Normalize(plane)) VECCOPY(plane, mat[1]); VECCOPY(mat[2], normal); Crossf(mat[0], normal, plane); @@ -517,7 +517,7 @@ static float screen_aligned(float mat[][4]) float vec[3], size; VECCOPY(vec, mat[0]); - size= Normalise(vec); + size= Normalize(vec); glTranslatef(mat[3][0], mat[3][1], mat[3][2]); @@ -722,7 +722,7 @@ static void draw_manipulator_rotate_ghost(float mat[][4], int drawflags) vec[0]= (float)(Trans.con.imval[0] - Trans.center2d[0]); vec[1]= (float)(Trans.con.imval[1] - Trans.center2d[1]); vec[2]= 0.0f; - Normalise(vec); + Normalize(vec); startphi= saacos( vec[1] ); if(vec[0]<0.0) startphi= -startphi; @@ -750,7 +750,7 @@ static void draw_manipulator_rotate_ghost(float mat[][4], int drawflags) Mat3MulMat3(tmat, imat, ivmat); Mat3MulVecfl(tmat, svec); // tmat is used further on - Normalise(svec); + Normalize(svec); } mymultmatrix(mat); // aligns with original widget @@ -761,15 +761,15 @@ static void draw_manipulator_rotate_ghost(float mat[][4], int drawflags) /* correct for squeezed arc */ svec[0]+= tmat[2][0]; svec[1]+= tmat[2][1]; - Normalise(svec); + Normalize(svec); startphi= (float)atan2(svec[0], svec[1]); } else startphi= 0.5f*(float)M_PI; VECCOPY(vec, mat[0]); // use x axis to detect rotation - Normalise(vec); - Normalise(matt[0]); + Normalize(vec); + Normalize(matt[0]); phi= saacos( Inpf(vec, matt[0]) ); if(phi!=0.0) { Crossf(cross, vec, matt[0]); // results in z vector @@ -783,15 +783,15 @@ static void draw_manipulator_rotate_ghost(float mat[][4], int drawflags) /* correct for squeezed arc */ svec[1]+= tmat[2][1]; svec[2]+= tmat[2][2]; - Normalise(svec); + Normalize(svec); startphi= (float)(M_PI + atan2(svec[2], -svec[1])); } else startphi= 0.0f; VECCOPY(vec, mat[1]); // use y axis to detect rotation - Normalise(vec); - Normalise(matt[1]); + Normalize(vec); + Normalize(matt[1]); phi= saacos( Inpf(vec, matt[1]) ); if(phi!=0.0) { Crossf(cross, vec, matt[1]); // results in x vector @@ -807,15 +807,15 @@ static void draw_manipulator_rotate_ghost(float mat[][4], int drawflags) /* correct for squeezed arc */ svec[0]+= tmat[2][0]; svec[2]+= tmat[2][2]; - Normalise(svec); + Normalize(svec); startphi= (float)(M_PI + atan2(-svec[0], svec[2])); } else startphi= (float)M_PI; VECCOPY(vec, mat[2]); // use z axis to detect rotation - Normalise(vec); - Normalise(matt[2]); + Normalize(vec); + Normalize(matt[2]); phi= saacos( Inpf(vec, matt[2]) ); if(phi!=0.0) { Crossf(cross, vec, matt[2]); // results in y vector @@ -853,7 +853,7 @@ static void draw_manipulator_rotate(float mat[][4], int moving, int drawflags, i /* prepare for screen aligned draw */ VECCOPY(vec, mat[0]); - size= Normalise(vec); + size= Normalize(vec); glPushMatrix(); glTranslatef(mat[3][0], mat[3][1], mat[3][2]); @@ -884,7 +884,7 @@ static void draw_manipulator_rotate(float mat[][4], int moving, int drawflags, i vec[0]= (float)(Trans.imval[0] - Trans.center2d[0]); vec[1]= (float)(Trans.imval[1] - Trans.center2d[1]); vec[2]= 0.0f; - Normalise(vec); + Normalize(vec); VecMulf(vec, 1.2f*size); glBegin(GL_LINES); glVertex3f(0.0f, 0.0f, 0.0f); @@ -1255,7 +1255,7 @@ static void draw_manipulator_rotate_cyl(float mat[][4], int moving, int drawflag vec[0]= (float)(Trans.imval[0] - Trans.center2d[0]); vec[1]= (float)(Trans.imval[1] - Trans.center2d[1]); vec[2]= 0.0f; - Normalise(vec); + Normalize(vec); VecMulf(vec, 1.2f*size); glBegin(GL_LINES); glVertex3f(0.0, 0.0, 0.0); @@ -1337,9 +1337,9 @@ float get_drawsize(View3D *v3d) size= v3d->persmat[0][3]*v3d->twmat[3][0]+ v3d->persmat[1][3]*v3d->twmat[3][1]+ v3d->persmat[2][3]*v3d->twmat[3][2]+ v3d->persmat[3][3]; VECCOPY(vec, v3d->persinv[0]); - len1= Normalise(vec); + len1= Normalize(vec); VECCOPY(vec, v3d->persinv[1]); - len2= Normalise(vec); + len2= Normalize(vec); size*= 0.01f*(len1>len2?len1:len2); @@ -1431,9 +1431,9 @@ void BIF_draw_manipulator(ScrArea *sa) v3d->twflag |= V3D_DRAW_MANIPULATOR; - /* now we can define centre */ + /* now we can define center */ switch(v3d->around) { - case V3D_CENTRE: + case V3D_CENTER: case V3D_ACTIVE: v3d->twmat[3][0]= (G.scene->twmin[0] + G.scene->twmax[0])/2.0f; v3d->twmat[3][1]= (G.scene->twmin[1] + G.scene->twmax[1])/2.0f; diff --git a/source/blender/src/transform_snap.c b/source/blender/src/transform_snap.c index 8fc192f1e75..5b4ead1f519 100644 --- a/source/blender/src/transform_snap.c +++ b/source/blender/src/transform_snap.c @@ -285,8 +285,8 @@ float RotationBetween(TransInfo *t, float p1[3], float p2[3]) Projf(tmp, start, axis); VecSubf(start, start, tmp); - Normalise(end); - Normalise(start); + Normalize(end); + Normalize(start); Crossf(tmp, start, end); diff --git a/source/blender/src/usiblender.c b/source/blender/src/usiblender.c index beadff1320f..f7104762c8e 100644 --- a/source/blender/src/usiblender.c +++ b/source/blender/src/usiblender.c @@ -306,7 +306,7 @@ static void init_userdef_file(void) SETCOL(btheme->tnode.syntaxv, 142, 138, 145, 255); /* generator */ SETCOL(btheme->tnode.syntaxc, 120, 145, 120, 255); /* group */ } - /* Group theme colours */ + /* Group theme colors */ if(btheme->tv3d.group[3]==0) { SETCOL(btheme->tv3d.group, 0x10, 0x40, 0x10, 255); SETCOL(btheme->tv3d.group_active, 0x66, 0xFF, 0x66, 255); @@ -340,7 +340,7 @@ static void init_userdef_file(void) bTheme *btheme; for(btheme= U.themes.first; btheme; btheme= btheme->next) { - /* long keyframe colour */ + /* long keyframe color */ /* check for alpha==0 is safe, then color was never set */ if(btheme->tact.strip[3]==0) { SETCOL(btheme->tv3d.edge_sharp, 255, 32, 32, 255); diff --git a/source/blender/src/view.c b/source/blender/src/view.c index ef6a589e541..0c8f5ae66e5 100644 --- a/source/blender/src/view.c +++ b/source/blender/src/view.c @@ -466,7 +466,7 @@ void calctrackballvecfirst(rcti *area, short *mval, float *vec) radius= TRACKBALLSIZE; - /* normalise x and y */ + /* normalize x and y */ x= (area->xmax + area->xmin)/2 -mval[0]; x/= (float)((area->xmax - area->xmin)/2); y= (area->ymax + area->ymin)/2 -mval[1]; @@ -508,7 +508,7 @@ void calctrackballvec(rcti *area, short *mval, float *vec) radius= TRACKBALLSIZE; - /* x en y normaliseren */ + /* x en y normalizeren */ x= (area->xmax + area->xmin)/2 -mval[0]; x/= (float)((area->xmax - area->xmin)/4); y= (area->ymax + area->ymin)/2 -mval[1]; @@ -626,7 +626,7 @@ void viewmove(int mode) if (U.flag & USER_TRACKBALL) { Crossf(q1+1, firstvec, newvec); - Normalise(q1+1); + Normalize(q1+1); /* Allow for rotation beyond the interval * [-pi, pi] */ @@ -1266,7 +1266,7 @@ void initlocalview() BIF_view3d_previewrender_signal(curarea, PR_DBASE|PR_DISPRECT); } -void centreview() /* like a localview without local! */ +void centerview() /* like a localview without local! */ { Object *ob= OBACT; float size, min[3], max[3], afm[3]; @@ -1428,13 +1428,13 @@ void endlocalview(ScrArea *sa) } } -void view3d_home(int centre) +void view3d_home(int center) { Base *base; float size, min[3], max[3], afm[3]; int ok= 1, onedone=0; - if(centre) { + if(center) { min[0]= min[1]= min[2]= 0.0; max[0]= max[1]= max[2]= 0.0; } @@ -1490,7 +1490,7 @@ void view3d_align_axis_to_vector(View3D *v3d, int axisidx, float vec[3]) alignaxis[axisidx]= 1.0; norm[0]= vec[0], norm[1]= vec[1], norm[2]= vec[2]; - Normalise(norm); + Normalize(norm); angle= acos(Inpf(alignaxis, norm)); Crossf(axis, alignaxis, norm); |