Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2007-04-04 17:18:41 +0400
committerCampbell Barton <ideasman42@gmail.com>2007-04-04 17:18:41 +0400
commitafdd54fa3720c267f30e48ed45c449d80449bac0 (patch)
tree3192044fa53f6e1fd3d1b0256963c2d4c090d700 /source/blender/include
parent203e6ed82b444786d7999e88cebef84d6d429765 (diff)
moved source and text to american spelling
* colour -> color * centre -> center * normalise -> normalize * modelling -> modeling
Diffstat (limited to 'source/blender/include')
-rw-r--r--source/blender/include/BDR_drawobject.h2
-rw-r--r--source/blender/include/BDR_editobject.h6
-rw-r--r--source/blender/include/BIF_drawimage.h2
-rw-r--r--source/blender/include/BIF_editarmature.h2
-rw-r--r--source/blender/include/BIF_gl.h2
-rw-r--r--source/blender/include/BIF_interface.h2
-rw-r--r--source/blender/include/BSE_view.h4
-rw-r--r--source/blender/include/butspace.h6
-rwxr-xr-xsource/blender/include/transform.h2
9 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/include/BDR_drawobject.h b/source/blender/include/BDR_drawobject.h
index 9899d56f294..05bf4d75e88 100644
--- a/source/blender/include/BDR_drawobject.h
+++ b/source/blender/include/BDR_drawobject.h
@@ -61,7 +61,7 @@ void lattice_foreachScreenVert(void (*func)(void *userData, struct BPoint *bp, i
void nurbs_foreachScreenVert(void (*func)(void *userData, struct Nurb *nu, struct BPoint *bp, struct BezTriple *bezt, int beztindex, int x, int y), void *userData);
void drawcircball(int mode, float *cent, float rad, float tmat[][4]);
-void get_local_bounds(struct Object *ob, float *centre, float *size);
+void get_local_bounds(struct Object *ob, float *center, float *size);
/* drawing flags: */
#define DRAW_PICKING 1
diff --git a/source/blender/include/BDR_editobject.h b/source/blender/include/BDR_editobject.h
index f3af74d1c24..4ac83b452b0 100644
--- a/source/blender/include/BDR_editobject.h
+++ b/source/blender/include/BDR_editobject.h
@@ -65,9 +65,9 @@ void exit_editmode(int flag);
void check_editmode(int type);
void enter_editmode(int wc);
-void docentre(int centremode);
-void docentre_new(void);
-void docentre_cursor(void);
+void docenter(int centermode);
+void docenter_new(void);
+void docenter_cursor(void);
void movetolayer(void);
void special_editmenu(void);
void convertmenu(void);
diff --git a/source/blender/include/BIF_drawimage.h b/source/blender/include/BIF_drawimage.h
index b296107f084..72562b76beb 100644
--- a/source/blender/include/BIF_drawimage.h
+++ b/source/blender/include/BIF_drawimage.h
@@ -48,7 +48,7 @@ void image_changed(struct SpaceImage *sima, int dotile);
void image_home(void);
void image_viewmove(int mode);
void image_viewzoom(unsigned short event, int invert);
-void image_viewcentre(void);
+void image_viewcenter(void);
void uvco_to_areaco(float *vec, short *mval);
void uvco_to_areaco_noclip(float *vec, int *mval);
void what_image(struct SpaceImage *sima);
diff --git a/source/blender/include/BIF_editarmature.h b/source/blender/include/BIF_editarmature.h
index 1bf40393e5f..b8ae90b7cfa 100644
--- a/source/blender/include/BIF_editarmature.h
+++ b/source/blender/include/BIF_editarmature.h
@@ -76,7 +76,7 @@ void adduplicate_armature(void);
void addvert_armature(void);
void add_primitiveArmature(int type);
void apply_rot_armature (struct Object *ob, float mat[3][3]);
-void docentre_armature (struct Object *ob, int centremode);
+void docenter_armature (struct Object *ob, int centermode);
void clear_armature(struct Object *ob, char mode);
diff --git a/source/blender/include/BIF_gl.h b/source/blender/include/BIF_gl.h
index 9790becfd70..215e88dc002 100644
--- a/source/blender/include/BIF_gl.h
+++ b/source/blender/include/BIF_gl.h
@@ -68,7 +68,7 @@
/*
*
* This define converts a numerical value to the equivalent 24-bit
- * colour, while not being endian-sensitive. On little-endians, this
+ * color, while not being endian-sensitive. On little-endians, this
* is the same as doing a 'naive'indexing, on big-endian, it is not!
* */
#define cpack(x) glColor3ub( ((x)&0xFF), (((x)>>8)&0xFF), (((x)>>16)&0xFF) )
diff --git a/source/blender/include/BIF_interface.h b/source/blender/include/BIF_interface.h
index 9b7078d0476..e8d25cfd14f 100644
--- a/source/blender/include/BIF_interface.h
+++ b/source/blender/include/BIF_interface.h
@@ -52,7 +52,7 @@ struct ScrArea;
#define UI_LEFT 4
#define UI_RIGHT 8
#define UI_DIRECTION 15
-#define UI_CENTRE 16
+#define UI_CENTER 16
#define UI_SHIFT_FLIPPED 32
/* uiBlock->autofill */
diff --git a/source/blender/include/BSE_view.h b/source/blender/include/BSE_view.h
index eddee0b1fdb..27f452b3deb 100644
--- a/source/blender/include/BSE_view.h
+++ b/source/blender/include/BSE_view.h
@@ -85,10 +85,10 @@ void setviewmatrixview3d(void);
float *give_cursor(void);
unsigned int free_localbit(void);
void initlocalview(void);
-void centreview(void);
+void centerview(void);
void restore_localviewdata(struct View3D *vd);
void endlocalview(struct ScrArea *sa);
-void view3d_home(int centre);
+void view3d_home(int center);
short view3d_opengl_select(unsigned int *buffer, unsigned int buffsize, short x1, short y1, short x2, short y2);
void view3d_align_axis_to_vector(struct View3D *v3d, int axisidx, float vec[3]);
diff --git a/source/blender/include/butspace.h b/source/blender/include/butspace.h
index 6e09a132a4a..eb6a9bfeebb 100644
--- a/source/blender/include/butspace.h
+++ b/source/blender/include/butspace.h
@@ -358,9 +358,9 @@ void curvemap_buttons(struct uiBlock *block, struct CurveMapping *cumap, char la
#define B_SETSMOOTH 2012
#define B_SETSOLID 2013
#define B_AUTOTEX 2014
-#define B_DOCENTRE 2015
-#define B_DOCENTRENEW 2016
-#define B_DOCENTRECURSOR 2017
+#define B_DOCENTER 2015
+#define B_DOCENTERNEW 2016
+#define B_DOCENTERCURSOR 2017
/* 20 values! */
#define B_OBLAY 2019
diff --git a/source/blender/include/transform.h b/source/blender/include/transform.h
index b5ddea65339..e7650b2f72a 100755
--- a/source/blender/include/transform.h
+++ b/source/blender/include/transform.h
@@ -82,7 +82,7 @@ typedef struct TransCon {
float mtx[3][3]; /* Matrix of the Constraint space */
float imtx[3][3]; /* Inverse Matrix of the Constraint space */
float pmtx[3][3]; /* Projection Constraint Matrix (same as imtx with some axis == 0) */
- float center[3]; /* transformation centre to define where to draw the view widget
+ float center[3]; /* transformation center to define where to draw the view widget
ALWAYS in global space. Unlike the transformation center */
short imval[2]; /* initial mouse value for visual calculation */
/* the one in TransInfo is not garanty to stay the same (Rotates change it) */