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:
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/armature/armature_edit.c2
-rw-r--r--source/blender/editors/gpencil/gpencil_intern.h2
-rw-r--r--source/blender/editors/object/object_relations.c2
-rw-r--r--source/blender/editors/sculpt_paint/paint_vertex_color_utils.c4
-rw-r--r--source/blender/editors/sound/sound_ops.c2
-rw-r--r--source/blender/editors/space_buttons/buttons_ops.c2
-rw-r--r--source/blender/editors/space_image/image_ops.c2
-rw-r--r--source/blender/editors/space_info/textview.c2
-rw-r--r--source/blender/editors/space_view3d/view3d_camera_control.c2
-rw-r--r--source/blender/editors/space_view3d/view3d_edit.c2
-rw-r--r--source/blender/editors/space_view3d/view3d_fly.c2
11 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/editors/armature/armature_edit.c b/source/blender/editors/armature/armature_edit.c
index c7fa63a0e48..4285c7779d7 100644
--- a/source/blender/editors/armature/armature_edit.c
+++ b/source/blender/editors/armature/armature_edit.c
@@ -343,7 +343,7 @@ static int armature_calc_roll_exec(bContext *C, wmOperator *op)
sub_v3_v3v3(dir_a, ebone->tail, ebone->head);
normalize_v3(dir_a);
- /* find the first bone in the chane with a different direction */
+ /* find the first bone in the chain with a different direction */
do {
sub_v3_v3v3(dir_b, ebone_other->head, ebone_other->tail);
normalize_v3(dir_b);
diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h
index f934a5c74f3..79f672274a7 100644
--- a/source/blender/editors/gpencil/gpencil_intern.h
+++ b/source/blender/editors/gpencil/gpencil_intern.h
@@ -562,7 +562,7 @@ void GPENCIL_OT_convert_old_files(struct wmOperatorType *ot);
void GPENCIL_OT_generate_weights(struct wmOperatorType *ot);
/* ****************************************************** */
-/* FILTERED ACTION DATA - TYPES ---> XXX DEPRECEATED OLD ANIM SYSTEM CODE! */
+/* FILTERED ACTION DATA - TYPES ---> XXX DEPRECATED OLD ANIM SYSTEM CODE! */
/* XXX - TODO: replace this with the modern bAnimListElem... */
/* This struct defines a structure used for quick access */
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index f86ad1216cb..234cc119d6f 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -2482,7 +2482,7 @@ static int make_override_library_exec(bContext *C, wmOperator *op)
/* Disabled for now, according to some artist this is probably not really useful anyway.
* And it breaks things like objects parented to bones
* (most likely due to missing proper setting of inverse parent matrix?)... */
- /* Note: we might even actually want to get rid of that instanciating empty... */
+ /* Note: we might even actually want to get rid of that instantiating empty... */
if (0 && new_ob->parent == NULL) {
new_ob->parent = obcollection;
}
diff --git a/source/blender/editors/sculpt_paint/paint_vertex_color_utils.c b/source/blender/editors/sculpt_paint/paint_vertex_color_utils.c
index 71865d0de73..c26db3e265b 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex_color_utils.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex_color_utils.c
@@ -230,7 +230,7 @@ BLI_INLINE uint mcol_lighten(uint col_src, uint col_dst, int fac)
cp_dst = (uchar *)&col_dst;
cp_mix = (uchar *)&col_mix;
- /* See if are lighter, if so mix, else don't do anything.
+ /* See if we're lighter, if so mix, else don't do anything.
* if the paint color is darker then the original, then ignore */
if (IMB_colormanagement_get_luminance_byte(cp_src) >
IMB_colormanagement_get_luminance_byte(cp_dst)) {
@@ -264,7 +264,7 @@ BLI_INLINE uint mcol_darken(uint col_src, uint col_dst, int fac)
cp_dst = (uchar *)&col_dst;
cp_mix = (uchar *)&col_mix;
- /* See if were darker, if so mix, else don't do anything.
+ /* See if we're darker, if so mix, else don't do anything.
* if the paint color is brighter then the original, then ignore */
if (IMB_colormanagement_get_luminance_byte(cp_src) <
IMB_colormanagement_get_luminance_byte(cp_dst)) {
diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c
index 61abbd10e98..e6e36309fec 100644
--- a/source/blender/editors/sound/sound_ops.c
+++ b/source/blender/editors/sound/sound_ops.c
@@ -800,7 +800,7 @@ static int sound_unpack_exec(bContext *C, wmOperator *op)
int method = RNA_enum_get(op->ptr, "method");
bSound *sound = NULL;
- /* find the suppplied image by name */
+ /* find the supplied image by name */
if (RNA_struct_property_is_set(op->ptr, "id")) {
char sndname[MAX_ID_NAME - 2];
RNA_string_get(op->ptr, "id", sndname);
diff --git a/source/blender/editors/space_buttons/buttons_ops.c b/source/blender/editors/space_buttons/buttons_ops.c
index b393311e1fd..e2affa7bc36 100644
--- a/source/blender/editors/space_buttons/buttons_ops.c
+++ b/source/blender/editors/space_buttons/buttons_ops.c
@@ -227,7 +227,7 @@ static int file_browse_invoke(bContext *C, wmOperator *op, const wmEvent *event)
is_relative = false;
}
- /* annoying exception!, if were dealing with the user prefs, default relative to be off */
+ /* annoying exception!, if we're dealing with the user prefs, default relative to be off */
RNA_property_boolean_set(op->ptr, prop_relpath, is_relative);
}
}
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 0f823933c24..672f32f3c9c 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -2998,7 +2998,7 @@ static int image_unpack_exec(bContext *C, wmOperator *op)
Image *ima = image_from_context(C);
int method = RNA_enum_get(op->ptr, "method");
- /* find the suppplied image by name */
+ /* find the supplied image by name */
if (RNA_struct_property_is_set(op->ptr, "id")) {
char imaname[MAX_ID_NAME - 2];
RNA_string_get(op->ptr, "id", imaname);
diff --git a/source/blender/editors/space_info/textview.c b/source/blender/editors/space_info/textview.c
index d9af8555f04..19ada4779a0 100644
--- a/source/blender/editors/space_info/textview.c
+++ b/source/blender/editors/space_info/textview.c
@@ -285,7 +285,7 @@ static bool textview_draw_string(TextViewDrawState *tds,
tds->xy[1] += tds->lheight;
- /* Check if were out of view bounds. */
+ /* Check if we're out of view bounds. */
if (tds->xy[1] > tds->scroll_ymax) {
MEM_freeN(offsets);
return false;
diff --git a/source/blender/editors/space_view3d/view3d_camera_control.c b/source/blender/editors/space_view3d/view3d_camera_control.c
index a6c1d1bbc33..daa3f641404 100644
--- a/source/blender/editors/space_view3d/view3d_camera_control.c
+++ b/source/blender/editors/space_view3d/view3d_camera_control.c
@@ -89,7 +89,7 @@ typedef struct View3DCameraControl {
/* backup the views quat in case the user cancels flying in non camera mode. */
float rot_backup[4];
- /* remember if were ortho or not, only used for restoring the view if it was a ortho view */
+ /* remember if we're ortho or not, only used for restoring the view if it was a ortho view */
char persp_backup;
/* are we flying an ortho camera in perspective view,
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index 2aff5482b1c..67dacca85ba 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -236,7 +236,7 @@ typedef struct ViewOpsData {
} ViewOpsData;
/**
- * Size of the sphere being dragged for trackball rotation withing the view bounds.
+ * Size of the sphere being dragged for trackball rotation within the view bounds.
* also affects speed (smaller is faster).
*/
#define TRACKBALLSIZE (1.1f)
diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c
index 8291d93ee13..563e1afa67e 100644
--- a/source/blender/editors/space_view3d/view3d_fly.c
+++ b/source/blender/editors/space_view3d/view3d_fly.c
@@ -593,7 +593,7 @@ static void flyEvent(FlyInfo *fly, const wmEvent *event)
}
else {
/* flip speed rather than stopping, game like motion,
- * else increase like mousewheel if were already moving in that direction */
+ * else increase like mousewheel if we're already moving in that direction */
if (fly->speed < 0.0f) {
fly->speed = -fly->speed;
}