diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index 08796eeec0e..97173f8c305 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -18,6 +18,7 @@
 
 # <pep8 compliant>
 
+
 class GreasePencilPanel():
     # subclass must set
     # bl_space_type = 'IMAGE_EDITOR'
diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py
index 9114a31923f..dc01c2c8f3d 100644
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@@ -23,6 +23,7 @@ from bpy.types import Panel, Header, Menu, UIList
 from bpy.app.translations import pgettext_iface as iface_
 from bl_ui.properties_grease_pencil_common import GreasePencilPanel
 
+
 class CLIP_UL_tracking_objects(UIList):
     def draw_item(self, context, layout, data, item, icon,
                   active_data, active_propname, index):
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index 529cea1935d..3571759aa1f 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -45,6 +45,7 @@ class BrushButtonsPanel:
         toolsettings = context.tool_settings.image_paint
         return sima.show_paint and toolsettings.brush
 
+
 class UVToolsPanel:
     bl_space_type = 'IMAGE_EDITOR'
     bl_region_type = 'TOOLS'
@@ -55,6 +56,7 @@ class UVToolsPanel:
         sima = context.space_data
         return sima.show_uvedit and not context.tool_settings.use_uv_sculpt
 
+
 class IMAGE_MT_view(Menu):
     bl_label = "View"
 
@@ -494,6 +496,7 @@ class IMAGE_PT_mask(MASK_PT_mask, Panel):
     bl_space_type = 'IMAGE_EDITOR'
     bl_region_type = 'UI'
 
+
 class IMAGE_PT_mask_layers(MASK_PT_layers, Panel):
     bl_space_type = 'IMAGE_EDITOR'
     bl_region_type = 'UI'
@@ -653,9 +656,10 @@ class IMAGE_PT_tools_transform_uvs(Panel, UVToolsPanel):
 
         col.operator("transform.shear")
 
+
 class IMAGE_PT_paint(Panel, ImagePaintPanel):
     bl_label = "Paint"
-    
+
     @classmethod
     def poll(cls, context):
         sima = context.space_data
@@ -986,6 +990,7 @@ class IMAGE_PT_tools_mask(MASK_PT_tools, Panel):
 
 # --- end mask ---
 
+
 class IMAGE_PT_view_histogram(Panel):
     bl_space_type = 'IMAGE_EDITOR'
     bl_region_type = 'TOOLS'
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 8ba6784f1de..f7a6adc813f 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -1528,7 +1528,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
 		 */
 		if (deform_r) {
 			*deform_r = CDDM_from_mesh(me);
-			 
+
 			if (build_shapekey_layers)
 				add_shapekey_layers(dm, me, ob);
 			
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index 5c50b9d6bec..4e66a6665ae 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -2119,7 +2119,7 @@ static void nlastrip_evaluate_meta(PointerRNA *ptr, ListBase *channels, ListBase
 	 *
 	 * NOTE: keep this in sync with animsys_evaluate_nla()
 	 */
-	 
+
 	/* join this strip's modifiers to the parent's modifiers (own modifiers first) */
 	nlaeval_fmodifiers_join_stacks(&tmp_modifiers, &strip->modifiers, modifiers); 
 	
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index 2aebf3a88a2..ee7c62fc9a6 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -3106,7 +3106,7 @@ short DAG_get_eval_flags_for_object(struct Scene *scene, void *object)
 		return 0;
 	}
 
-	node = dag_find_node(scene->theDag, object);;
+	node = dag_find_node(scene->theDag, object);
 
 	if (node) {
 		return node->eval_flags;
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index 114b45ed174..3ca87f7cd00 100644
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -1368,7 +1368,6 @@ int node_render_changed_exec(bContext *C, wmOperator *UNUSED(op))
 			
 			return OPERATOR_FINISHED;
 		}
-		   
 	}
 	return OPERATOR_CANCELLED;
 }
diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c
index 45172d76d8c..fea03904f68 100644
--- a/source/blender/gpu/intern/gpu_buffers.c
+++ b/source/blender/gpu/intern/gpu_buffers.c
@@ -825,7 +825,7 @@ static void GPU_buffer_copy_edge(DerivedMesh *dm, float *varray_, int *UNUSED(in
 	MEdge *medge;
 	unsigned int *varray = (unsigned int *)varray_;
 	int i, totedge;
- 
+
 	medge = dm->getEdgeArray(dm);
 	totedge = dm->getNumEdges(dm);
 
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index 17dbd99a3b0..ed33098858f 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -915,7 +915,7 @@ bool RNA_path_resolve(PointerRNA *ptr, const char *path,
 
 bool RNA_path_resolve_full(PointerRNA *ptr, const char *path,
                           PointerRNA *r_ptr, PropertyRNA **r_prop, int *index);
-						  
+
 /* path_resolve_property() variants ensure that pointer + property both exist */
 bool RNA_path_resolve_property(PointerRNA *ptr, const char *path,
                      PointerRNA *r_ptr, PropertyRNA **r_prop);
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index 807d9fc35e1..da343a7143f 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -744,7 +744,7 @@ static void rna_def_material_mtex(BlenderRNA *brna)
 	RNA_def_property_ui_range(prop, 0, 1, 10, 3);
 	RNA_def_property_ui_text(prop, "Scattering Factor", "Amount texture affects scattering");
 	RNA_def_property_update(prop, 0, "rna_Material_update");
-								  
+
 	prop = RNA_def_property(srna, "reflection_factor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "reflfac");
 	RNA_def_property_ui_range(prop, 0, 1, 10, 3);
diff --git a/source/blender/modifiers/intern/MOD_boolean_util.c b/source/blender/modifiers/intern/MOD_boolean_util.c
index d68bf508e31..50ea8f18d3a 100644
--- a/source/blender/modifiers/intern/MOD_boolean_util.c
+++ b/source/blender/modifiers/intern/MOD_boolean_util.c
@@ -457,7 +457,7 @@ static void setMPolyMaterial(ExportMeshData *export_data,
 		 * otherwise fallback to first material (material with index=0).
 		 */
 		if (!BLI_ghash_haskey(material_hash, orig_mat)) {
-			int a, mat_nr;;
+			int a, mat_nr;
 
 			mat_nr = 0;
 			for (a = 0; a < export_data->ob_left->totcol; a++) {
diff --git a/source/blender/modifiers/intern/MOD_wireframe.c b/source/blender/modifiers/intern/MOD_wireframe.c
index 3ebd9bd38fd..474a7550533 100644
--- a/source/blender/modifiers/intern/MOD_wireframe.c
+++ b/source/blender/modifiers/intern/MOD_wireframe.c
@@ -80,7 +80,7 @@ static DerivedMesh *WireframeModifier_do( WireframeModifierData *wmd, Object *ob
 	DerivedMesh *result;
 	BMesh *bm;
 
-	const int defgrp_index = defgroup_name_index(ob, wmd->defgrp_name);;
+	const int defgrp_index = defgroup_name_index(ob, wmd->defgrp_name);
 
 	bm = DM_to_bmesh(dm, true);
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_image.c b/source/blender/nodes/composite/nodes/node_composite_image.c
index f87cf9da90b..659e582dc1d 100644
--- a/source/blender/nodes/composite/nodes/node_composite_image.c
+++ b/source/blender/nodes/composite/nodes/node_composite_image.c
@@ -397,7 +397,7 @@ void node_cmp_rlayers_force_hidden_passes(bNode *node)
 	
 	set_output_visible(node, passflag, RRES_OUT_IMAGE,                  SCE_PASS_COMBINED);
 	set_output_visible(node, passflag, RRES_OUT_ALPHA,                  SCE_PASS_COMBINED);
-	                                                                    
+
 	set_output_visible(node, passflag, RRES_OUT_Z,                      SCE_PASS_Z);
 	set_output_visible(node, passflag, RRES_OUT_NORMAL,                 SCE_PASS_NORMAL);
 	set_output_visible(node, passflag, RRES_OUT_VEC,                    SCE_PASS_VECTOR);
diff --git a/source/blender/python/generic/bgl.c b/source/blender/python/generic/bgl.c
index 7ade40e627c..d1d0ec96315 100644
--- a/source/blender/python/generic/bgl.c
+++ b/source/blender/python/generic/bgl.c
@@ -420,7 +420,7 @@ static PyObject *Buffer_slice(Buffer *self, int begin, int end)
 	if (begin < 0) begin = 0;
 	if (end > self->dimensions[0]) end = self->dimensions[0];
 	if (begin > end) begin = end;
-	  
+
 	list = PyList_New(end - begin);
 
 	for (count = begin; count < end; count++) {
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 4cf36826bba..001386bc0d4 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -610,7 +610,8 @@ void RE_InitState(Render *re, Render *source, RenderData *rd, SceneRenderLayer *
 		}
 		else if (re->result) {
 			if (re->result->rectx == re->rectx && re->result->recty == re->recty &&
-			    prev_actlay == re->r.actlay) {
+			    prev_actlay == re->r.actlay)
+			{
 				/* keep render result, this avoids flickering black tiles
 				 * when the preview changes */
 			}
diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c
index 4cf5813d080..d26723e7f8c 100644
--- a/source/blender/windowmanager/intern/wm_jobs.c
+++ b/source/blender/windowmanager/intern/wm_jobs.c
@@ -82,7 +82,7 @@
  * - it puts timer to sleep (or removes?)
  *
  */
- 
+
 struct wmJob {
 	struct wmJob *next, *prev;