Revision: 35974
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35974
Author: campbellbarton
Date: 2011-04-03 13:17:07 +0000 (Sun, 03 Apr 2011)
Log Message:
-----------
quiet warnings.
Modified Paths:
--------------
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/space_file/file_ops.c
trunk/blender/source/blender/editors/space_file/filesel.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2011-04-03
12:46:33 UTC (rev 35973)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2011-04-03
13:17:07 UTC (rev 35974)
@@ -11528,7 +11528,7 @@
for (brush= main->brush.first; brush; brush= brush->id.next) {
if(brush->height == 0)
- brush->height= 0.4;
+ brush->height= 0.4f;
}
/* replace 'rim material' option for in offset*/
Modified: trunk/blender/source/blender/editors/space_file/file_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/file_ops.c 2011-04-03
12:46:33 UTC (rev 35973)
+++ trunk/blender/source/blender/editors/space_file/file_ops.c 2011-04-03
13:17:07 UTC (rev 35974)
@@ -82,7 +82,7 @@
UI_view2d_region_to_view(v2d, rect->xmin, rect->ymin, &fxmin, &fymin);
UI_view2d_region_to_view(v2d, rect->xmax, rect->ymax, &fxmax, &fymax);
- BLI_init_rcti(&rect_view, v2d->tot.xmin + fxmin, v2d->tot.xmin + fxmax,
v2d->tot.ymax - fymin, v2d->tot.ymax - fymax);
+ BLI_init_rcti(&rect_view, (int)(v2d->tot.xmin + fxmin),
(int)(v2d->tot.xmin + fxmax), (int)(v2d->tot.ymax - fymin), (int)(v2d->tot.ymax
- fymax));
sel = ED_fileselect_layout_offset_rect(sfile->layout, &rect_view);
Modified: trunk/blender/source/blender/editors/space_file/filesel.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/filesel.c 2011-04-03
12:46:33 UTC (rev 35973)
+++ trunk/blender/source/blender/editors/space_file/filesel.c 2011-04-03
13:17:07 UTC (rev 35974)
@@ -247,7 +247,7 @@
int numfiles;
if (layout->flag & FILE_LAYOUT_HOR) {
- int width = ar->v2d.cur.xmax - ar->v2d.cur.xmin -
2*layout->tile_border_x;
+ int width = (int)(ar->v2d.cur.xmax - ar->v2d.cur.xmin -
2*layout->tile_border_x);
numfiles = (float)width/(float)layout->tile_w + 0.5f;
return numfiles*layout->rows;
} else {
Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c
2011-04-03 12:46:33 UTC (rev 35973)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c
2011-04-03 13:17:07 UTC (rev 35974)
@@ -906,7 +906,7 @@
uiLayoutOperatorButs(C, layout, op, NULL, 'H', UI_LAYOUT_OP_SHOW_TITLE);
- uiPopupBoundsBlock(block, 4.0f, 0, 0);
+ uiPopupBoundsBlock(block, 4, 0, 0);
uiEndBlock(C, block);
return block;
@@ -969,7 +969,7 @@
}
/* center around the mouse */
- uiPopupBoundsBlock(block, 4.0f, data->width/-2, data->height/2);
+ uiPopupBoundsBlock(block, 4, data->width/-2, data->height/2);
uiEndBlock(C, block);
return block;
@@ -992,7 +992,7 @@
/* since ui is defined the auto-layout args are not used */
uiLayoutOperatorButs(C, layout, op, NULL, 'V', 0);
- uiPopupBoundsBlock(block, 4.0f, 0, 0);
+ uiPopupBoundsBlock(block, 4, 0, 0);
uiEndBlock(C, block);
return block;
@@ -1264,7 +1264,7 @@
/* fake button, it holds space for search items */
uiDefBut(block, LABEL, 0, "", 10, 10 - uiSearchBoxhHeight(), 180,
uiSearchBoxhHeight(), NULL, 0, 0, 0, 0, NULL);
- uiPopupBoundsBlock(block, 6.0f, 0, -20); /* move it downwards, mouse
over button */
+ uiPopupBoundsBlock(block, 6, 0, -20); /* move it downwards, mouse over
button */
uiEndBlock(C, block);
event= *(win->eventstate); /* XXX huh huh? make api call */
@@ -2728,8 +2728,8 @@
}
glColor4f(rc->col[0], rc->col[1], rc->col[2], rc->col[3]);
- glutil_draw_lined_arc(0.0, M_PI*2.0, r1, 40);
- glutil_draw_lined_arc(0.0, M_PI*2.0, r2, 40);
+ glutil_draw_lined_arc(0.0, (float)(M_PI*2.0), r1, 40);
+ glutil_draw_lined_arc(0.0, (float)(M_PI*2.0), r2, 40);
glDisable(GL_BLEND);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
