diff options
-rw-r--r-- | intern/cycles/render/session.cpp | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_SystemX11.cpp | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/delaunay_2d.c | 4 | ||||
-rw-r--r-- | source/blender/depsgraph/intern/depsgraph_relation.cc | 4 | ||||
-rw-r--r-- | source/blender/editors/interface/view2d.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/RNA_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index ae0a2cf863a..f45e6d68c97 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -629,7 +629,7 @@ void Session::run_cpu() } /* Don't go in pause mode when preview kernels are used - * When feature kernels become available the session will be resetted. */ + * When feature kernels become available the session will be reset. */ else if (no_tiles && kernel_state == DEVICE_KERNEL_WAITING_FOR_FEATURE_KERNEL) { time_sleep(0.1); } diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index 89a2578bd5a..60d08305621 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -1438,7 +1438,7 @@ void GHOST_SystemX11::processEvent(XEvent *xe) * around tablet surface */ window->GetTabletData().Active = xtablet.mode; - /* Note: This event might be generated with incomplete dataset + /* Note: This event might be generated with incomplete data-set * (don't exactly know why, looks like in some cases, if the value does not change, * it is not included in subsequent XDeviceMotionEvent events). * So we have to check which values this event actually contains! diff --git a/source/blender/blenlib/intern/delaunay_2d.c b/source/blender/blenlib/intern/delaunay_2d.c index 0a2addff6d1..c222ed06aaa 100644 --- a/source/blender/blenlib/intern/delaunay_2d.c +++ b/source/blender/blenlib/intern/delaunay_2d.c @@ -3524,8 +3524,8 @@ static void exactinit(void) * Sets h = e + f. See the long version of my paper for details. * * If round-to-even is used (as with IEEE 754), maintains the strongly - * nonoverlapping property. (That is, if e is strongly nonoverlapping, h - * will be also.) Does NOT maintain the nonoverlapping or nonadjacent + * non-overlapping property. (That is, if e is strongly non-overlapping, h + * will be also.) Does NOT maintain the non-overlapping or non-adjacent * properties. */ diff --git a/source/blender/depsgraph/intern/depsgraph_relation.cc b/source/blender/depsgraph/intern/depsgraph_relation.cc index 1b2de2cc807..cff62540ca8 100644 --- a/source/blender/depsgraph/intern/depsgraph_relation.cc +++ b/source/blender/depsgraph/intern/depsgraph_relation.cc @@ -42,7 +42,7 @@ Relation::Relation(Node *from, Node *to, const char *description) /* Hook it up to the nodes which use it. * * NOTE: We register relation in the nodes which this link connects to here - * in constructor but we don't unregister it in the destructor. + * in constructor but we don't un-register it in the destructor. * * Reasoning: * @@ -50,7 +50,7 @@ Relation::Relation(Node *from, Node *to, const char *description) * real need in avoiding dangling pointers, all the memory is to be freed * anyway. * - * - Unregistering relation is not a cheap operation, so better to have it + * - Un-registering relation is not a cheap operation, so better to have it * as an explicit call if we need this. */ from->outlinks.push_back(this); to->inlinks.push_back(this); diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index 517d8ca51a3..ac65ce2a28e 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -1607,7 +1607,7 @@ void UI_view2d_scrollers_draw(View2D *v2d, View2DScrollers *vs) * - slider bubble is large enough (no overdraw confusion) * - scale is shown on the scroller * (workaround to make sure that button windows don't show these, - * and only the time-grids with their zoomability can do so) + * and only the time-grids with their zoom-ability can do so). */ if ((v2d->keepzoom & V2D_LOCKZOOM_X) == 0 && (v2d->scroll & V2D_SCROLL_HORIZONTAL_HANDLES) && (BLI_rcti_size_x(&slider) > V2D_SCROLL_HANDLE_SIZE_HOTSPOT)) { diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h index 32f2b55ca54..7a85f5c372f 100644 --- a/source/blender/makesrna/RNA_types.h +++ b/source/blender/makesrna/RNA_types.h @@ -293,7 +293,7 @@ typedef enum PropertyOverrideFlag { * Forbid usage of this property in comparison (& hence override) code. * Useful e.g. for collections of data like mesh's geometry, particles, etc. * Also for runtime data that should never be considered as part of actual Blend data (e.g. - * dpesgraph from ViewLayers...). + * depsgraph from ViewLayers...). */ PROPOVERRIDE_NO_COMPARISON = (1 << 1), diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 599b8fd91c8..a427267926d 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -1045,7 +1045,7 @@ static void rna_Scene_active_keying_set_set(PointerRNA *ptr, /* get KeyingSet index stuff for list of Keying Sets editing UI * - active_keyingset-1 since 0 is reserved for 'none' - * - don't clamp, otherwise can never set builtins types as active... + * - don't clamp, otherwise can never set builtin's types as active... */ static int rna_Scene_active_keying_set_index_get(PointerRNA *ptr) { |