diff options
-rw-r--r-- | source/blender/blenkernel/intern/curve.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/library.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/library_query.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/node.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/pbvh_bmesh.c | 2 | ||||
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_opdefines.c | 2 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 4 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_animation.c | 2 | ||||
-rw-r--r-- | source/blender/render/intern/raytrace/rayobject_rtbuild.h | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_jobs.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/wm_event_system.h | 3 |
14 files changed, 16 insertions, 17 deletions
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index d0382b941ed..5f72abbadf3 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -3586,8 +3586,8 @@ static bool tridiagonal_solve_with_limits(float *a, float *b, float *c, float *d * This function computes the handles of a series of auto bezier points * on the basis of 'no acceleration discontinuities' at the points. * The first and last bezier points are considered 'fixed' (their handles are not touched) - * The result is the smoothest possible trajectory going through intemediate points. - * The difficulty is that the handles depends on their neighbours. + * The result is the smoothest possible trajectory going through intermediate points. + * The difficulty is that the handles depends on their neighbors. * * The exact solution is found by solving a tridiagonal matrix equation formed * by the continuity and boundary conditions. Although theoretically handle position diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index b659e59e83a..d8617ef44e4 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -1940,7 +1940,7 @@ static void library_make_local_copying_check(ID *id, GSet *loop_tags, MainIDRela * * Current version uses regular id_make_local callback, with advanced pre-processing step to detect all cases of * IDs currently indirectly used, but which will be used by local data only once this function is finished. - * This allows to avoid any uneeded duplication of IDs, and hence all time lost afterwards to remove + * This allows to avoid any unneeded duplication of IDs, and hence all time lost afterwards to remove * orphaned linked data-blocks... */ void BKE_library_make_local( diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c index d1f0c87183d..23c049ea917 100644 --- a/source/blender/blenkernel/intern/library_query.c +++ b/source/blender/blenkernel/intern/library_query.c @@ -375,7 +375,7 @@ void BKE_library_foreach_ID_link(Main *bmain, ID *id, LibraryIDLinkCallback call if (bmain != NULL && bmain->relations != NULL && (flag & IDWALK_READONLY)) { /* Note that this is minor optimization, even in worst cases (like id being an object with lots of * drivers and constraints and modifiers, or material etc. with huge node tree), - * but we might as well use it (Main->relations is always assumed valid, it's responsability of code + * but we might as well use it (Main->relations is always assumed valid, it's responsibility of code * creating it to free it, especially if/when it starts modifying Main database). */ MainIDRelationsEntry *entry = BLI_ghash_lookup(bmain->relations->id_user_to_used, id); for (; entry != NULL; entry = entry->next) { diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 54afe76ec07..925c528e271 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -1325,7 +1325,7 @@ void ntreeUserDecrefID(bNodeTree *ntree) /* *************** Node Preview *********** */ /* XXX this should be removed eventually ... - * Currently BKE functions are modelled closely on previous code, + * Currently BKE functions are modeled closely on previous code, * using BKE_node_preview_init_tree to set up previews for a whole node tree in advance. * This should be left more to the individual node tree implementations. */ diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c index 187891e7210..e77edb21798 100644 --- a/source/blender/blenkernel/intern/pbvh_bmesh.c +++ b/source/blender/blenkernel/intern/pbvh_bmesh.c @@ -1172,7 +1172,7 @@ static void pbvh_bmesh_split_edge( * * - faces wind anticlockwise in this example. * - original edge is ``(v1, v2)`` - * - oroginal face is ``(v1, v2, v3)`` + * - original face is ``(v1, v2, v3)`` * * <pre> * + v3(v_opp) diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 231b467a0af..646cf978453 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -872,7 +872,7 @@ BHead *blo_nextbhead(FileData *fd, BHead *thisblock) return(bhead); } -/* Warning! Caller's responsability to ensure given bhead **is** and ID one! */ +/* Warning! Caller's responsibility to ensure given bhead **is** and ID one! */ const char *bhead_id_name(const FileData *fd, const BHead *bhead) { return (const char *)POINTER_OFFSET(bhead, sizeof(*bhead) + fd->id_name_offs); diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c index 4f48dafd211..8e0e905cf88 100644 --- a/source/blender/bmesh/intern/bmesh_opdefines.c +++ b/source/blender/bmesh/intern/bmesh_opdefines.c @@ -120,7 +120,7 @@ static BMOpDefine bmo_smooth_vert_def = { }; /* - * Vertext Smooth Laplacian. + * Vertex Smooth Laplacian. * * Smooths vertices by using Laplacian smoothing propose by. * Desbrun, et al. Implicit Fairing of Irregular Meshes using Diffusion and Curvature Flow. diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index bd94ac2f1d4..30e6596251d 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -1290,7 +1290,7 @@ static bool ui_drag_toggle_set_xy_xy( } } if (changed) { - /* apply now, not on release (or if handlers are cancelled for whatever reason) */ + /* apply now, not on release (or if handlers are canceled for whatever reason) */ ui_apply_but_funcs_after(C); } @@ -8030,7 +8030,7 @@ static void button_activate_exit( ui_but_update(but); /* adds empty mousemove in queue for re-init handler, in case mouse is - * still over a button. we cannot just check for this ourselfs because + * still over a button. We cannot just check for this ourselves because * at this point the mouse may be over a button in another region */ if (mousemove) WM_event_add_mousemove(C); diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 2d7fa760e49..427e179f29a 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -2199,7 +2199,7 @@ int GPU_scene_object_lights(Scene *scene, Object *ob, int lay, float viewmat[4][ GPU_basic_shader_light_set(count, NULL); /* view direction for specular is not computed correct by default in - * opengl, so we set the settings ourselfs */ + * opengl, so we set the settings ourselves */ GPU_basic_shader_light_set_viewer(!ortho); int count = 0; diff --git a/source/blender/makesrna/intern/rna_animation.c b/source/blender/makesrna/intern/rna_animation.c index d798a8f7ecc..c9c8a791545 100644 --- a/source/blender/makesrna/intern/rna_animation.c +++ b/source/blender/makesrna/intern/rna_animation.c @@ -675,7 +675,7 @@ static void rna_def_keyingset_info(BlenderRNA *brna) /* Regarding why we don't use rna_def_common_keying_flags() here: * - Using it would keep this case in sync with the other places - * where these options are exposed (which are optimised for being + * where these options are exposed (which are optimized for being * used in the UI). * - Unlike all the other places, this case is used for defining * new "built in" Keying Sets via the Python API. In that case, diff --git a/source/blender/render/intern/raytrace/rayobject_rtbuild.h b/source/blender/render/intern/raytrace/rayobject_rtbuild.h index 83042ef3d7e..061d76e3a3e 100644 --- a/source/blender/render/intern/raytrace/rayobject_rtbuild.h +++ b/source/blender/render/intern/raytrace/rayobject_rtbuild.h @@ -42,7 +42,7 @@ extern "C" { /* * Ray Tree Builder * this structs helps building any type of tree - * it contains several methods to organiza/split nodes + * it contains several methods to organize/split nodes * allowing to create a given tree on the fly. * * Idea is that other trees BVH, BIH can use this code to diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c index 5580d3217a5..528b9e2b3d9 100644 --- a/source/blender/windowmanager/intern/wm_jobs.c +++ b/source/blender/windowmanager/intern/wm_jobs.c @@ -379,7 +379,7 @@ static void wm_jobs_test_suspend_stop(wmWindowManager *wm, wmJob *test) } } - /* possible suspend ourselfs, waiting for other jobs, or de-suspend */ + /* Possible suspend ourselves, waiting for other jobs, or de-suspend. */ test->suspended = suspend; // if (suspend) printf("job suspended: %s\n", test->name); } diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 2b96cca6653..6d5d0964616 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -1433,7 +1433,7 @@ static void dialog_exec_cb(bContext *C, void *arg1, void *arg2) wmOpPopUp *data = arg1; uiBlock *block = arg2; - /* Explicitly set UI_RETURN_OK flag, otherwise the menu might be cancelled + /* Explicitly set UI_RETURN_OK flag, otherwise the menu might be canceled * in case WM_operator_call_ex exits/reloads the current file (T49199). */ UI_popup_menu_retval_set(block, UI_RETURN_OK, true); diff --git a/source/blender/windowmanager/wm_event_system.h b/source/blender/windowmanager/wm_event_system.h index ae04aa5c51b..9977e73f2fd 100644 --- a/source/blender/windowmanager/wm_event_system.h +++ b/source/blender/windowmanager/wm_event_system.h @@ -71,7 +71,7 @@ typedef struct wmEventHandler { } wmEventHandler; -/* custom types for handlers, for signalling, freeing */ +/* custom types for handlers, for signaling, freeing */ enum { WM_HANDLER_DEFAULT, WM_HANDLER_FILESELECT @@ -98,4 +98,3 @@ void wm_drags_check_ops(bContext *C, const wmEvent *event); void wm_drags_draw(bContext *C, wmWindow *win, rcti *rect); #endif /* __WM_EVENT_SYSTEM_H__ */ - |