[Bf-blender-cvs] [798cd8a7230] blender2.8: Cleanup: style

[Campbell Barton]

Commit: 798cd8a7230dba1a0aead06bb82857b881a42f95
Author: Campbell Barton
Date:   Thu Nov 1 07:31:49 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB798cd8a7230dba1a0aead06bb82857b881a42f95

Cleanup: style

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

M	source/blender/blenkernel/intern/fcurve.c
M	source/blender/blenkernel/intern/object.c
M	source/blender/blenkernel/intern/subdiv_converter_mesh.c
M	source/blender/blenloader/intern/versioning_280.c
M	source/blender/editors/animation/keyframing.c
M	source/blender/editors/space_view3d/view3d_gizmo_empty.c

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

diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c
index abb288b0910..6deb7128b20 100644
--- a/source/blender/blenkernel/intern/fcurve.c
+++ b/source/blender/blenkernel/intern/fcurve.c
@@ -911,7 +911,8 @@ eFCU_Cycle_Type BKE_fcurve_get_cycle_type(FCurve *fcu)
 		}
 
 		if (ELEM(data->before_mode, FCM_EXTRAPOLATE_CYCLIC, FCM_EXTRAPOLATE_CYCLIC_OFFSET) &&
-		    ELEM(data->after_mode, FCM_EXTRAPOLATE_CYCLIC, FCM_EXTRAPOLATE_CYCLIC_OFFSET)) {
+		    ELEM(data->after_mode, FCM_EXTRAPOLATE_CYCLIC, FCM_EXTRAPOLATE_CYCLIC_OFFSET))
+		{
 			return FCU_CYCLE_OFFSET;
 		}
 	}
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 60d800f19a8..0d7fa973a61 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -834,8 +834,8 @@ void BKE_object_init(Object *ob)
 	ob->empty_drawsize = 1.0;
 	ob->empty_image_depth = OB_EMPTY_IMAGE_DEPTH_DEFAULT;
 	ob->empty_image_visibility_flag = (
-	          OB_EMPTY_IMAGE_VISIBLE_PERSPECTIVE
-	        | OB_EMPTY_IMAGE_VISIBLE_ORTHOGRAPHIC);
+	        OB_EMPTY_IMAGE_VISIBLE_PERSPECTIVE |
+	        OB_EMPTY_IMAGE_VISIBLE_ORTHOGRAPHIC);
 	if (ob->type == OB_EMPTY) {
 		copy_v2_fl(ob->ima_ofs, -0.5f);
 	}
diff --git a/source/blender/blenkernel/intern/subdiv_converter_mesh.c b/source/blender/blenkernel/intern/subdiv_converter_mesh.c
index 34675da063e..5941de682f4 100644
--- a/source/blender/blenkernel/intern/subdiv_converter_mesh.c
+++ b/source/blender/blenkernel/intern/subdiv_converter_mesh.c
@@ -88,7 +88,7 @@ static OpenSubdiv_SchemeType get_scheme_type(
 }
 
 static OpenSubdiv_VtxBoundaryInterpolation get_vtx_boundary_interpolation(
-        const struct OpenSubdiv_Converter* converter) {
+        const struct OpenSubdiv_Converter *converter) {
 	ConverterStorage *storage = converter->user_data;
 	return BKE_subdiv_converter_vtx_boundary_interpolation_from_settings(
 	        &storage->settings);
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 21debc13a22..98bebd70d14 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -2222,8 +2222,8 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
 
 		for (Object *ob = bmain->object.first; ob; ob = ob->id.next) {
 			ob->empty_image_visibility_flag = (
-			          OB_EMPTY_IMAGE_VISIBLE_PERSPECTIVE
-			        | OB_EMPTY_IMAGE_VISIBLE_ORTHOGRAPHIC);
+			        OB_EMPTY_IMAGE_VISIBLE_PERSPECTIVE |
+			        OB_EMPTY_IMAGE_VISIBLE_ORTHOGRAPHIC);
 		}
 	}
 
diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c
index fee69b01c48..39b1bed3ac1 100644
--- a/source/blender/editors/animation/keyframing.c
+++ b/source/blender/editors/animation/keyframing.c
@@ -322,7 +322,7 @@ static eFCU_Cycle_Type remap_cyclic_keyframe_location(FCurve *fcu, float *px, fl
 		return FCU_CYCLE_NONE;
 	}
 
-	BezTriple *first = &fcu->bezt[0], *last = &fcu->bezt[fcu->totvert-1];
+	BezTriple *first = &fcu->bezt[0], *last = &fcu->bezt[fcu->totvert - 1];
 	float start = first->vec[1][0], end = last->vec[1][0];
 
 	if (start >= end) {
@@ -336,7 +336,7 @@ static eFCU_Cycle_Type remap_cyclic_keyframe_location(FCurve *fcu, float *px, fl
 
 		if (type == FCU_CYCLE_OFFSET) {
 			/* Nasty check to handle the case when the modes are different better. */
-			FMod_Cycles *data = (FMod_Cycles *)((FModifier*)fcu->modifiers.first)->data;
+			FMod_Cycles *data = ((FModifier *)fcu->modifiers.first)->data;
 			short mode = (step >= 0) ? data->after_mode : data->before_mode;
 
 			if (mode == FCM_EXTRAPOLATE_CYCLIC_OFFSET) {
diff --git a/source/blender/editors/space_view3d/view3d_gizmo_empty.c b/source/blender/editors/space_view3d/view3d_gizmo_empty.c
index bc190355ea6..c58b1a6d6cd 100644
--- a/source/blender/editors/space_view3d/view3d_gizmo_empty.c
+++ b/source/blender/editors/space_view3d/view3d_gizmo_empty.c
@@ -132,7 +132,7 @@ static bool WIDGETGROUP_empty_image_poll(const bContext *C, wmGizmoGroupType *UN
 	Object *ob = CTX_data_active_object(C);
 
 	if (ob && ob->type == OB_EMPTY) {
-		if (ob->empty_drawtype == OB_EMPTY_IMAGE){
+		if (ob->empty_drawtype == OB_EMPTY_IMAGE) {
 			return is_image_empty_visible(ob, rv3d);
 		}
 	}