[Bf-blender-cvs] [b4b5d9c] master: Style cleanup
Campbell Barton
noreply at git.blender.org
Fri Jul 4 21:27:20 CEST 2014
Commit: b4b5d9c24ec26a51c72b0b695ba749a2b93e4e62
Author: Campbell Barton
Date: Sat Jul 5 05:26:32 2014 +1000
https://developer.blender.org/rBb4b5d9c24ec26a51c72b0b695ba749a2b93e4e62
Style cleanup
===================================================================
M source/blender/editors/animation/anim_channels_edit.c
M source/blender/editors/sculpt_paint/paint_stroke.c
M source/blender/imbuf/intern/png.c
===================================================================
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c
index 0bc4a69..07a538f 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 452e288..e87f8ca 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 67aeda5..d00a836 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.
*/
More information about the Bf-blender-cvs
mailing list