[Bf-blender-cvs] [b22dde0] master: Cleanup: style

[Campbell Barton]

Commit: b22dde0198fc25904dd4a21e7865808e49f568f9
Author: Campbell Barton
Date:   Sat Jan 16 13:01:10 2016 +1100
Branches: master
https://developer.blender.org/rBb22dde0198fc25904dd4a21e7865808e49f568f9

Cleanup: style

===================================================================

M	source/blender/blenkernel/intern/cdderivedmesh.c
M	source/blender/blenkernel/intern/image.c
M	source/blender/editors/space_clip/tracking_ops.c
M	source/blender/editors/space_clip/tracking_ops_intern.h
M	source/blender/makesdna/DNA_scene_types.h

===================================================================

diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 245c846..bee0553 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -355,7 +355,7 @@ static void cdDM_update_normals_from_pbvh(DerivedMesh *dm)
 	 * case modifier stack is re-constructed from scratch on every
 	 * update.
 	 */
-	if(!cddm->pbvh_draw) {
+	if (!cddm->pbvh_draw) {
 		return;
 	}
 
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 95cf1ba..ad1f305 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -2222,7 +2222,7 @@ void BKE_imbuf_write_prepare(ImBuf *ibuf, const ImageFormatData *imf)
 		if (imf->tiff_codec == R_IMF_TIFF_CODEC_NONE) {
 			ibuf->foptions.flag |= TIF_COMPRESS_NONE;
 		}
-		else if (imf->tiff_codec== R_IMF_TIFF_CODEC_DEFLATE) {
+		else if (imf->tiff_codec == R_IMF_TIFF_CODEC_DEFLATE) {
 			ibuf->foptions.flag |= TIF_COMPRESS_DEFLATE;
 		}
 		else if (imf->tiff_codec == R_IMF_TIFF_CODEC_LZW) {
diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c
index 79f90a4..41bc6bb 100644
--- a/source/blender/editors/space_clip/tracking_ops.c
+++ b/source/blender/editors/space_clip/tracking_ops.c
@@ -1361,7 +1361,7 @@ static int hide_tracks_clear_exec(bContext *C, wmOperator *UNUSED(op))
 
 	/* Unhide plane tracks. */
 	ListBase *plane_tracks_base = BKE_tracking_get_active_plane_tracks(tracking);
-	for (MovieTrackingPlaneTrack *plane_track= plane_tracks_base->first;
+	for (MovieTrackingPlaneTrack *plane_track = plane_tracks_base->first;
 	     plane_track != NULL;
 	     plane_track = plane_track->next)
 	{
diff --git a/source/blender/editors/space_clip/tracking_ops_intern.h b/source/blender/editors/space_clip/tracking_ops_intern.h
index d9aff10..f6cb3e5 100644
--- a/source/blender/editors/space_clip/tracking_ops_intern.h
+++ b/source/blender/editors/space_clip/tracking_ops_intern.h
@@ -29,8 +29,8 @@
  *  \ingroup spclip
  */
 
-#ifndef __CLIP_TRACKING_INTERN__
-#define __CLIP_TRACKING_INTERN__
+#ifndef __TRACKING_OPS_INTERN_INTERN__
+#define __TRACKING_OPS_INTERN_INTERN__
 
 struct bContext;
 struct SpaceClip;
@@ -42,4 +42,4 @@ void clip_tracking_clear_invisible_track_selection(struct SpaceClip *sc,
 void clip_tracking_show_cursor(struct bContext *C);
 void clip_tracking_hide_cursor(struct bContext *C);
 
-#endif /* __CLIP_TRACKING_INTERN__ */
\ No newline at end of file
+#endif /* __TRACKING_OPS_INTERN_INTERN__ */
\ No newline at end of file
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 1a3ddff..190ece6 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -490,7 +490,7 @@ typedef enum BakeSaveMode {
 } BakeSaveMode;
 
 /* bake->pass_filter */
-typedef enum BakePassFilter{
+typedef enum BakePassFilter {
 	R_BAKE_PASS_FILTER_NONE           = 0,
 	R_BAKE_PASS_FILTER_AO             = (1 << 0),
 	R_BAKE_PASS_FILTER_EMIT           = (1 << 1),