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>2015-06-16 03:18:45 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-06-16 03:32:41 +0300
commitfa823dc828a3135d040f95a6977cdc516cabbe8e (patch)
tree4979691f8440ff20f8c1e1bb518a036e5dfd035e /source/blender/editors
parentb1a92f2b3acf529cf86202a2b799fed64d89c3dd (diff)
Cleanup: style
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/animation/keyframing.c4
-rw-r--r--source/blender/editors/interface/interface_regions.c2
-rw-r--r--source/blender/editors/mask/mask_edit.c2
-rw-r--r--source/blender/editors/sculpt_paint/paint_utils.c2
-rw-r--r--source/blender/editors/space_file/file_ops.c22
-rw-r--r--source/blender/editors/space_sequencer/sequencer_modifier.c2
6 files changed, 17 insertions, 17 deletions
diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c
index ab430483ed5..85ea5526908 100644
--- a/source/blender/editors/animation/keyframing.c
+++ b/source/blender/editors/animation/keyframing.c
@@ -1814,8 +1814,8 @@ static int delete_key_button_exec(bContext *C, wmOperator *op)
if (BKE_fcurve_is_protected(fcu)) {
BKE_reportf(op->reports, RPT_WARNING,
- "Not deleting keyframe for locked F-Curve for NLA Strip influence on %s - %s '%s'",
- strip->name, BKE_idcode_to_name(GS(id->name)), id->name + 2);
+ "Not deleting keyframe for locked F-Curve for NLA Strip influence on %s - %s '%s'",
+ strip->name, BKE_idcode_to_name(GS(id->name)), id->name + 2);
}
else {
/* remove the keyframe directly
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index 8a6df2c1873..6aabbbe76b6 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -1637,7 +1637,7 @@ static void ui_popup_block_remove(bContext *C, uiPopupBlockHandle *handle)
}
/**
- * Called for creatign new popups and refreshing existing ones.
+ * Called for creating new popups and refreshing existing ones.
*/
uiBlock *ui_popup_block_refresh(
bContext *C, uiPopupBlockHandle *handle,
diff --git a/source/blender/editors/mask/mask_edit.c b/source/blender/editors/mask/mask_edit.c
index 38ca22a92cb..e1a58d529b6 100644
--- a/source/blender/editors/mask/mask_edit.c
+++ b/source/blender/editors/mask/mask_edit.c
@@ -409,7 +409,7 @@ bool ED_mask_selected_minmax(const bContext *C, float min[2], float max[2])
mask_layer = mask_layer->next)
{
MaskSpline *spline;
- if (mask_layer->restrictflag & (MASK_RESTRICT_VIEW|MASK_RESTRICT_SELECT)) {
+ if (mask_layer->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
continue;
}
for (spline = mask_layer->splines.first;
diff --git a/source/blender/editors/sculpt_paint/paint_utils.c b/source/blender/editors/sculpt_paint/paint_utils.c
index bdf11de0f87..4e550543479 100644
--- a/source/blender/editors/sculpt_paint/paint_utils.c
+++ b/source/blender/editors/sculpt_paint/paint_utils.c
@@ -395,7 +395,7 @@ static Image *imapaint_face_image(Object *ob, Mesh *me, int face_index)
{
Image *ima;
MPoly *mp = me->mpoly + face_index;
- Material *ma = give_current_material(ob, mp->mat_nr + 1);;
+ Material *ma = give_current_material(ob, mp->mat_nr + 1);
ima = ma && ma->texpaintslot ? ma->texpaintslot[ma->paint_active_slot].ima : NULL;
return ima;
diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c
index db93000ef7c..8c9233e3ce5 100644
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@ -483,17 +483,17 @@ static bool file_walk_select_selection_set(
filelist_is_selected(files, active_old, FILE_SEL_SELECTED) &&
filelist_is_selected(files, active_new, FILE_SEL_SELECTED))
{
- /* conditions for deselecting: initial file is selected, new file is
- * selected and either other_side isn't selected/found or we use fill */
- deselect = (fill || other_site == -1 || !filelist_is_selected(files, other_site, FILE_SEL_SELECTED));
-
- /* don't change active here since we either want to deselect active or we want to
- * walk through a block of selected files without selecting/deselecting anything */
- params->active_file = active_new;
- /* but we want to change active if we use fill (needed to get correct selection bounds) */
- if (deselect && fill) {
- active = active_new;
- }
+ /* conditions for deselecting: initial file is selected, new file is
+ * selected and either other_side isn't selected/found or we use fill */
+ deselect = (fill || other_site == -1 || !filelist_is_selected(files, other_site, FILE_SEL_SELECTED));
+
+ /* don't change active here since we either want to deselect active or we want to
+ * walk through a block of selected files without selecting/deselecting anything */
+ params->active_file = active_new;
+ /* but we want to change active if we use fill (needed to get correct selection bounds) */
+ if (deselect && fill) {
+ active = active_new;
+ }
}
else {
/* regular selection change */
diff --git a/source/blender/editors/space_sequencer/sequencer_modifier.c b/source/blender/editors/space_sequencer/sequencer_modifier.c
index 76ce73b501c..6faf83d2a08 100644
--- a/source/blender/editors/space_sequencer/sequencer_modifier.c
+++ b/source/blender/editors/space_sequencer/sequencer_modifier.c
@@ -226,7 +226,7 @@ static int strip_modifier_copy_exec(bContext *C, wmOperator *UNUSED(op))
if (seq_iter->modifiers.first) {
SequenceModifierData *smd_tmp, *smd = seq_iter->modifiers.first;
- while(smd) {
+ while (smd) {
smd_tmp = smd->next;
BLI_remlink(&seq_iter->modifiers, smd);
BKE_sequence_modifier_free(smd);