diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-11-27 06:54:53 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-11-27 06:54:53 +0300 |
commit | 4fd99c949587781529a998d5baa2870c93cd80b4 (patch) | |
tree | 2945796a705c76acb608b9d389f9e0a4564e462a | |
parent | b9e10273e0412f357698462247d595d54043234e (diff) |
Cleanup: spelling, clang-format
-rw-r--r-- | source/blender/alembic/intern/abc_mball.cc | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 2 | ||||
-rw-r--r-- | source/blender/depsgraph/intern/depsgraph_query.cc | 3 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_tracking_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 3 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_operator_props.c | 6 |
6 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/alembic/intern/abc_mball.cc b/source/blender/alembic/intern/abc_mball.cc index 3ee26a5081a..732ceffe467 100644 --- a/source/blender/alembic/intern/abc_mball.cc +++ b/source/blender/alembic/intern/abc_mball.cc @@ -76,7 +76,7 @@ Mesh *AbcMBallWriter::getEvaluatedMesh(Scene * /*scene_eval*/, Object *ob_eval, ListBase disp = {NULL, NULL}; /* TODO(sergey): This is gonna to work for until Depsgraph * only contains for_render flag. As soon as CoW is - * implemented, this is to be rethinked. + * implemented, this is to be rethought. */ BKE_displist_make_mball_forRender(m_settings.depsgraph, m_settings.scene, m_object, &disp); BKE_mesh_from_metaball(&disp, tmpmesh); diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 9682ea74cfb..8be7a947a67 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -807,7 +807,7 @@ static void mesh_calc_modifier_final_normals(const Mesh *mesh_input, (final_datamask->lmask & CD_MASK_NORMAL) != 0); /* Some modifiers may need this info from their target (other) object, * simpler to generate it here as well. - * Note that they will always be generated when no loop normals are comptuted, + * Note that they will always be generated when no loop normals are computed, * since they are needed by drawing code. */ const bool do_poly_normals = ((final_datamask->pmask & CD_MASK_NORMAL) != 0); diff --git a/source/blender/depsgraph/intern/depsgraph_query.cc b/source/blender/depsgraph/intern/depsgraph_query.cc index 8556a351e2b..3b0f49e0150 100644 --- a/source/blender/depsgraph/intern/depsgraph_query.cc +++ b/source/blender/depsgraph/intern/depsgraph_query.cc @@ -154,8 +154,7 @@ Scene *DEG_get_evaluated_scene(const Depsgraph *graph) const DEG::Depsgraph *deg_graph = reinterpret_cast<const DEG::Depsgraph *>(graph); Scene *scene_cow = deg_graph->scene_cow; /* TODO(sergey): Shall we expand data-block here? Or is it OK to assume - * that calleer is OK with just a pointer in case scene is not updated - * yet? */ + * that caller is OK with just a pointer in case scene is not updated yet? */ BLI_assert(scene_cow != NULL && DEG::deg_copy_on_write_is_expanded(&scene_cow->id)); return scene_cow; } diff --git a/source/blender/makesdna/DNA_tracking_types.h b/source/blender/makesdna/DNA_tracking_types.h index 4992ae1f919..ab9f3d07849 100644 --- a/source/blender/makesdna/DNA_tracking_types.h +++ b/source/blender/makesdna/DNA_tracking_types.h @@ -251,7 +251,7 @@ typedef struct MovieTrackingSettings { short default_pattern_size; /** Size of search area for new tracks. */ short default_search_size; - /** Number of frames to be tarcked during single tracking session + /** Number of frames to be tracked during single tracking session * (if TRACKING_FRAMES_LIMIT is set). */ short default_frames_limit; /** Margin from frame boundaries. */ diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 3ccf53db180..5d2bf161020 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -1490,7 +1490,8 @@ static void rna_def_userdef_theme_ui(BlenderRNA *brna) prop = RNA_def_property(srna, "widget_text_cursor", PROP_FLOAT, PROP_COLOR_GAMMA); RNA_def_property_float_sdna(prop, NULL, "widget_text_cursor"); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, "Text Cursor", "Color of the interface widgets text insertion cursor (caret)"); + RNA_def_property_ui_text( + prop, "Text Cursor", "Color of the interface widgets text insertion cursor (caret)"); RNA_def_property_update(prop, 0, "rna_userdef_theme_update"); /* axis */ diff --git a/source/blender/windowmanager/intern/wm_operator_props.c b/source/blender/windowmanager/intern/wm_operator_props.c index 72646718e41..9aefb4f68cb 100644 --- a/source/blender/windowmanager/intern/wm_operator_props.c +++ b/source/blender/windowmanager/intern/wm_operator_props.c @@ -404,7 +404,7 @@ void WM_operator_properties_select_operation_simple(wmOperatorType *ot) * * For default click selection (with no modifier keys held), the select operators can do the * following: - * - On a mouse press on an unselected item, change selection and finish immidiately after. + * - On a mouse press on an unselected item, change selection and finish immediately after. * This sends an undo push and allows transform to take over should a tweak event be caught now. * - On a mouse press on a selected item, don't change selection state, but start modal execution * of the operator. Idea is that we wait with deselecting other items until we know that the @@ -418,8 +418,8 @@ void WM_operator_properties_select_operation_simple(wmOperatorType *ot) * help getting the wanted behavior to work. Most generic logic should be handled in these, so that * the select operators only have to care for the case dependent handling. * - * Every select operator has slightly diferent requirements, e.g. VSE strip selection also needs to - * account for handle selection. This should be the baseline behavior though. + * Every select operator has slightly different requirements, e.g. VSE strip selection also needs + * to account for handle selection. This should be the baseline behavior though. */ void WM_operator_properties_generic_select(wmOperatorType *ot) { |