[Bf-blender-cvs] [6208ca2] master: Cleanup: ui align header

[Campbell Barton]

Commit: 6208ca25fa2489d7fedf404b433b59c0faf1149c
Author: Campbell Barton
Date:   Sat Nov 7 17:36:10 2015 +1100
Branches: master
https://developer.blender.org/rB6208ca25fa2489d7fedf404b433b59c0faf1149c

Cleanup: ui align header

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

M	source/blender/editors/interface/interface_align.c
M	source/blender/editors/interface/interface_intern.h
M	source/blender/editors/interface/interface_layout.c

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

diff --git a/source/blender/editors/interface/interface_align.c b/source/blender/editors/interface/interface_align.c
index 753e3c4..d0be6d1 100644
--- a/source/blender/editors/interface/interface_align.c
+++ b/source/blender/editors/interface/interface_align.c
@@ -107,7 +107,7 @@ enum {
 /* Max distance between to buttons for them to be 'mergeable'. */
 #define MAX_DELTA 0.45f * max_ii(UI_UNIT_Y, UI_UNIT_X)
 
-bool ui_but_can_align(uiBut *but)
+bool ui_but_can_align(const uiBut *but)
 {
 	return !ELEM(but->type, UI_BTYPE_LABEL, UI_BTYPE_CHECKBOX, UI_BTYPE_CHECKBOX_N, UI_BTYPE_SEPR, UI_BTYPE_SEPR_LINE);
 }
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index 25aa166..9271bbf 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -496,7 +496,6 @@ extern int  ui_but_is_pushed(uiBut *but) ATTR_WARN_UNUSED_RESULT;
 
 extern void ui_block_bounds_calc(uiBlock *block);
 extern void ui_block_translate(uiBlock *block, int x, int y);
-extern void ui_block_align_calc(uiBlock *block);
 
 extern struct ColorManagedDisplay *ui_block_cm_display_get(uiBlock *block);
 void ui_block_cm_to_display_space_v3(uiBlock *block, float pixel[3]);
@@ -709,7 +708,8 @@ void ui_but_add_search(uiBut *but, PointerRNA *ptr, PropertyRNA *prop, PointerRN
 void ui_layout_list_set_labels_active(uiLayout *layout);
 
 /* interface_align.c */
-bool ui_but_can_align(uiBut *but) ATTR_WARN_UNUSED_RESULT;
+bool ui_but_can_align(const uiBut *but) ATTR_WARN_UNUSED_RESULT;
+void ui_block_align_calc(uiBlock *block);
 
 /* interface_anim.c */
 void ui_but_anim_flag(uiBut *but, float cfra);
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index b9d1517..a342b9b 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -3015,8 +3015,11 @@ static void ui_item_align(uiLayout *litem, short nr)
 #ifndef USE_UIBUT_SPATIAL_ALIGN
 			if (ui_but_can_align(bitem->but))
 #endif
-				if (!bitem->but->alignnr)
+			{
+				if (!bitem->but->alignnr) {
 					bitem->but->alignnr = nr;
+				}
+			}
 		}
 		else if (item->type == ITEM_LAYOUT_ABSOLUTE) {
 			/* pass */