[Bf-blender-cvs] [39afc2775f8] master: Cleanup: style

[Campbell Barton]

Commit: 39afc2775f8b3d46902b4c56841c4ab7bae86baa
Author: Campbell Barton
Date:   Wed Feb 20 08:26:17 2019 +1100
Branches: master
https://developer.blender.org/rB39afc2775f8b3d46902b4c56841c4ab7bae86baa

Cleanup: style

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

M	source/blender/blenkernel/intern/image.c
M	source/blender/draw/intern/draw_cache_impl_mesh.c
M	source/blender/draw/modes/object_mode.c
M	source/blender/editors/animation/anim_deps.c
M	source/blender/makesrna/intern/rna_image.c

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

diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 072aaaf2310..5ab843e60c3 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -2671,7 +2671,7 @@ static void image_walk_ntree_all_users(bNodeTree *ntree, void *customdata,
 void BKE_image_walk_id_all_users(ID *id, void *customdata,
                                  void callback(Image *ima, ImageUser *iuser, void *customdata))
 {
-	switch(GS(id->name)) {
+	switch (GS(id->name)) {
 		case ID_OB:
 		{
 			Object *ob = (Object *)id;
diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c
index b0418956180..3562bfeaa95 100644
--- a/source/blender/draw/intern/draw_cache_impl_mesh.c
+++ b/source/blender/draw/intern/draw_cache_impl_mesh.c
@@ -3380,7 +3380,7 @@ static void mesh_create_loops_lines(
 			BM_ITER_MESH (bm_edge, &iter, bm, BM_EDGES_OF_MESH) {
 				/* use_hide always for edit-mode */
 				if (!BM_elem_flag_test(bm_edge, BM_ELEM_HIDDEN) &&
-					bm_edge->l != NULL)
+				    bm_edge->l != NULL)
 				{
 					BMLoop *bm_loop1 = BM_vert_find_first_loop(bm_edge->v1);
 					BMLoop *bm_loop2 = BM_vert_find_first_loop(bm_edge->v2);
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index a20aaf43094..7439bd3255d 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -2906,9 +2906,10 @@ static void OBJECT_cache_populate(void *vedata, Object *ob)
 		return;
 	}
 
-	const bool do_outlines = (draw_ctx->v3d->flag & V3D_SELECT_OUTLINE) && ((ob->base_flag & BASE_SELECTED) != 0) &&
-							 (draw_ctx->v3d->shading.type != OB_WIRE) &&
-	                         ((DRW_object_is_renderable(ob) && (ob->dt > OB_WIRE)) || (ob->dt == OB_WIRE));
+	const bool do_outlines = (
+	        (draw_ctx->v3d->flag & V3D_SELECT_OUTLINE) && ((ob->base_flag & BASE_SELECTED) != 0) &&
+	        (draw_ctx->v3d->shading.type != OB_WIRE) &&
+	        ((DRW_object_is_renderable(ob) && (ob->dt > OB_WIRE)) || (ob->dt == OB_WIRE)));
 	const bool show_relations = ((draw_ctx->v3d->flag & V3D_HIDE_HELPLINES) == 0);
 	const bool hide_object_extra = (v3d->overlay.flag & V3D_OVERLAY_HIDE_OBJECT_XTRAS) != 0;
 
diff --git a/source/blender/editors/animation/anim_deps.c b/source/blender/editors/animation/anim_deps.c
index fda7e86039e..7bef42d8682 100644
--- a/source/blender/editors/animation/anim_deps.c
+++ b/source/blender/editors/animation/anim_deps.c
@@ -184,7 +184,7 @@ static void animchan_sync_group(bAnimContext *ac, bAnimListElem *ale, bActionGro
 }
 
 /* perform syncing updates for F-Curves */
-static void animchan_sync_fcurve(bAnimContext *ac, bAnimListElem *ale, FCurve **active_fcurve)
+static void animchan_sync_fcurve(bAnimContext *UNUSED(ac), bAnimListElem *ale, FCurve **active_fcurve)
 {
 	FCurve *fcu = (FCurve *)ale->data;
 	ID *owner_id = ale->id;
diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c
index 84001926839..e42c154d865 100644
--- a/source/blender/makesrna/intern/rna_image.c
+++ b/source/blender/makesrna/intern/rna_image.c
@@ -151,7 +151,7 @@ static void rna_ImageUser_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 			/* Special update for nodetrees to find parent datablock. */
 			ED_node_tag_update_nodetree(bmain, (bNodeTree *)id, NULL);
 		}
-		else  {
+		else {
 			/* Update material or texture for render preview. */
 			DEG_id_tag_update(id, 0);
 			DEG_id_tag_update(id, ID_RECALC_EDITORS);