[Bf-blender-cvs] [27ff2be] master: UI: no need to update drag-edit for scroll buttons

Campbell Barton noreply at git.blender.org
Thu Oct 8 00:11:28 CEST 2015


Commit: 27ff2be921e83015da52fbc91141d55f2cd2dc57
Author: Campbell Barton
Date:   Thu Oct 8 09:04:38 2015 +1100
Branches: master
https://developer.blender.org/rB27ff2be921e83015da52fbc91141d55f2cd2dc57

UI: no need to update drag-edit for scroll buttons

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

M	source/blender/editors/interface/interface_handlers.c

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

diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 4d09781..010bb8b 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -4350,7 +4350,9 @@ static bool ui_numedit_but_SLI(
 	float offs;
 
 	/* prevent unwanted drag adjustments */
-	if (ui_but_dragedit_update_mval(data, mx) == false && but->type != UI_BTYPE_SCROLL) {
+	if ((but->type != UI_BTYPE_SCROLL) &&
+	    (ui_but_dragedit_update_mval(data, mx) == false))
+	{
 		return changed;
 	}




More information about the Bf-blender-cvs mailing list