[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19773] branches/blender2.5/blender/source /blender/editors/interface/interface_panel.c: UI: fix for mistake in last panel commit.

Brecht Van Lommel brecht at blender.org
Fri Apr 17 15:37:03 CEST 2009


Revision: 19773
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19773
Author:   blendix
Date:     2009-04-17 15:37:03 +0200 (Fri, 17 Apr 2009)

Log Message:
-----------
UI: fix for mistake in last panel commit.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/interface/interface_panel.c

Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_panel.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_panel.c	2009-04-17 11:59:25 UTC (rev 19772)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_panel.c	2009-04-17 13:37:03 UTC (rev 19773)
@@ -157,7 +157,7 @@
 
 Panel *uiBeginPanel(ARegion *ar, uiBlock *block, PanelType *pt)
 {
-	Panel *pa, *patab, *palast;
+	Panel *pa, *patab, *palast, *panext;
 	char *panelname= pt->name;
 	char *tabname= pt->name;
 	char *hookname= NULL;
@@ -214,9 +214,9 @@
 	if(newpanel) {
 		pa->sortorder= (palast)? palast->sortorder+1: 0;
 
-		for(palast=ar->panels.first; palast; palast=palast->next)
-			if(palast != pa && palast->sortorder >= pa->sortorder)
-				palast->sortorder++;
+		for(panext=ar->panels.first; panext; panext=panext->next)
+			if(panext != pa && panext->sortorder >= pa->sortorder)
+				panext->sortorder++;
 	}
 
 	if(palast)
@@ -1489,10 +1489,14 @@
 
 			if(event->val==KM_PRESS) {
 				if(event->type == LEFTMOUSE) {
-					if(inside_header)
+					if(inside_header) {
 						ui_handle_panel_header(C, block, mx, my);
-					else if(inside_scale && !(block->panel->flag & PNL_CLOSED))
+						break;
+					}
+					else if(inside_scale && !(block->panel->flag & PNL_CLOSED)) {
 						panel_activate_state(C, block->panel, PANEL_STATE_DRAG_SCALE);
+						break;
+					}
 				}
 				else if(event->type == ESCKEY) {
 					/*XXX 2.50 if(block->handler) {





More information about the Bf-blender-cvs mailing list