[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38743] trunk/blender/source/blender/ editors/interface: - bugfix for icon listview where the icons would only wrap once

Campbell Barton ideasman42 at gmail.com
Tue Jul 26 21:47:56 CEST 2011


Revision: 38743
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38743
Author:   campbellbarton
Date:     2011-07-26 19:47:56 +0000 (Tue, 26 Jul 2011)
Log Message:
-----------
- bugfix for icon listview where the icons would only wrap once
- also quiet some clang warnings

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

Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c	2011-07-26 18:51:35 UTC (rev 38742)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2011-07-26 19:47:56 UTC (rev 38743)
@@ -1879,7 +1879,6 @@
 				if(but->autocomplete_func || data->searchbox) {
 					changed= ui_textedit_autocomplete(C, but, data);
 					update= 1; /* do live update for tab key */
-					retval= WM_UI_HANDLER_BREAK;
 				}
 				/* the hotkey here is not well defined, was G.qual so we check all */
 				else if(event->shift || event->ctrl || event->alt || event->oskey) {
@@ -2325,8 +2324,8 @@
 		if(fac != 1.0f) {
 			/* snap in unit-space */
 			tempf /= fac;
-			softmin /= fac;
-			softmax /= fac;
+			/* softmin /= fac; */ /* UNUSED */
+			/* softmax /= fac; */ /* UNUSED */
 			softrange /= fac;
 		}
 
@@ -3469,13 +3468,13 @@
 	CurveMapping *cumap= (CurveMapping*)but->poin;
 	CurveMap *cuma= cumap->cm+cumap->cur;
 	CurveMapPoint *cmp= cuma->curve;
-	float fx, fy, zoomx, zoomy, offsx, offsy;
+	float fx, fy, zoomx, zoomy /*, offsx, offsy */ /* UNUSED */;
 	int a, changed= 0;
 
 	zoomx= (but->x2-but->x1)/(cumap->curr.xmax-cumap->curr.xmin);
 	zoomy= (but->y2-but->y1)/(cumap->curr.ymax-cumap->curr.ymin);
-	offsx= cumap->curr.xmin;
-	offsy= cumap->curr.ymin;
+	/* offsx= cumap->curr.xmin; */
+	/* offsy= cumap->curr.ymin; */
 
 	if(snap) {
 		float d[2];

Modified: trunk/blender/source/blender/editors/interface/interface_layout.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_layout.c	2011-07-26 18:51:35 UTC (rev 38742)
+++ trunk/blender/source/blender/editors/interface/interface_layout.c	2011-07-26 19:47:56 UTC (rev 38743)
@@ -1615,7 +1615,7 @@
 	int x, y, w, tot, totw, neww, itemw, minw, itemh, offset;
 	int fixedw, freew, fixedx, freex, flag= 0, lastw= 0;
 
-	x= litem->x;
+	/* x= litem->x; */ /* UNUSED */
 	y= litem->y;
 	w= litem->w;
 	totw= 0;

Modified: trunk/blender/source/blender/editors/interface/interface_panel.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_panel.c	2011-07-26 18:51:35 UTC (rev 38742)
+++ trunk/blender/source/blender/editors/interface/interface_panel.c	2011-07-26 19:47:56 UTC (rev 38743)
@@ -575,8 +575,8 @@
 		ui_draw_tria_rect(&itemrect, 'h');
 	else
 		ui_draw_tria_rect(&itemrect, 'v');
-	
-	
+
+	(void)ofsx;
 }
 
 /************************** panel alignment *************************/

Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c	2011-07-26 18:51:35 UTC (rev 38742)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c	2011-07-26 19:47:56 UTC (rev 38743)
@@ -2197,7 +2197,7 @@
 			/* create list items */
 			RNA_PROP_BEGIN(ptr, itemptr, prop) {
 				/* create button */
-				if(i == 9)
+				if(!(i % 9))
 					row= uiLayoutRow(col, 0);
 
 				icon= list_item_icon_get(C, &itemptr, rnaicon, 1);
@@ -2212,7 +2212,6 @@
 	}
 	else if(listtype == 'c') {
 		/* compact layout */
-		found= 0;
 
 		row= uiLayoutRow(layout, 1);
 




More information about the Bf-blender-cvs mailing list