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>2014-10-11 13:39:21 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-10-11 13:44:28 +0400
commit0a738280e1aae718f0916525ec5a18da6ea37f7a (patch)
tree9a3be2cd9a354dbfdff88c93aa3c97b1b8ef81b5
parentabd38c00f1ed0305cf4d0735f567851862e34e08 (diff)
Cleanup
-rw-r--r--source/blender/editors/mask/mask_ops.c2
-rw-r--r--source/blender/editors/object/object_relations.c6
-rw-r--r--source/blender/gpu/intern/gpu_draw.c2
-rw-r--r--source/blender/windowmanager/intern/wm_init_exit.c4
4 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/mask/mask_ops.c b/source/blender/editors/mask/mask_ops.c
index c3959f90318..b27baaf22be 100644
--- a/source/blender/editors/mask/mask_ops.c
+++ b/source/blender/editors/mask/mask_ops.c
@@ -580,7 +580,7 @@ static bool spline_under_mouse_get(const bContext *C,
}
}
}
- /* TODO(sergey): Chech whether tesellated spline point is closer
+ /* TODO(sergey): Chech whether tessellated spline point is closer
* to the mouse than the spline center.
*/
if (closest_dist_squared < 32.0f * 32.0f && closest_spline != NULL) {
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index f905f0b91f7..c8a009e4129 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -435,11 +435,11 @@ typedef enum eObClearParentTypes {
EnumPropertyItem prop_clear_parent_types[] = {
{CLEAR_PARENT_ALL, "CLEAR", 0, "Clear Parent",
- "Completely clear the parenting relationship, including involved modifiers is any"},
+ "Completely clear the parenting relationship, including involved modifiers is any"},
{CLEAR_PARENT_KEEP_TRANSFORM, "CLEAR_KEEP_TRANSFORM", 0, "Clear and Keep Transformation",
- "As 'Clear Parent', but keep the current visual transformations of the object"},
+ "As 'Clear Parent', but keep the current visual transformations of the object"},
{CLEAR_PARENT_INVERSE, "CLEAR_INVERSE", 0, "Clear Parent Inverse",
- "Reset the transform corrections applied to the parenting relationship, does not remove parenting itself"},
+ "Reset the transform corrections applied to the parenting relationship, does not remove parenting itself"},
{0, NULL, 0, NULL, NULL}
};
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c
index a4435a7d276..622e7b5ce9e 100644
--- a/source/blender/gpu/intern/gpu_draw.c
+++ b/source/blender/gpu/intern/gpu_draw.c
@@ -1882,7 +1882,7 @@ static void gpu_multisample(bool enable)
{
if (GLEW_VERSION_1_3 || GLEW_ARB_multisample) {
#ifdef __linux__
- /* changing multisample enablement from the default (enabled) causes problems on some
+ /* changing multisample from the default (enabled) causes problems on some
* systems (NVIDIA/Linux) when the pixel format doesn't have a multisample buffer */
bool toggle_ok = true;
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index 00e25d395b3..139e0101859 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -419,9 +419,9 @@ void WM_exit_ext(bContext *C, const bool do_python)
has_edited = ED_editors_flush_edits(C, false);
if ((has_edited && BLO_write_file(CTX_data_main(C), filename, fileflags, NULL, NULL)) ||
- BKE_undo_save_file(filename))
+ BKE_undo_save_file(filename))
{
- printf("Saved session recovery to '%s'\n", filename);
+ printf("Saved session recovery to '%s'\n", filename);
}
}
}