[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53218] trunk/blender/source/blender/ editors/interface/interface_panel.c: UI fixes, from the todo:

Ton Roosendaal ton at blender.org
Thu Dec 20 20:18:47 CET 2012


Revision: 53218
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53218
Author:   ton
Date:     2012-12-20 19:18:46 +0000 (Thu, 20 Dec 2012)
Log Message:
-----------
UI fixes, from the todo:

- Button panel animation didn't work for 3D View properties and similar regions.
- Akey on View3d overlapping panel: was accidentally passed on as event to the main window.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_panel.c

Modified: trunk/blender/source/blender/editors/interface/interface_panel.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_panel.c	2012-12-20 18:18:09 UTC (rev 53217)
+++ trunk/blender/source/blender/editors/interface/interface_panel.c	2012-12-20 19:18:46 UTC (rev 53218)
@@ -133,8 +133,6 @@
 			if (sbuts->re_align || sbuts->mainbo != sbuts->mainb)
 				return 1;
 	}
-	else if (ar->regiontype == RGN_TYPE_UI)
-		return 1;
 	else if (sa->spacetype == SPACE_IMAGE && ar->regiontype == RGN_TYPE_PREVIEW)
 		return 1;
 	else if (sa->spacetype == SPACE_FILE && ar->regiontype == RGN_TYPE_CHANNELS)
@@ -917,6 +915,7 @@
 
 	/* re-align, possibly with animation */
 	if (panels_re_align(sa, ar, &pa)) {
+		/* XXX code never gets here... PNL_ANIM_ALIGN flag is never set */
 		if (pa)
 			panel_activate_state(C, pa, PANEL_STATE_ANIMATION);
 		else
@@ -1160,6 +1159,7 @@
 				else
 					ui_handle_panel_header(C, block, mx, my, event->type, event->ctrl);
 				
+				retval = WM_UI_HANDLER_BREAK;
 				continue;
 			}
 		}




More information about the Bf-blender-cvs mailing list