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-07-04 23:26:32 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-07-04 23:26:32 +0400
commitb4b5d9c24ec26a51c72b0b695ba749a2b93e4e62 (patch)
tree92c199703efd1a482ff78bfe72d966730c48798b /source/blender
parentc4eeda267315731c4cf446c3ed030d4f8c158b52 (diff)
Style cleanup
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/editors/animation/anim_channels_edit.c2
-rw-r--r--source/blender/editors/sculpt_paint/paint_stroke.c7
-rw-r--r--source/blender/imbuf/intern/png.c2
3 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c
index 0bc4a69aa06..07a538f64c2 100644
--- a/source/blender/editors/animation/anim_channels_edit.c
+++ b/source/blender/editors/animation/anim_channels_edit.c
@@ -2178,7 +2178,7 @@ static int animchannels_find_exec(bContext *C, wmOperator *op)
return OPERATOR_CANCELLED;
/* update filter text, and ensure that filter is enabled if there's something there
- * NOTE: we turn the filter off if there's nothing (this is a quicky shortcut for dismissing)
+ * NOTE: we turn the filter off if there's nothing (this is a quick shortcut for dismissing)
*/
RNA_string_get(op->ptr, "query", ac.ads->searchstr);
diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c
index 452e2885d7a..e87f8ca6827 100644
--- a/source/blender/editors/sculpt_paint/paint_stroke.c
+++ b/source/blender/editors/sculpt_paint/paint_stroke.c
@@ -155,7 +155,8 @@ static float event_tablet_data(const wmEvent *event, int *pen_flip)
return pressure;
}
-static bool paint_tool_require_location(Brush *brush, PaintMode mode) {
+static bool paint_tool_require_location(Brush *brush, PaintMode mode)
+{
switch (mode) {
case PAINT_SCULPT:
if (ELEM4(brush->sculpt_tool, SCULPT_TOOL_GRAB, SCULPT_TOOL_ROTATE,
@@ -163,9 +164,9 @@ static bool paint_tool_require_location(Brush *brush, PaintMode mode) {
{
return false;
}
- else
+ else {
return true;
-
+ }
default:
break;
}
diff --git a/source/blender/imbuf/intern/png.c b/source/blender/imbuf/intern/png.c
index 67aeda5d0b9..d00a836667e 100644
--- a/source/blender/imbuf/intern/png.c
+++ b/source/blender/imbuf/intern/png.c
@@ -488,7 +488,7 @@ int imb_savepng(struct ImBuf *ibuf, const char *name, int flags)
static void imb_png_warning(png_structp UNUSED(png_ptr), png_const_charp message)
{
- /* We supress iCCP warnings. That's how Blender always used to behave,
+ /* We suppress iCCP warnings. That's how Blender always used to behave,
* and with new libpng it became too much picky, giving a warning on
* the splash screen even.
*/