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>2012-03-01 16:20:18 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-03-01 16:20:18 +0400
commitea13ec1699bcf59960daa57fd2cd9d24e195a71b (patch)
tree8f3b48f2b535426b425388181ed0b9a598ca2d06 /source/blender/render/intern
parent6a36b6249b8dc5bd0f60572fdbc2e42e79c14981 (diff)
Spelling Cleanup
Diffstat (limited to 'source/blender/render/intern')
-rw-r--r--source/blender/render/intern/include/gammaCorrectionTables.h2
-rw-r--r--source/blender/render/intern/include/rayobject.h2
-rw-r--r--source/blender/render/intern/include/render_types.h2
-rw-r--r--source/blender/render/intern/raytrace/rayobject.cpp4
-rw-r--r--source/blender/render/intern/source/occlusion.c2
-rw-r--r--source/blender/render/intern/source/pixelblending.c2
-rw-r--r--source/blender/render/intern/source/rayshade.c4
-rw-r--r--source/blender/render/intern/source/shadbuf.c2
-rw-r--r--source/blender/render/intern/source/zbuf.c2
9 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/render/intern/include/gammaCorrectionTables.h b/source/blender/render/intern/include/gammaCorrectionTables.h
index b41fc01eaaf..0df4248612b 100644
--- a/source/blender/render/intern/include/gammaCorrectionTables.h
+++ b/source/blender/render/intern/include/gammaCorrectionTables.h
@@ -37,7 +37,7 @@
#define __GAMMACORRECTIONTABLES_H__
/**
- * Initialise the gamma lookup tables
+ * Initialize the gamma lookup tables
*/
void makeGammaTables(float gamma);
diff --git a/source/blender/render/intern/include/rayobject.h b/source/blender/render/intern/include/rayobject.h
index c93c4e1da63..c43712ab95e 100644
--- a/source/blender/render/intern/include/rayobject.h
+++ b/source/blender/render/intern/include/rayobject.h
@@ -89,7 +89,7 @@ typedef struct RayFace {
RayObject* RE_rayface_from_vlak(RayFace *face, struct ObjectInstanceRen *obi, struct VlakRen *vlr);
/* RayObject representing faces directly from a given VlakRen structure. Thus
- allowing to save memory, but making code triangle intersection dependant on
+ allowing to save memory, but making code triangle intersection dependent on
render structures. */
typedef struct VlakPrimitive {
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h
index 886a6ce74f2..4c0a1b26dd6 100644
--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/include/render_types.h
@@ -190,7 +190,7 @@ struct Render
struct RayObject *raytree;
struct RayFace *rayfaces;
struct VlakPrimitive *rayprimitives;
- float maxdist; /* needed for keeping an incorrect behaviour of SUN and HEMI lights (avoid breaking old scenes) */
+ float maxdist; /* needed for keeping an incorrect behavior of SUN and HEMI lights (avoid breaking old scenes) */
/* occlusion tree */
void *occlusiontree;
diff --git a/source/blender/render/intern/raytrace/rayobject.cpp b/source/blender/render/intern/raytrace/rayobject.cpp
index ef31e730785..26c0105b624 100644
--- a/source/blender/render/intern/raytrace/rayobject.cpp
+++ b/source/blender/render/intern/raytrace/rayobject.cpp
@@ -282,7 +282,7 @@ MALWAYS_INLINE int isec_tri_quad_neighbour(float start[3], float dir[3], RayFace
return 0;
}
-/* RayFace intersection with checks and neighbour verifaction included,
+/* RayFace intersection with checks and neighbor verifaction included,
Isect is modified if the face is hit. */
MALWAYS_INLINE int intersect_rayface(RayObject *hit_obj, RayFace *face, Isect *is)
@@ -321,7 +321,7 @@ MALWAYS_INLINE int intersect_rayface(RayObject *hit_obj, RayFace *face, Isect *i
if(ok) {
/* when a shadow ray leaves a face, it can be little outside the edges
- of it, causing intersection to be detected in its neighbour face */
+ of it, causing intersection to be detected in its neighbor face */
if(is->skip & RE_SKIP_VLR_NEIGHBOUR)
{
if(dist < 0.1f && is->orig.ob == face->ob)
diff --git a/source/blender/render/intern/source/occlusion.c b/source/blender/render/intern/source/occlusion.c
index 669355c9977..c9729aecfae 100644
--- a/source/blender/render/intern/source/occlusion.c
+++ b/source/blender/render/intern/source/occlusion.c
@@ -1497,7 +1497,7 @@ static int sample_occ_cache(OcclusionTree *tree, float *co, float *n, int x, int
else
return 0;
- /* try to interpolate between 4 neighbouring pixels */
+ /* try to interpolate between 4 neighboring pixels */
samples[0]= find_occ_sample(cache, x, y);
samples[1]= find_occ_sample(cache, x+cache->step, y);
samples[2]= find_occ_sample(cache, x, y+cache->step);
diff --git a/source/blender/render/intern/source/pixelblending.c b/source/blender/render/intern/source/pixelblending.c
index 708f46971be..11e8e792159 100644
--- a/source/blender/render/intern/source/pixelblending.c
+++ b/source/blender/render/intern/source/pixelblending.c
@@ -55,7 +55,7 @@ extern struct Render R;
/* ------------------------------------------------------------------------- */
-/* Debug/behaviour defines */
+/* Debug/behavior defines */
/* if defined: alpha blending with floats clips color, as with shorts */
/* #define RE_FLOAT_COLOR_CLIPPING */
/* if defined: alpha values are clipped */
diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c
index 6c0386cc8b1..38178db5dcb 100644
--- a/source/blender/render/intern/source/rayshade.c
+++ b/source/blender/render/intern/source/rayshade.c
@@ -461,7 +461,7 @@ void makeraytree(Render *re)
else
{
//Calculate raytree max_size
- //This is ONLY needed to kept a bogus behaviour of SUN and HEMI lights
+ //This is ONLY needed to kept a bogus behavior of SUN and HEMI lights
INIT_MINMAX(min, max);
RE_rayobject_merge_bb( re->raytree, min, max );
for(i=0; i<3; i++)
@@ -1085,7 +1085,7 @@ static void QMC_initPixel(QMCSampler *qsa, int thread)
else { /* SAMP_TYPE_HALTON */
/* generate a new randomised halton sequence per pixel
- * to alleviate qmc artifacts and make it reproducable
+ * to alleviate qmc artifacts and make it reproducible
* between threads/frames */
double ht_invprimes[2], ht_nums[2];
double r[2];
diff --git a/source/blender/render/intern/source/shadbuf.c b/source/blender/render/intern/source/shadbuf.c
index 0cd5c361499..0e90fbf7536 100644
--- a/source/blender/render/intern/source/shadbuf.c
+++ b/source/blender/render/intern/source/shadbuf.c
@@ -764,7 +764,7 @@ void makeshadowbuf(Render *re, LampRen *lar)
if(lar->bufflag & (LA_SHADBUF_AUTO_START|LA_SHADBUF_AUTO_END))
shadowbuf_autoclip(re, lar);
- /* just to enforce identical behaviour of all irregular buffers */
+ /* just to enforce identical behavior of all irregular buffers */
if(lar->buftype==LA_SHADBUF_IRREGULAR)
shb->size= 1024;
diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c
index 807a3d7d0eb..e90047a4a9c 100644
--- a/source/blender/render/intern/source/zbuf.c
+++ b/source/blender/render/intern/source/zbuf.c
@@ -2736,7 +2736,7 @@ static void zbuf_fill_in_rgba(ZSpan *zspan, DrawBufPixel *col, float *v1, float
}
/* char value==255 is filled in, rest should be zero */
-/* returns alpha values, but sets alpha to 1 for zero alpha pixels that have an alpha value as neighbour */
+/* returns alpha values, but sets alpha to 1 for zero alpha pixels that have an alpha value as neighbor */
void antialias_tagbuf(int xsize, int ysize, char *rectmove)
{
char *row1, *row2, *row3;