[Bf-blender-cvs] [25f2abf314d] master: Cleanup: minor comment correction

Campbell Barton noreply at git.blender.org
Thu Nov 2 15:04:12 CET 2017


Commit: 25f2abf314d02df0896e7678a31434d7b895b3d9
Author: Campbell Barton
Date:   Fri Nov 3 01:10:03 2017 +1100
Branches: master
https://developer.blender.org/rB25f2abf314d02df0896e7678a31434d7b895b3d9

Cleanup: minor comment correction

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

M	source/blender/editors/include/UI_interface.h
M	source/blender/editors/interface/interface_widgets.c

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

diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index 1482937d6a0..b0842c3acb8 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -155,7 +155,7 @@ enum {
 
 /* but->flag - general state flags. */
 enum {
-	/* warning, the first 5 flags are internal */
+	/* warning, the first 6 flags are internal */
 	UI_BUT_ICON_SUBMENU    = (1 << 6),
 	UI_BUT_ICON_PREVIEW    = (1 << 7),
 
@@ -201,12 +201,15 @@ enum {
 	UI_BUT_TEXT_RIGHT        = (1 << 3),
 	/* Prevent the button to show any tooltip. */
 	UI_BUT_NO_TOOLTIP        = (1 << 4),
-	/* button align flag, for drawing groups together (also used in uiBlock->flag!) */
+
+	/* Button align flag, for drawing groups together.
+	 * Used in 'uiBlock.flag', take care! */
 	UI_BUT_ALIGN_TOP         = (1 << 14),
 	UI_BUT_ALIGN_LEFT        = (1 << 15),
 	UI_BUT_ALIGN_RIGHT       = (1 << 16),
 	UI_BUT_ALIGN_DOWN        = (1 << 17),
 	UI_BUT_ALIGN             = (UI_BUT_ALIGN_TOP | UI_BUT_ALIGN_LEFT | UI_BUT_ALIGN_RIGHT | UI_BUT_ALIGN_DOWN),
+	/* end bits shared with 'uiBlock.flag' */
 
 	/* Warning - HACK! Needed for buttons which are not TOP/LEFT aligned, but have some top/left corner stitched to some
 	 *                 other TOP/LEFT-aligned button, because of 'corrective' hack in widget_roundbox_set()... */
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 78090c67770..692d5811831 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -69,11 +69,11 @@
 #define UI_BUT_FLAGS_PUBLIC \
 	(UI_SELECT | UI_SCROLLED | UI_ACTIVE | UI_HAS_ICON | UI_HIDDEN | UI_SELECT_DRAW)
 
-/* Don't overlap w/ UI_BUT_FLAGS_PUBLIC buts. */
+/* Don't overlap w/ UI_BUT_FLAGS_PUBLIC bits. */
 enum {
 	/* Show that holding the button opens a menu. */
 	UI_STATE_HOLD_ACTION = (1 << 6),
-	UI_STATE_TEXT_INPUT   = (1 << 7),
+	UI_STATE_TEXT_INPUT  = (1 << 7),
 };



More information about the Bf-blender-cvs mailing list