style cleanup: also some typos

5 files changed, 9 insertions, 7 deletions

diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c
index 52a585dd314..2003aeaa848 100644
--- a/source/blender/editors/io/io_collada.c
+++ b/source/blender/editors/io/io_collada.c
@@ -367,8 +367,9 @@ void WM_OT_collada_import(wmOperatorType *ot)
 	                               WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY);
 
 	RNA_def_boolean(ot->srna,
-					"import_units", 0, "Import Units",
-					"If disabled match import to Blender's current Unit settings. Otherwise use the settings from the Imported scene.");
+	                "import_units", 0, "Import Units",
+	                "If disabled match import to Blender's current Unit settings. "
+	                "Otherwise use the settings from the Imported scene");
 
 }
 #endif
diff --git a/source/blender/editors/render/render_view.c b/source/blender/editors/render/render_view.c
index c53a8f68713..8b2ac740e47 100644
--- a/source/blender/editors/render/render_view.c
+++ b/source/blender/editors/render/render_view.c
@@ -291,7 +291,8 @@ static int render_view_show_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent
 		for (win = CTX_wm_manager(C)->windows.first; win; win = win->next) {
 			bScreen *sc = win->screen;
 			if ((sc->temp && ((ScrArea *)sc->areabase.first)->spacetype == SPACE_IMAGE) ||
-					(win == winshow && winshow != wincur)) {
+			    (win == winshow && winshow != wincur))
+			{
 				wm_window_raise(win);
 				return OPERATOR_FINISHED;
 			}
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index da2facc244a..11f1828ff4e 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -3597,7 +3597,7 @@ static void SCENE_OT_delete(wmOperatorType *ot)
 
 /* ***************** region alpha blending ***************** */
 
-/* implementation note: a disapplearing region needs at least 1 last draw with 100% backbuffer
+/* implementation note: a disappearing region needs at least 1 last draw with 100% backbuffer
  * texture over it- then triple buffer will clear it entirely.
  * This because flag RGN_HIDDEN is set in end - region doesnt draw at all then */
 
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c
index 74399857a97..a1b3941dd7a 100644
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -904,7 +904,7 @@ static int project_paint_occlude_ptv_clip(const ProjPaintState *ps, const MFace
 
 /* Check if a screenspace location is occluded by any other faces
  * check, pixelScreenCo must be in screenspace, its Z-Depth only needs to be used for comparison
- * and dosn't need to be correct in relation to X and Y coords (this is the case in perspective view) */
+ * and doesn't need to be correct in relation to X and Y coords (this is the case in perspective view) */
 static int project_bucket_point_occluded(const ProjPaintState *ps, LinkNode *bucketFace, const int orig_face, float pixelScreenCo[4])
 {
 	MFace *mf;
diff --git a/source/blender/editors/space_buttons/buttons_header.c b/source/blender/editors/space_buttons/buttons_header.c
index 701048cd229..ae7026a634f 100644
--- a/source/blender/editors/space_buttons/buttons_header.c
+++ b/source/blender/editors/space_buttons/buttons_header.c
@@ -97,7 +97,7 @@ static void do_buttons_buttons(bContext *C, void *UNUSED(arg), int event)
 	sbuts->mainbuser = sbuts->mainb;
 }
 
-#define BUT_UNIT_X (UI_UNIT_X + 2*U.pixelsize)
+#define BUT_UNIT_X (UI_UNIT_X + 2 * U.pixelsize)
 
 void buttons_header_buttons(const bContext *C, ARegion *ar)
 {
@@ -105,7 +105,7 @@ void buttons_header_buttons(const bContext *C, ARegion *ar)
 	uiBlock *block;
 	uiBut *but;
 	int headery = ED_area_headersize();
-	int xco, yco = 0.5f*(headery - UI_UNIT_Y);
+	int xco, yco = 0.5f * (headery - UI_UNIT_Y);
 
 	buttons_context_compute(C, sbuts);