diff options
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/undofile.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_logic/logic_window.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/drawanimviz.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/drawarmature.c | 4 | ||||
| -rw-r--r-- | source/blender/render/intern/source/rayshade.c | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/source/rendercore.c | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 5c09f866b3a..1309c0b3bf1 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -11987,7 +11987,7 @@ static void library_append_end(const bContext *C, Main *mainl, FileData **fd, in Main *mainvar= CTX_data_main(C); Scene *scene= CTX_data_scene(C); - /* make main consistant */ + /* make main consistent */ expand_main(*fd, mainl); /* do this when expand found other libs */ diff --git a/source/blender/blenloader/intern/undofile.c b/source/blender/blenloader/intern/undofile.c index f6fabbdad21..b11099c45f5 100644 --- a/source/blender/blenloader/intern/undofile.c +++ b/source/blender/blenloader/intern/undofile.c @@ -67,7 +67,7 @@ void BLO_free_memfile(MemFile *memfile) memfile->size= 0; } -/* to keep list of memfiles consistant, 'first' is always first in list */ +/* to keep list of memfiles consistent, 'first' is always first in list */ /* result is that 'first' is being freed */ void BLO_merge_memfile(MemFile *first, MemFile *second) { diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c index d9bfa43bd41..ae14fe59a4e 100644 --- a/source/blender/editors/space_logic/logic_window.c +++ b/source/blender/editors/space_logic/logic_window.c @@ -375,7 +375,7 @@ void do_logic_buts(bContext *C, void *arg, int event) switch(event) { case B_SETPROP: - /* check for inconsistant types */ + /* check for inconsistent types */ ob->gameflag &= ~(OB_SECTOR|OB_MAINACTOR|OB_DYNAMIC|OB_ACTOR); break; diff --git a/source/blender/editors/space_view3d/drawanimviz.c b/source/blender/editors/space_view3d/drawanimviz.c index c57fad96a94..11e598aeb59 100644 --- a/source/blender/editors/space_view3d/drawanimviz.c +++ b/source/blender/editors/space_view3d/drawanimviz.c @@ -516,7 +516,7 @@ static void draw_ghost_poses(Scene *scene, View3D *v3d, ARegion *ar, Base *base) /* draw from darkest blend to lowest */ for(cur= stepsize; cur<range; cur+=stepsize) { - ctime= cur - (float)fmod(cfrao, stepsize); /* ensures consistant stepping */ + ctime= cur - (float)fmod(cfrao, stepsize); /* ensures consistent stepping */ colfac= ctime/range; UI_ThemeColorShadeAlpha(TH_WIRE, 0, -128-(int)(120.0*sqrt(colfac))); @@ -531,7 +531,7 @@ static void draw_ghost_poses(Scene *scene, View3D *v3d, ARegion *ar, Base *base) } } - ctime= cur + (float)fmod((float)cfrao, stepsize) - stepsize+1.0f; /* ensures consistant stepping */ + ctime= cur + (float)fmod((float)cfrao, stepsize) - stepsize+1.0f; /* ensures consistent stepping */ colfac= ctime/range; UI_ThemeColorShadeAlpha(TH_WIRE, 0, -128-(int)(120.0*sqrt(colfac))); diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c index bfdeaef1834..e7eff234b6e 100644 --- a/source/blender/editors/space_view3d/drawarmature.c +++ b/source/blender/editors/space_view3d/drawarmature.c @@ -2350,7 +2350,7 @@ static void draw_ghost_poses(Scene *scene, View3D *v3d, ARegion *ar, Base *base) /* draw from darkest blend to lowest */ for(cur= stepsize; cur<range; cur+=stepsize) { - ctime= cur - (float)fmod(cfrao, stepsize); /* ensures consistant stepping */ + ctime= cur - (float)fmod(cfrao, stepsize); /* ensures consistent stepping */ colfac= ctime/range; UI_ThemeColorShadeAlpha(TH_WIRE, 0, -128-(int)(120.0*sqrt(colfac))); @@ -2365,7 +2365,7 @@ static void draw_ghost_poses(Scene *scene, View3D *v3d, ARegion *ar, Base *base) } } - ctime= cur + (float)fmod((float)cfrao, stepsize) - stepsize+1.0f; /* ensures consistant stepping */ + ctime= cur + (float)fmod((float)cfrao, stepsize) - stepsize+1.0f; /* ensures consistent stepping */ colfac= ctime/range; UI_ThemeColorShadeAlpha(TH_WIRE, 0, -128-(int)(120.0*sqrt(colfac))); diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c index 36284e7919d..5bdc1276a91 100644 --- a/source/blender/render/intern/source/rayshade.c +++ b/source/blender/render/intern/source/rayshade.c @@ -906,7 +906,7 @@ static void jitter_plane_offset(float *jitter1, float *jitter2, int tot, float s } /* called from convertBlenderScene.c */ -/* we do this in advance to get consistant random, not alter the render seed, and be threadsafe */ +/* we do this in advance to get consistent random, not alter the render seed, and be threadsafe */ void init_jitter_plane(LampRen *lar) { float *fp; diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c index 23875b536c9..e99d2bfa0f6 100644 --- a/source/blender/render/intern/source/rendercore.c +++ b/source/blender/render/intern/source/rendercore.c @@ -1291,7 +1291,7 @@ void zbufshade_tile(RenderPart *pa) zbuffer_solid(pa, rl, NULL, NULL); - if(!R.test_break(R.tbh)) { /* NOTE: this if() is not consistant */ + if(!R.test_break(R.tbh)) { /* NOTE: this if() is not consistent */ /* edges only for solid part, ztransp doesn't support it yet anti-aliased */ if(rl->layflag & SCE_LAY_EDGE) { |