style cleanup

6 files changed, 14 insertions, 13 deletions

diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c
index d46c0a47c23..9e769b32136 100644
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@ -1546,7 +1546,7 @@ static size_t animdata_filter_ds_nodetree(bAnimContext *ac, ListBase *anim_data,
 	return items;
 }
 
-static size_t animdata_filter_ds_linestyle (bAnimContext *ac, ListBase *anim_data, bDopeSheet *ads, Scene *sce, int filter_mode)
+static size_t animdata_filter_ds_linestyle(bAnimContext *ac, ListBase *anim_data, bDopeSheet *ads, Scene *sce, int filter_mode)
 {
 	SceneRenderLayer *srl;
 	size_t items = 0;
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index 5acaedb7b81..4c652a82765 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -1739,7 +1739,7 @@ static void single_obdata_users(Main *bmain, Scene *scene, int flag)
 					case OB_MESH:
 						ob->data = me = BKE_mesh_copy(ob->data);
 						if (me->key)
-							BKE_copy_animdata_id_action((ID*)me->key);
+							BKE_copy_animdata_id_action((ID *)me->key);
 						break;
 					case OB_MBALL:
 						ob->data = BKE_mball_copy(ob->data);
@@ -1751,12 +1751,12 @@ static void single_obdata_users(Main *bmain, Scene *scene, int flag)
 						ID_NEW(cu->bevobj);
 						ID_NEW(cu->taperobj);
 						if (cu->key)
-							BKE_copy_animdata_id_action((ID*)cu->key);
+							BKE_copy_animdata_id_action((ID *)cu->key);
 						break;
 					case OB_LATTICE:
 						ob->data = lat = BKE_lattice_copy(ob->data);
 						if (lat->key)
-							BKE_copy_animdata_id_action((ID*)lat->key);
+							BKE_copy_animdata_id_action((ID *)lat->key);
 						break;
 					case OB_ARMATURE:
 						DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
@@ -1777,7 +1777,7 @@ static void single_obdata_users(Main *bmain, Scene *scene, int flag)
 				 * AnimData structure, which is not what we want.
 				 *                                             (sergey)
 				 */
-				BKE_copy_animdata_id_action((ID*)ob->data);
+				BKE_copy_animdata_id_action((ID *)ob->data);
 
 				id->us--;
 				id->newid = ob->data;
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c
index a6e3b206e0f..054303eef82 100644
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -583,12 +583,13 @@ static void paint_stroke_done(const bContext *C, struct PaintStroke *stroke)
 
 	undo_paint_push_end(UNDO_PAINT_IMAGE);
 
-	/* duplicate warning, see texpaint_init
+	/* duplicate warning, see texpaint_init */
+#if 0
 	if (pop->s.warnmultifile)
 		BKE_reportf(op->reports, RPT_WARNING, "Image requires 4 color channels to paint: %s", pop->s.warnmultifile);
 	if (pop->s.warnpackedfile)
 		BKE_reportf(op->reports, RPT_WARNING, "Packed MultiLayer files cannot be painted: %s", pop->s.warnpackedfile);
-	*/
+#endif
 	MEM_freeN(pop);
 
 	{
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index d4030d818b9..68acaf2d54a 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -2722,7 +2722,7 @@ static void draw_em_measure_stats(ARegion *ar, View3D *v3d, Object *ob, BMEditMe
 
 					if (unit->system) {
 						bUnit_AsString(numstr, sizeof(numstr), len_v3v3(v1, v2) * unit->scale_length, 3,
-									   unit->system, B_UNIT_LENGTH, do_split, false);
+						               unit->system, B_UNIT_LENGTH, do_split, false);
 					}
 					else {
 						BLI_snprintf(numstr, sizeof(numstr), conv_float, len_v3v3(v1, v2));
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 8dbaabb0440..61537d100d2 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -883,10 +883,10 @@ static void draw_selected_name(Scene *scene, Object *ob, rcti *rect)
 	short offset = 1.5f * UI_UNIT_X + rect->xmin;
 
 	/* 
-	* breadcrumbs can contain 3 object names (MAX_NAME)
-	* and 2 BREAD_CRUMB_SEPARATORs (6)
-	* and a SHAPE_KEY_PINNED marker and a trailing '\0' (9+1)
-	*/
+	 * breadcrumbs can contain 3 object names (MAX_NAME)
+	 * and 2 BREAD_CRUMB_SEPARATORs (6)
+	 * and a SHAPE_KEY_PINNED marker and a trailing '\0' (9+1)
+	 */
 	char bread_crumbs[3 * MAX_NAME + 6 + 10];
 	bread_crumbs[0] = '\0';
 	
diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c
index e82d54286c8..96d6c842ddb 100644
--- a/source/blender/editors/uvedit/uvedit_smart_stitch.c
+++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c
@@ -1564,7 +1564,7 @@ static void stitch_draw(const bContext *UNUSED(C), ARegion *UNUSED(ar), void *ar
 	glPointSize(1.0);
 }
 
-static UvEdge *uv_edge_get (BMLoop *l, StitchState *state)
+static UvEdge *uv_edge_get(BMLoop *l, StitchState *state)
 {
 	UvEdge tmp_edge;