code cleanup

3 files changed, 9 insertions, 12 deletions

diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index ee2625cf94b..7d8be7ae9c9 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -3076,7 +3076,7 @@ typedef struct ComponentMenuArgs {
 /* NOTE: this is a block-menu, needs 0 events, otherwise the menu closes */
 static uiBlock *component_menu(bContext *C, ARegion *ar, void *args_v)
 {
-	ComponentMenuArgs *args = (ComponentMenuArgs*)args_v;
+	ComponentMenuArgs *args = (ComponentMenuArgs *)args_v;
 	uiBlock *block;
 	uiLayout *layout;
 	
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index 6b278358db9..39a6109bd62 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -390,7 +390,7 @@ const unsigned char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colo
 				case TH_NODE_GROUP:
 					cp = ts->syntaxc; break;
 				case TH_NODE_INTERFACE:
-					cp= ts->console_output; break;
+					cp = ts->console_output; break;
 				case TH_NODE_FRAME:
 					cp = ts->movie; break;
 				case TH_NODE_MATTE:
@@ -1538,7 +1538,7 @@ void init_userdef_do_versions(void)
 			rgba_char_args_set(btheme->tv3d.editmesh_active, 255, 255, 255, 128);
 		}
 		if (U.coba_weight.tot == 0)
-			init_colorband(&U.coba_weight, 1);
+			init_colorband(&U.coba_weight, true);
 	}
 	if ((bmain->versionfile < 245) || (bmain->versionfile == 245 && bmain->subversionfile < 11)) {
 		bTheme *btheme;
diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c
index fe7e6d01955..013b6d3c606 100644
--- a/source/blender/editors/interface/view2d.c
+++ b/source/blender/editors/interface/view2d.c
@@ -2081,20 +2081,17 @@ void UI_view2d_getscale_inverse(View2D *v2d, float *x, float *y)
 void UI_view2d_getcenter(struct View2D *v2d, float *x, float *y)
 {
 	/* get center */
-	if (x) *x = 0.5f*(v2d->cur.xmin + v2d->cur.xmax);
-	if (y) *y = 0.5f*(v2d->cur.ymin + v2d->cur.ymax);
+	if (x) *x = BLI_rctf_cent_x(&v2d->cur);
+	if (y) *y = BLI_rctf_cent_y(&v2d->cur);
 }
 void UI_view2d_setcenter(struct View2D *v2d, float x, float y)
 {
 	/* get delta from current center */
-	float dx = x - 0.5f*(v2d->cur.xmin + v2d->cur.xmax);
-	float dy = y - 0.5f*(v2d->cur.ymin + v2d->cur.ymax);
-	
+	float dx = x - BLI_rctf_cent_x(&v2d->cur);
+	float dy = y - BLI_rctf_cent_y(&v2d->cur);
+
 	/* add to cur */
-	v2d->cur.xmin += dx;
-	v2d->cur.xmax += dx;
-	v2d->cur.ymin += dy;
-	v2d->cur.ymax += dy;
+	BLI_rctf_translate(&v2d->cur, dx, dy);
 	
 	/* make sure that 'cur' rect is in a valid state as a result of these changes */
 	UI_view2d_curRect_validate(v2d);