[Bf-blender-cvs] [d5c24f2030e] master: Correct error in recent button type check

Campbell Barton noreply at git.blender.org
Sun Jan 6 23:15:27 CET 2019


Commit: d5c24f2030ecbd109f54bd49c254fd028c30cc00
Author: Campbell Barton
Date:   Mon Jan 7 09:12:14 2019 +1100
Branches: master
https://developer.blender.org/rBd5c24f2030ecbd109f54bd49c254fd028c30cc00

Correct error in recent button type check

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

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 91b9ba03fa2..32cd22b0368 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -1125,14 +1125,12 @@ static bool ui_multibut_states_tag(
 
 static void ui_multibut_states_create(uiBut *but_active, uiHandleButtonData *data)
 {
-	uiBut *but;
-
 	BLI_assert(data->multi_data.init == BUTTON_MULTI_INIT_SETUP);
 	BLI_assert(data->multi_data.has_mbuts);
 
 	data->multi_data.bs_mbuts = UI_butstore_create(but_active->block);
 
-	for (but = but_active->block->buttons.first; but; but = but->next) {
+	for (uiBut *but = but_active->block->buttons.first; but; but = but->next) {
 		if (but->flag & UI_BUT_DRAG_MULTI) {
 			ui_multibut_add(data, but);
 		}
@@ -1142,7 +1140,7 @@ static void ui_multibut_states_create(uiBut *but_active, uiHandleButtonData *dat
 	 * note: if we mix buttons which are proportional and others which are not,
 	 * this may work a bit strangely */
 	if ((but_active->rnaprop && (RNA_property_flag(but_active->rnaprop) & PROP_PROPORTIONAL)) ||
-	    ELEM(but->unit_type, PROP_UNIT_LENGTH))
+	    ELEM(but_active->unit_type, PROP_UNIT_LENGTH))
 	{
 		if (data->origvalue != 0.0) {
 			data->multi_data.is_proportional = true;



More information about the Bf-blender-cvs mailing list